From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 06 十一月 2023 23:40:59 +0800 Subject: [PATCH] 更新仓内抓拍2 --- igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 471 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 346 insertions(+), 125 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml index c697be5..3359796 100644 --- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml +++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml @@ -8,8 +8,8 @@ autoByDepot(arg.newValue);
 }
 if(arg.property =="foodVariety"){
 - checkByFood(arg.newValue);
 -}</ClientEvent> + checkByFood(arg.newValue);
 +} </ClientEvent> <Property name="creationType">com.ld.igds.models.MQuality</Property> <PropertyDef name="id"> <Property name="label">ID</Property> @@ -21,13 +21,13 @@ <Property name="label">搴撳尯缂栫爜</Property> </PropertyDef> <PropertyDef name="depotId"> - <Property name="mapping"> - <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> - <Property name="keyProperty">id</Property> - <Property name="valueProperty">name</Property> - </Property> <Property name="label">妫�娴嬩粨搴�</Property> <Property name="required">true</Property> + <Property name="mapping"> + <Property name="keyProperty">id</Property> + <Property name="valueProperty">name</Property> + <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> + </Property> </PropertyDef> <PropertyDef name="foodVariety"> <Property name="mapping"> @@ -91,20 +91,27 @@ <PropertyDef name="checkUser"> <Property name="label">鎵︽牱浜�</Property> </PropertyDef> - <PropertyDef name="checkNum"> + <PropertyDef name="ypsl"> <Property name="label">鏍峰搧鏁伴噺</Property> - <Property name="displayFormat">0.0%</Property> <Property name="dataType">Double</Property> + <Property name="displayFormat">0.## KG</Property> </PropertyDef> <PropertyDef name="checkTime"> <Property name="label">鎵︽牱鏃堕棿</Property> <Property name="dataType">Date</Property> </PropertyDef> - <PropertyDef name="checkRepresent"> - <Property name="label">鏍峰搧浠h〃</Property> + <PropertyDef name="dbsl"> + <Property name="label">鏍峰搧浠h〃鏁伴噺</Property> + <Property name="dataType">Double</Property> + <Property name="displayFormat">0.## KG</Property> </PropertyDef> - <PropertyDef name="checkLevel"> + <PropertyDef name="ypdj"> <Property name="label">鏍峰搧绛夌骇</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="normalYear"> <Property name="label">姝e父瀛樺偍骞撮檺</Property> @@ -128,8 +135,48 @@ <PropertyDef name="remark"> <Property name="label">澶囨敞淇℃伅</Property> </PropertyDef> + <PropertyDef name="storeDate"> + <Property name="dataType">Date</Property> + <Property name="label">鍏ュ簱鏃ユ湡</Property> + </PropertyDef> + <PropertyDef name="unit"> + <Property></Property> + <Property name="label">妫�楠屽崟浣�</Property> + </PropertyDef> + <PropertyDef name="zblb"> + <Property></Property> + <Property name="label">鎸囨爣绫诲埆</Property> + </PropertyDef> + <PropertyDef name="qfrq"> + <Property name="dataType">Date</Property> + <Property name="label">绛惧彂鏃ユ湡</Property> + </PropertyDef> + <PropertyDef name="bgcjsj"> + <Property name="dataType">Date</Property> + <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property> + </PropertyDef> + <PropertyDef name="shrxm"> + <Property></Property> + <Property name="label">瀹℃牳浜哄鍚�</Property> + </PropertyDef> + <PropertyDef name="qydbh"> + <Property></Property> + <Property name="label">鎵︽牱鍗曠紪鍙�</Property> + </PropertyDef> + <PropertyDef name="jdrxm"> + <Property></Property> + <Property name="label">鐩戠潱浜哄鍚�</Property> + </PropertyDef> + <PropertyDef name="ypbh"> + <Property></Property> + <Property name="label">鏍峰搧缂栧彿</Property> + </PropertyDef> + <PropertyDef name="updateTime"> + <Property name="dataType">Date</Property> + <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property> + </PropertyDef> <Reference name="checkItems"> - <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property> + <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property> <Property name="dataType">[dtCheckItems]</Property> <Property name="parameter"> <Entity> @@ -203,6 +250,62 @@ <PropertyDef name="remarks"> <Property name="label">鍖栭獙缁撴灉</Property> </PropertyDef> + <PropertyDef name="operaSymbolValue"> + <Property></Property> + </PropertyDef> + <PropertyDef name="operaSymbol"> + <Property></Property> + <Property name="label">杩愮畻绗﹀彿</Property> + </PropertyDef> + <PropertyDef name="ruleNum"> + <Property name="dataType">Double</Property> + <Property name="label">鎵i噸绯绘暟</Property> + </PropertyDef> + <PropertyDef name="ruleAdd"> + <Property name="dataType">Double</Property> + <Property name="label">澧為噸%</Property> + </PropertyDef> + <PropertyDef name="ruleAddEnd"> + <Property name="dataType">Double</Property> + <Property name="label">澧為噸涓婇檺%</Property> + </PropertyDef> + <PropertyDef name="ruleReduce"> + <Property name="dataType">Double</Property> + <Property name="label">鎵i噸鍊�%</Property> + </PropertyDef> + <PropertyDef name="rulePrice"> + <Property name="dataType">Double</Property> + <Property name="label">鎵h垂绯绘暟</Property> + </PropertyDef> + <PropertyDef name="ruleReducePrice"> + <Property name="dataType">Double</Property> + <Property name="label">鎵h垂</Property> + </PropertyDef> + <PropertyDef name="addNum"> + <Property name="dataType">Double</Property> + <Property name="label">澧為噸</Property> + </PropertyDef> + <PropertyDef name="deNum"> + <Property name="dataType">Double</Property> + <Property name="label">鎵i噸</Property> + </PropertyDef> + <PropertyDef name="addPrice"> + <Property name="dataType">Double</Property> + <Property name="label">澧炰环</Property> + </PropertyDef> + <PropertyDef name="dePrice"> + <Property name="dataType">Double</Property> + <Property name="label">鎵d环</Property> + </PropertyDef> + <PropertyDef name="result"> + <Property></Property> + <Property name="label">妫�楠岀粨鏋�</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> + </PropertyDef> </DataType> <DataType name="dataTypeUser"> <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property> @@ -215,8 +318,9 @@ </Validator> <Validator type="custom"> <ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){ - arg.entity.validate("confirmPassword"); -}</ClientEvent> + arg.entity.validate("confirmPassword"); + } + </ClientEvent> </Validator> </PropertyDef> <PropertyDef name="confirmPassword"> @@ -225,12 +329,13 @@ <Property name="required">true</Property> <Validator type="custom"> <ClientEvent name="onValidate">var confirm = arg.data;
 -var password = arg.entity.get("password");
 -if (confirm ==password) {
 - arg.result = { state:"ok"}
 -} else {
 - arg.result = { state:"error", text: "涓ゆ瀵嗙爜涓嶄竴鑷�"}; 
 -}</ClientEvent> + var password = arg.entity.get("password");
 + if (confirm ==password) {
 + arg.result = { state:"ok"}
 + } else {
 + arg.result = { state:"error", text: "涓ゆ瀵嗙爜涓嶄竴鑷�"}; 
 + } + </ClientEvent> </Validator> </PropertyDef> <PropertyDef name="salt"> @@ -319,7 +424,8 @@ <Property name="required">true</Property> <Validator type="regExp"> <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property> - <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$</Property> + <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$ + </Property> <Property name="validateMode">whiteBlack</Property> </Validator> <Validator type="length"> @@ -330,32 +436,38 @@ <Property name="dataType">String</Property> </PropertyDef> </DataType> + <DataType name="dtMetrics"> + <PropertyDef name="code"/> + <PropertyDef name="name"/> + </DataType> + <DataType name="dtResult"> + <PropertyDef name="name"/> + </DataType> </Model> <View layout="padding:5;regionPadding:5"> <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
 
 //鏍规嵁浠撳簱鑷姩鍥炲~绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
 autoByDepot = function(depotId){
 - view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
 - if(result){
 - var data = view.get("#dsMain.data:#");
 - data.set("foodLocation",result.foodLocation);
 - data.set("foodLevel",result.foodLevel);
 - data.set("foodVariety",result.foodVariety);
 - data.set("foodType",result.foodType);
 - }
 - });
 + view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
 + if(result){
 + var data = view.get("#dsMain.data:#");
 + data.set("foodLocation",result.foodLocation);
 + data.set("foodLevel",result.foodLevel);
 + data.set("foodVariety",result.foodVariety);
 + data.set("foodType",result.foodType);
 + }
 +});
 };
 -
 //鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
 checkByFood = function(foodVariety){
 - view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
 - if(result){
 - var data = view.get("#dsMain.data:#");
 - data.set("checkItems",result);
 - }
 - }); 
 -};</ClientEvent> +view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
 +if(result){
 + var data = view.get("#dsMain.data:#");
 + data.set("checkItems",result);
 + }
 + }); 
 +}; </ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> <Property name="loadMode">lazy</Property> @@ -372,6 +484,38 @@ <Property name="pageSize">100</Property> <Property name="dataProvider">bdf2.userMaintain#loadUsers</Property> </DataSet> + <DataSet id="dsMetrics"> + <ClientEvent name="onCreate">var data = [ {
 + name : "1:璐ㄩ噺鎸囨爣妫�楠�"
 +}, {
 + name : "2:鍌ㄥ瓨鍝佽川妫�楠�"
 +}, {
 + name : "3:椋熷搧瀹夊叏妫�楠�"
 +}]
 +self.setData(data);
 +</ClientEvent> + <Property name="dataType">[dtMetrics]</Property> + </DataSet> + <DataSet id="dsResult"> + <ClientEvent name="onCreate">var data = [ {
 + name : "杈炬爣"
 +}, {
 + name : "涓嶈揪鏍�"
 +}, {
 + name : "瀹滃瓨"
 +},{
 + name : "杞诲害涓嶅疁瀛�"
 +},{
 + name : "閲嶅害涓嶅疁瀛�"
 +}, {
 + name : "鍚堟牸"
 +}, {
 + name : "涓嶅悎鏍�"
 +}]
 +self.setData(data);
 +</ClientEvent> + <Property name="dataType">[dtResult]</Property> + </DataSet> <Container layout="regionPadding:10" layoutConstraint="top"> <Property name="exClassName">bg-color</Property> <Property name="contentOverflow">hidden</Property> @@ -381,40 +525,42 @@ </Label> <Button layoutConstraint="left"> <ClientEvent name="onClick">view.get("#dsMain").insert();
 -view.get("#dialogMain").show();</ClientEvent> +view.get("#dialogMain").show(); </ClientEvent> <Property name="caption">鏂板</Property> <Property name="exClassName">btn-default</Property> <Property name="iconClass">fa fa-plus</Property> </Button> <Button layoutConstraint="left"> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 -if(data){
 - view.get("#dialogMain").show();
 -}</ClientEvent> + if(data){
 + view.get("#dialogMain").show();
 + } + </ClientEvent> <Property name="caption">淇敼</Property> <Property name="exClassName">btn-warm</Property> <Property name="iconClass">fa fa-pencil</Property> </Button> <Button layoutConstraint="left"> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 -if(!data){
 - return;
 -}
 -view.get("#ajaxDel").set("parameter",data).execute(function(result){
 - if(result){
 - $alert(result);
 - return;
 - }else{
 - data.remove();
 - }
 -});</ClientEvent> + if(!data){
 + return;
 + }
 + view.get("#ajaxDel").set("parameter",data).execute(function(result){
 + if(result){
 + $alert(result);
 + return;
 + }else{
 + data.remove();
 + }
 + }); + </ClientEvent> <Property name="caption">鍒犻櫎</Property> <Property name="exClassName">btn-warn</Property> <Property name="iconClass">fa fa-minus</Property> </Button> <Button layoutConstraint="left"> <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
 -</ClientEvent> + </ClientEvent> <Property name="caption">鍒锋柊</Property> <Property name="exClassName">btn-default</Property> <Property name="iconClass">fa fa-refresh</Property> @@ -451,7 +597,8 @@ <Container layout="hbox regionPadding:15"> <Button layoutConstraint="left"> <ClientEvent name="onClick">var param = view.get("#dsParam.data");
 -view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent> + view.get("#dsMain").set("parameter",param.toJSON()).flushAsync(); + </ClientEvent> <Property name="caption">鏌ヨ</Property> <Property name="exClassName">btn-default</Property> <Property name="iconClass">fa fa-refresh</Property> @@ -467,8 +614,8 @@ <DataGrid layoutConstraint="center padding:5px"> <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
 if(data){
 - view.get("#dialogMain").show();
 -}</ClientEvent> + view.get("#dialogMain").show();
 +} </ClientEvent> <Property name="dataSet">dsMain</Property> <Property name="readOnly">true</Property> <RowNumColumn/> @@ -486,11 +633,6 @@ <Property name="property">foodVariety</Property> <Property name="align">center</Property> <Property name="name">foodVariety</Property> - </DataColumn> - <DataColumn> - <Property name="property">foodType</Property> - <Property name="align">center</Property> - <Property name="name">foodType</Property> </DataColumn> <DataColumn> <Property name="property">foodLevel</Property> @@ -532,6 +674,18 @@ </DataPilot> </Container> <Dialog id="dialogMain"> + <ClientEvent name="beforeShow">var data = view.get("#dsMain.data:#")
 +var metricsBefore = data.get("zblb")
 +if(metricsBefore){
 + var list = metricsBefore.split("#");
 + var metrics ="" ;
 + list.forEach(item=>{
 + if(item == 1)metrics+="1:璐ㄩ噺鎸囨爣妫�楠�#";
 + if(item == 2)metrics+="2:鍌ㄥ瓨鍝佽川妫�楠�#";
 + if(item == 3)metrics+="3:椋熷搧瀹夊叏妫�楠�#"; 
 + });
 + data.set("zblb", metrics.substring(0,metrics.length-1));
 +}</ClientEvent> <Property name="visible">false</Property> <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property> <Property name="width">80%</Property> @@ -540,20 +694,22 @@ <Buttons> <Button> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 -if(data.validate() != 'ok'){
 - $notify("鏁版嵁鏍¢獙澶辫触锛侊紒");
 - return;
 -}
 -view.get("#uaAction").set("parameter",data).execute(function(){
 - self.get("parent").hide();
 -});</ClientEvent> + if(data.validate() != 'ok'){
 + $notify("鏁版嵁鏍¢獙澶辫触锛侊紒");
 + return;
 + }
 + view.get("#uaAction").set("parameter",data).execute(function(){
 + self.get("parent").hide();
 + }); + </ClientEvent> <Property name="caption">淇濆瓨</Property> <Property name="iconClass">fa fa-check</Property> <Property name="exClassName">btn-normal</Property> </Button> <Button> <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
 -self.get("parent").hide();</ClientEvent> + self.get("parent").hide(); + </ClientEvent> <Property name="caption">鍙栨秷</Property> <Property name="iconClass">fa fa-times</Property> <Property name="exClassName">btn-warn</Property> @@ -567,7 +723,7 @@ <AutoForm> <Property name="dataSet">dsMain</Property> <Property name="readOnly">false</Property> - <Property name="labelSeparator"> : </Property> + <Property name="labelSeparator">:</Property> <Property name="labelAlign">right</Property> <Property name="cols">*,*,*</Property> <Property name="labelWidth">120</Property> @@ -603,8 +759,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">foodType</Property> - <Property name="property">foodType</Property> + <Property name="name">foodLevel</Property> + <Property name="property">foodLevel</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -614,13 +770,13 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">checkNum</Property> - <Property name="property">checkNum</Property> + <Property name="name">ypsl</Property> + <Property name="property">ypsl</Property> <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">foodLevel</Property> - <Property name="property">foodLevel</Property> + <Property name="name">unit</Property> + <Property name="property">unit</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -634,19 +790,18 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">foodLocation</Property> - <Property name="property">foodLocation</Property> - <Property name="trigger">ddFoodOrigin</Property> + <Property name="name">shrxm</Property> + <Property name="property">shrxm</Property> <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">checkRepresent</Property> - <Property name="property">checkRepresent</Property> + <Property name="name">dbsl</Property> + <Property name="property">dbsl</Property> <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">checkLevel</Property> - <Property name="property">checkLevel</Property> + <Property name="name">ypdj</Property> + <Property name="property">ypdj</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -666,10 +821,33 @@ </Editor> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">zblb</Property> + <Property name="property">zblb</Property> + <Editor> + <TagEditor> + <Property name="textSeperator">#</Property> + <Property name="availableTagsDataSet">dsMetrics</Property> + <Property name="availableTagsDataPath">.name</Property> + </TagEditor> + </Editor> + </AutoFormElement> + <AutoFormElement layoutConstraint="colSpan:1"> <Property name="name">result</Property> <Property name="property">result</Property> - <Editor/> + <Editor> + <TagEditor> + <Property name="availableTagsDataPath">.name</Property> + <Property name="availableTagsDataSet">dsResult</Property> + <Property name="textSeperator">#</Property> + </TagEditor> + </Editor> </AutoFormElement> + <Label layoutConstraint="colSpan:2"> + <Property name="text">璇存槑锛氬椤规寚鏍囨椂鎸夌収1:璐ㄩ噺鎸囨爣妫�楠�(杈炬爣,涓嶈揪鏍�)銆�2:鍌ㄥ瓨鍝佽川妫�楠�(瀹滃瓨,涓嶅疁瀛�)銆�3:椋熷搧瀹夊叏妫�楠�(鍚堟牸,涓嶅悎鏍�)杩欎釜椤哄簭濉啓妫�楠岀粨璁�</Property> + <Property name="style"> + <Property name="color">blue</Property> + </Property> + </Label> <AutoFormElement layoutConstraint="colSpan:3"> <Property name="name">remark</Property> <Property name="property">remark</Property> @@ -686,51 +864,90 @@ <Buttons/> <Children> <DataGrid id="dataGridCheckItem"> + <ClientEvent name="onCellValueEdit">var data = arg.entity
 +if (data) {
 + //濉啓鐨勬暟鎹��;
 + var newValue = data.get("value");
 + //鏍囧噯鍊�;
 + var limit = data.get("upperLimit");
 + //杩愮畻绗�;
 + var symbol = data.get("operaSymbol");
 + if (symbol && limit && newValue) {
 + if (">=" == symbol) {
 + if (newValue < limit) {
 + data.set("result", "0");
 + }
 + else {
 + data.set("result", "1");
 + }
 + }
 + if ("<=" == symbol) {
 + if (newValue > limit) {
 + data.set("result", "0");
 + }
 + else {
 + data.set("result", "1");
 + }
 + }
 + if ("==" == symbol) {
 + if (newValue != limit) {
 + data.set("result", "0");
 + }
 + else {
 + data.set("result", "1");
 + }
 + }
 + }
 +}</ClientEvent> <Property name="dataPath">#.checkItems</Property> <Property name="dataSet">dsMain</Property> <Property name="hideMode">display</Property> <Property name="highlightCurrentRow">false</Property> <Property name="visible">true</Property> <RowNumColumn/> - <DataColumn> - <Property name="name">standardName</Property> + <DataColumn name="standardName"> <Property name="property">standardName</Property> <Property name="align">center</Property> - <Property name="readOnly">true</Property> - <Editor/> </DataColumn> - <DataColumn> - <Property name="name">value</Property> + <DataColumn name="value"> <Property name="property">value</Property> <Property name="align">center</Property> - <Editor/> </DataColumn> - <DataColumn> - <Property name="name">upperLimit</Property> - <Property name="property">upperLimit</Property> - <Property name="align">center</Property> - <Property name="readOnly">true</Property> - <Editor/> - </DataColumn> - <DataColumn> - <Property name="name">lowerLimit</Property> - <Property name="property">lowerLimit</Property> - <Property name="align">center</Property> - <Property name="readOnly">true</Property> - <Editor/> - </DataColumn> - <DataColumn> - <Property name="name">unit</Property> + <DataColumn name="unit"> <Property name="property">unit</Property> <Property name="align">center</Property> <Property name="readOnly">true</Property> - <Editor/> </DataColumn> - <DataColumn> - <Property name="name">remarks</Property> + <DataColumn name="operaSymbolValue"> + <Property name="property">operaSymbolValue</Property> + <Property name="align">center</Property> + <Property name="caption">鏍囧噯鍊�</Property> + <Property name="readOnly">true</Property> + </DataColumn> + <DataColumn name="deNum"> + <Property name="property">deNum</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="addNum"> + <Property name="property">addNum</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="dePrice"> + <Property name="property">dePrice</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="addPrice"> + <Property name="property">addPrice</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="result"> + <Property name="property">result</Property> + <Property name="align">center</Property> + <Property name="readOnly">true</Property> + </DataColumn> + <DataColumn name="remarks"> <Property name="property">remarks</Property> <Property name="align">center</Property> - <Editor/> </DataColumn> </DataGrid> </Children> @@ -753,7 +970,7 @@ <Property name="service">depotPR#getDepot</Property> </AjaxAction> <AjaxAction id="ajaxGetCheck"> - <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property> + <Property name="service">checkStandardPR#listCheckItemsByParam</Property> </AjaxAction> <CustomDropDown id="ddFoodOrigin"> <Property name="minHeight">480</Property> @@ -761,36 +978,39 @@ <Property name="minWidth">360</Property> <Container layout="regionPadding:5"> <DataSet id="dsFoodOrigin"> - <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property> - <Property name="dataType">[dtFoodOrigin]</Property> + <Property name="dataProvider">dicAreaPR#pageList</Property> + <Property name="dataType">[dtArea]</Property> <Property name="parameter"></Property> <Property name="pageSize">30</Property> </DataSet> <Container layout="hbox regionPadding:5"> <TextEditor id="key2"> - <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property> + <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property> <Property name="width">200</Property> </TextEditor> <Button> <ClientEvent name="onClick">var key = view.get("#key2.value");
 -view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent> + view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync(); + </ClientEvent> <Property name="caption">鏌ヨ</Property> <Property name="iconClass">fa fa-search</Property> </Button> <Button> <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
 -if(data){
 - view.get("#ddFoodOrigin").close(data.toJSON());
 -}</ClientEvent> + if(data){
 + view.get("#ddFoodOrigin").close(data.toJSON());
 + } + </ClientEvent> <Property name="iconClass">fa fa-check</Property> <Property name="caption">纭畾</Property> </Button> </Container> <DataGrid> <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
 -if(data){
 - view.get("#ddFoodOrigin").close(data.toJSON());
 -}</ClientEvent> + if(data){
 + view.get("#ddFoodOrigin").close(data.toJSON());
 + } + </ClientEvent> <Property name="dataSet">dsFoodOrigin</Property> <Property name="readOnly">true</Property> <DataColumn name="code"> @@ -800,7 +1020,8 @@ </DataColumn> <DataColumn name="name"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 -arg.processDefault = true;</ClientEvent> + arg.processDefault = true; + </ClientEvent> <Property name="property">name</Property> <Property name="readOnly">true</Property> <Property name="align">center</Property> -- Gitblit v1.9.3