From cc053094a4576b19e1fbca448bb1f966056bfd1e Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 16 八月 2023 16:24:57 +0800
Subject: [PATCH] 更改合同信息
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 678 +++++++++++++++++++++-----------------------------------
1 files changed, 256 insertions(+), 422 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index 9f75b8f..74a5668 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -4,26 +4,14 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-if(arg.property =="foodVariety"){
- checkByFood(arg.newValue);
-}</ClientEvent>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">绮瀹氫环</Property>
- <Property name="required">false</Property>
- </PropertyDef>
<Reference name="checkItems">
<Property name="parameter">
<Entity>
<Property name="checkId">$${this.checkId}</Property>
<Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
</Entity>
</Property>
- <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
+ <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
</Reference>
</DataType>
@@ -68,9 +56,9 @@
</PropertyDef>
<PropertyDef name="recordStatus">
<Property></Property>
- <Property name="label">鏁版嵁鐘舵��</Property>
+ <Property name="label">鍗曟嵁鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -118,9 +106,6 @@
</DataType>
<DataType name="dtCheckItems">
<Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
- <PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
- </PropertyDef>
<PropertyDef name="checkId">
<Property></Property>
<Property name="label">妫�娴嬬紪鐮�</Property>
@@ -165,17 +150,9 @@
<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">鎵ｉ噸鍊�%</Property>
- </PropertyDef>
- <PropertyDef name="standardPrice">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯鍗曚环锛堝厓/鏂わ級</Property>
</PropertyDef>
<PropertyDef name="rulePrice">
<Property name="dataType">Double</Property>
@@ -189,12 +166,34 @@
<Property></Property>
<Property name="label">杩愮畻绗﹀彿</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">鎵ｉ噸</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">鎵ｄ环</Property>
+ </PropertyDef>
+ <PropertyDef name="result">
+ <Property></Property>
+ <Property name="label">妫�楠岀粨鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbolValue">
+ <Property></Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
var EDIT = "${request.getParameter('edit')}";
-
var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�

//濡傛灉edit鏈夊�艰〃绀洪殣钘廇DD鍜岀紪杈戞寜閽�
@@ -204,18 +203,10 @@
view.get("#btn2End").set("visible",false);
}

-//绫诲瀷鍒囨崲
-if("OUT" == TYPE){
- view.get("#dataGridCheckItem").set("visible",false);
- view.get("#deWet").set("label","姘村垎澧為噸");
-}else{
- view.get("#deWet").set("label","姘村垎鎵ｉ噸");
- view.get("#dataGridCheckItem").set("visible",true);
-}
-
//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
type:TYPE,
+ recordStatus:'NORMAL',
deptId:deptId
});

@@ -231,7 +222,6 @@
edit = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
- 
if ("RECORD" == data.get("progress")) {
view.get("#btnOK").set("visible",true);
}else{
@@ -256,28 +246,6 @@
view.get("#textAbnormal").set("value",null);
};

-//鍒犻櫎
-del = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textDel = view.get("#textAbnormal.text");
- if(!textDel){
- $notify("璇峰～鍐欏紓甯稿垹闄ゅ師鍥狅紒");
- return;
- }
- data.set("remarks",textDel);
- view.get("#ajaxDel").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- view.get("#dialogAbnormal").close();
- }
- });
-};
-
//杩借釜
showImg = function(){
var data = view.get("#dataGridMain.currentEntity");
@@ -289,6 +257,7 @@
view.get("#dialogImg").show();
};

+//寮傚父鎵ц
todoError = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
@@ -304,8 +273,8 @@
$alert(result);
return;
}else{
+ data.remove();
view.get("#dialogAbnormal").close();
- query();
$alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
}
});
@@ -324,6 +293,7 @@
view.get("#btnOK").set("visible",false);
view.get("#dialogMain").show();
};
+
//娴佺▼瀹屾垚-鎵ц
completeExe = function(){
var data = view.get("#dataGridMain.currentEntity");
@@ -346,162 +316,23 @@
});
};

-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dataGridMain.currentEntity");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
- }
- });
-};

-//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
-checkByFood = function(foodVariety){
- if(TYPE == "IN"){
- view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
- if(result){
- var data = view.get("#dsMain.data:#");
- data.set("checkItems",result);
- }
- });
- }
+//鏍规嵁绮鍝佺鑾峰彇绯荤粺閰嶇疆妫�娴嬮」鐩�
+flushCheckList = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if (!data.get("foodVariety")) {
+ $alert("娌℃湁閰嶇疆绮鍝佺锛屾棤娉曡幏鍙栬川妫�椤癸紒");
+ return;
+ }
+ view.get("#ajaxGetCheck").set("parameter",{checkId:data.get("checkId"),foodVariety:data.get("foodVariety")}).execute(function(result){
+ if(result){
+ data.set("checkItems",result);
+ }else{
+ $alert("褰撳墠绮鍝佺鏈厤缃川妫�椤癸紝璇疯仈绯荤鐞嗗憳");
+ }
+ });
};
</ClientEvent>
- <ClientEvent name="onCreate">
-/**
- * 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
- * 
- * 1.鍑�閲� = 姣涢噸 - 鐨噸
- * 2.鎬绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 + 鎵ｆ按鏉傝川
- * 3.缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛�
- * 4.鍑�/鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
- * 
- * 5.鍏ュ簱鏃讹細鎵ｆ按鏉� 姝ｆ暟 = 鎵ｉ噸锛岃礋鏁� = 澧為噸
- * 6.鍑哄簱鏃讹細姘村垎澧為噸锛屾鏁�=澧為噸锛岃礋鏁�=鎵ｉ噸
- */
-deAutoByWeight = function(name){
- 
- if(null == name) name = "1";
- 
- var curData = view.get("#dsMain.data:#");
- var fullWeight = curData.get("fullWeight");
- var emptyWeight = curData.get("emptyWeight");
- 
- if(fullWeight == 0 || emptyWeight == 0){
- return;
- }
- // 鍑�閲�
- var netWeight = Number(fullWeight) - Number(emptyWeight);
- 
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
- return;
- }
- 
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
- //鎵ｆ按鏉�
- var deWet = curData.get("deWet"), deImpurity = curData.get("deImpurity");
- 
- var impurity = curData.get("impurity"), wet = curData.get("wet");
- 
- 
- var deBase = 0, multiple = 0;
- var checkItems = curData.get("checkItems");
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("wet" == name) {
- var checkItem = this.getCheckItem(checkItems,"C01", "C020101");
- if (checkItem) {
- deBase = Number(wet) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
- 
- //鏉傝川
- if ("impurity" == name) {
- checkItem = this.getCheckItem(recordData.checkItems, "C02","C01010301");
- if (checkItem) {
- deBase = Number(impurity) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));
- deImpurity = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.get("deOther")) + Number(curData.get("deHandle"));
- 
- //鍑哄簱
- if ("OUT" == curData.get("type")) {
- if (Number(deWet) > 0) {//澧為噸
- addSum = addSum + Number(deWet);
- } else {
- deSum = deSum + Number(deWet);
- }
-
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }else{
- if (Number(deWet) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deWet);
- } else {
- addSum = addSum + Number(deWet);
- }
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }
- 
- deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- 
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- 
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
- 
- curData.set("impurity",impurity);
- curData.set("wet",wet);
- curData.set("deImpurity",deImpurity);
- curData.set("deWet",deWet);
- curData.set("deSum",deSum);
- curData.set("netWeight",netWeight);
- curData.set("settleWeight",settleWeight);
- curData.set("recordWeight",recordWeight);
-};
-
-
-/**
- * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
- * @param checkItems
- * @param code1 绯荤粺鍙傛暟ID
- * @param code2 鍥芥爣鍙傛暟ID
- * @returns {undefined}
- */
-function getCheckItem(checkItems, code1, code2) {
- if (!checkItems) return null;
- $.each(checkItems, function (index, checkItem) {
- if (checkItem.get("standardId") == code1 || checkItem.get("standardId") == code2) {
- if (checkItem.get("ruleNum") && checkItem.get("upperLimit") > 0.0) {
- return checkItem;
- }
- }
- });
- return null;
-}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
<DataSet id="dsMain">
@@ -587,15 +418,6 @@
</Editor>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Property name="trigger">autoMappingDropDown2</Property>
@@ -611,6 +433,11 @@
<Property name="name">orderTag</Property>
<Property name="property">orderTag</Property>
<Property name="trigger">autoMappingDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">recordStatus</Property>
+ <Property name="property">recordStatus</Property>
<Editor/>
</AutoFormElement>
<Container layout="hbox regionPadding:15">
@@ -666,7 +493,6 @@
</DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
- <Property name="width">250</Property>
<Property name="name">customerName</Property>
<Property name="align">center</Property>
<Property name="caption">瀹㈡埛鍚嶇О</Property>
@@ -687,40 +513,27 @@
<Property name="property">fullWeight</Property>
<Property name="caption">姣涢噸</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="emptyWeight">
<Property name="property">emptyWeight</Property>
<Property name="caption">鐨噸</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn id="columnDeSum">
- <Property name="property">deSum</Property>
- <Property name="width">100</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="align">center</Property>
- <Property name="name">deSum</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="settleWeight">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">settleWeight</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">recordWeight</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
<Property name="visible">true</Property>
<Property name="name">recordWeight</Property>
</DataColumn>
@@ -744,13 +557,13 @@
</DataColumn>
</DataGrid>
</Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
<Property name="itemCodes">pageSize,pages</Property>
<Property name="dataSet">dsMain</Property>
</DataPilot>
- </Container>
+ </ToolBar>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
<Property name="caption">琛ㄥ崟淇℃伅</Property>
@@ -784,30 +597,25 @@
<Property name="hideMode">display</Property>
<Property name="visible">false</Property>
</Button>
- <Button id="btnAddCheck">
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-var list = data.get("checkItems");
-
-list.insert({});
-console.log(list);
-</ClientEvent>
- <Property name="caption">鏂板鍖栭獙椤�</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">true</Property>
- </Button>
<Button>
<ClientEvent name="onClick">cancelMain();</ClientEvent>
<Property name="caption">鍙栨秷鎿嶄綔</Property>
<Property name="iconClass">fa fa-times</Property>
</Button>
+ <Button id="btnFlushCheck" layoutConstraint="left">
+ <ClientEvent name="onClick">flushCheckList();</ClientEvent>
+ <Property name="caption">閲嶆柊鑾峰彇璐ㄦ椤�</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ <Property name="visible">false</Property>
+ </Button>
</Buttons>
<Children>
<TabControl>
<ClientEvent name="onTabChange">if(arg.newTab.get("name") == "tabCheck"){
- view.get("#btnAddCheck").set("visible",true);
+ view.get("#btnFlushCheck").set("visible",true);
}else{
- view.get("#btnAddCheck").set("visible",false);
+ view.get("#btnFlushCheck").set("visible",false);
}</ClientEvent>
<ControlTab>
<Property name="caption">鍩虹淇℃伅</Property>
@@ -889,26 +697,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">specType</Property>
- <Property name="property">specType</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">鏁ｇ伯</Property>
- <Property name="value">鏁ｇ伯</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">25kg</Property>
- <Property name="value">25kg</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">50kg</Property>
- <Property name="value">50kg</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -927,7 +715,7 @@
<AutoFormElement>
<Property name="name">foodLocation</Property>
<Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="trigger">ddDicArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -939,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="cols">*,50,*,50,*,50</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -953,60 +741,35 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">emptyWeightTime</Property>
+ <Property name="property">emptyWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">fullWeightUser</Property>
+ <Property name="property">fullWeightUser</Property>
+ <Property name="label">绉伴噸浜�</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<ClientEvent name="onBlur">//id 瑙勫垯 d_prop
var id = self.getDom().id;
var prop = id.substring(2,id.length);
deAutoByWeight(prop);
- </ClientEvent>
+</ClientEvent>
<Property name="name">fullWeight</Property>
<Property name="property">fullWeight</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
+ <Property name="name">fullWeightTime</Property>
+ <Property name="property">fullWeightTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deImpurity</Property>
- <Property name="property">deImpurity</Property>
- <Property name="showHint">false</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
<Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">impurity</Property>
- <Property name="property">impurity</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement id="deWet">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deWet</Property>
- <Property name="property">deWet</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wet</Property>
- <Property name="property">wet</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<ClientEvent name="onBlur">//id 瑙勫垯 d_prop
@@ -1015,6 +778,7 @@
deAutoByWeight(prop);</ClientEvent>
<Property name="name">deHandle</Property>
<Property name="property">deHandle</Property>
+ <Property name="label">鐜板満鎵ｉ噸</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -1027,8 +791,39 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
+ <Property name="name">deOtherInfo</Property>
+ <Property name="property">deOtherInfo</Property>
+ <Property name="label">鍏朵粬鍘熷洜</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
+ <Property name="name">deCheck</Property>
+ <Property name="property">deCheck</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
+ <Property name="name">addCheck</Property>
+ <Property name="property">addCheck</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ <Property name="text">璇存槑锛氳川妫�澧炴墸閲嶈鏌ョ湅璐ㄦ淇℃伅鏍忎綅璇︾粏</Property>
+ </Label>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
@@ -1039,51 +834,88 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">fullWeightTime</Property>
- <Property name="property">fullWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">recordWeight</Property>
<Property name="property">recordWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:4">
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">80px</Property>
- </Property>
- <Property name="text">璇存槑锛氱粨绠楅噸閲�=鍑�閲�-鎵ｉ噸+澧為噸锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涙墸姘存潅锛氭鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸</Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
<FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
+ <Property name="caption">鍏朵粬闇�瑕佽ˉ鍏呬俊鎭�</Property>
<Buttons/>
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">jjlx</Property>
+ <Property name="property">jjlx</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">绉伴噸鍏ュ簱</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">1</Property>
+ <Property name="text">鏍囧噯鍖呭叆搴�</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzw</Property>
+ <Property name="property">bzw</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">楹昏</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">缂栫粐琚�</Property>
+ <Property name="value">2</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鏁ｈ</Property>
+ <Property name="value">3</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">9</Property>
+ <Property name="text">鍏朵粬</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dbz</Property>
+ <Property name="property">dbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzbjs</Property>
+ <Property name="property">bzbjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dePackage</Property>
+ <Property name="property">dePackage</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">price</Property>
+ <Property name="property">price</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remarks</Property>
<Property name="property">remarks</Property>
<Property name="editorType">TextArea</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -1092,14 +924,14 @@
</Container>
</ControlTab>
<ControlTab id="tabCheck">
- <Property name="caption">鎵︽牱鍖栭獙</Property>
+ <Property name="caption">璐ㄦ淇℃伅</Property>
<Property name="iconClass">fa fa-gavel</Property>
<Property name="width">150</Property>
<Property name="name">tabCheck</Property>
<Container layout="padding:10">
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -1140,19 +972,30 @@
<Property name="label">鍖栭獙缁撴灉</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkTime</Property>
+ <Property name="property">checkTime</Property>
+ <Property name="label">璐ㄦ鏃堕棿</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sampleUser</Property>
+ <Property name="property">sampleUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sampleTime</Property>
+ <Property name="property">sampleTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sampleType</Property>
+ <Property name="property">sampleType</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
<DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
- <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
-var entity = arg.entity;
-var inoutData = view.get("#dsMain.data:#");
-
-if(entity.get("standardId") =="C01"){//姘村垎
- inoutData.set("wet",entity.get("value"));
-}
-
-if(entity.get("standardId") =="C02"){//闆滃織
- inoutData.set("impurity",entity.get("value"));
-}</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">#.checkItems</Property>
<Property name="highlightCurrentRow">false</Property>
@@ -1174,14 +1017,38 @@
<Property name="property">unit</Property>
<Property name="width">80</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="standardValue">
- <Property name="property">standardValue</Property>
- <Property name="readOnly">true</Property>
<Property name="align">center</Property>
+ </DataColumn>
+ <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>
</DataColumn>
</DataGrid>
</Container>
@@ -1209,12 +1076,6 @@
<Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
<Property name="closeable">false</Property>
<Buttons>
- <Button>
- <ClientEvent name="onClick">del();</ClientEvent>
- <Property name="caption">纭畾鍒犻櫎</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
<Button>
<ClientEvent name="onClick">todoError();</ClientEvent>
<Property name="caption">寮傚父缁堟</Property>
@@ -1258,15 +1119,6 @@
<Property name="validateData">false</Property>
</UpdateItem>
</UpdateAction>
- <UpdateAction id="ajaxDel">
- <Property name="dataResolver">inoutDataPR#delInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
<UpdateAction id="ajaxError">
<Property name="dataResolver">inoutDataPR#errorInoutData</Property>
<UpdateItem>
@@ -1298,14 +1150,8 @@
<Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
<Property name="async">false</Property>
</AjaxAction>
- <AjaxAction id="ajaxInitAdd">
- <Property name="service">inoutDataPR#initAddData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
<AjaxAction id="ajaxGetCheck">
- <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
+ <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
</AjaxAction>
<Export2ReportAction id="exportExcel">
<Property name="extension">xls</Property>
@@ -1316,53 +1162,53 @@
<Property name="titleName">鍗曟嵁鍒楄〃</Property>
<Property name="dataScope">currentPage</Property>
</Export2ReportAction>
- <CustomDropDown id="ddFoodOrigin">
+ <CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
<Property name="minWidth">500</Property>
+ <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
<Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider"></Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
+ <DataSet id="dsDicArea">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
<Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="pageSize">1000</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="blankText"> -鍚嶇О鎴栫畝鎷硷紝鍖椾含甯� bjs -</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("#dsDicArea").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:#");
+ <ClientEvent name="onClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").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:#");
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").close(data.toJSON());
}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
<Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="name">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -1373,13 +1219,13 @@
</DataColumn>
</DataGrid>
<DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
</DataPilot>
</Container>
</CustomDropDown>
<CustomDropDown id="ddNotice">
<Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
<Property name="minWidth">500</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
@@ -1474,24 +1320,12 @@
</MenuItem>
<MenuItem>
<ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">鎵撳嵃妫�楠屽崟</Property>
+ <Property name="caption">鎵撳嵃璐ㄦ鍗�</Property>
<Property name="iconClass">fa fa-print</Property>
</MenuItem>
<MenuItem>
<ClientEvent name="onClick">printPay();</ClientEvent>
<Property name="caption">鎵撳嵃缁撶畻鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="disabled">true</Property>
- </MenuItem>
- <Separator/>
- <MenuItem>
- <ClientEvent name="onClick">printBatchWeight();</ClientEvent>
- <Property name="caption">鎵归噺杩囩鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printBatchCheck();</ClientEvent>
- <Property name="caption">鎵归噺鍖栭獙鍗�</Property>
<Property name="iconClass">fa fa-print</Property>
</MenuItem>
<MenuItem>
--
Gitblit v1.9.3