From 90f529be12c36675a0468f7b55f9f5be28fca1c1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 一月 2024 08:31:07 +0800
Subject: [PATCH] 销售订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号 生产订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号（如果已经有了就不增加） 销售订单下推时，将这3个字段默认带入到生产订单界面上， 可修改 保存。
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 12 +++++++++++-
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 30 +++++++++++++++++++++---------
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 78be081..ead0183 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -258,13 +258,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹㈡埛鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
+ <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹㈡埛瑙勬牸鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹㈡埛鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCusMaterNumber" lay-verify="HCusMaterNumber" id="HCusMaterNumber" style="display: inline-block;">
</div>
</div>
</div>
@@ -1006,6 +1012,9 @@
, "HColorRemark": data.鏌撹壊瑕佹眰
, "HRemark": data.鐧藉澂瑕佹眰
, "HRemark3": data.琛ㄥご澶囨敞
+ , "HCusMaterNumber": data.瀹㈡埛鐗╂枡缂栫爜
+ , "HCusModel": data.瀹㈡埛瑙勬牸鍨嬪彿
+ , "HCusMaterName": data.瀹㈡埛鐗╂枡鍚嶇О
});
layer.close(ajaxLoad);
@@ -1149,6 +1158,7 @@
, "HColorRemark": d.data[0].鏌撹壊瑕佹眰
, "HCusMaterName": d.data[0].瀹㈡埛鐗╂枡鍚嶇О
, "HCusModel": d.data[0].瀹㈡埛瑙勬牸鍨嬪彿
+ , "HCusMaterNumber": d.data[0].瀹㈡埛鐗╂枡缂栫爜
, "HOrderPickRemark": d.data[0].璁㈠崟鍖呰澶囨敞
//鍏朵粬淇℃伅
, "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 74a32ce..9b5e26a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -158,6 +158,7 @@
</div>
</div>
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
@@ -563,7 +564,10 @@
"HDate": Format(new Date(), 'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": ""
};
switch (obj.event) {
//鏂板涓�琛�
@@ -979,8 +983,9 @@
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
-
+ , { field: 'HCusMaterNumber', title: '瀹㈡埛鐗╂枡缂栫爜', width: 100, edit: 'text' }
+ , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, hide: true }
, { field: 'HTaxMoney', title: '绋庨', width: 100, hide: true }
@@ -1014,7 +1019,10 @@
"HDate": Format(new Date(),'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": ""
}];
option.data = rowdata;
@@ -1132,20 +1140,23 @@
"HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
"HTaxRate": result.data[i]["绋庣巼"],
"HTaxMoney": result.data[i]["绋庨"],
- "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"],2),
+ "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"], 2),
"HlineTotalBB": result.data[i]["鏈綅甯佷环绋庡悎璁�"],
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
- "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]
+ "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
+ "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
+ "HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
+ "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"]
}
);
}
option.data = rowdata;
//鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
- option.cols[0][19].edit = null;
- option.cols[0][20].edit = null;
+ option.cols[0][22].edit = null;
+ option.cols[0][23].edit = null;
table.render(option);
@@ -1832,7 +1843,8 @@
var NewRow = {
"HMaterID": "0", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁￠噺鍗曚綅": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
, "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
- , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": ""
+ , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
+ "HCusModel": "","HCusMaterName": ""
}
btnAddLine(NewRow);
}
--
Gitblit v1.9.1