子目换算新需求

modules/all_models/stdRation_coe.js

@@ -23,6 +23,8 @@ const coeListSchema = new Schema({
     serialNo: Number,                  //编号
     name: String,                       // 名称
     content: String,                    // 说明
+    original_code:String,               //原人材机编码
+    option_codes:String,                //可选人材机编码
     coes: [coeSchema]
 }, {versionKey: false});
 

web/maintain/ration_repository/js/coe.js

@@ -227,8 +227,10 @@ let coeOprObj = {
     setting: {
         header: [
             {headerName:"编号", headerWidth:50, dataCode:"serialNo", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false},
-            {headerName:"名称", headerWidth:280, dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center", readOnly: false},
+            {headerName:"名称", headerWidth:200, dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center", readOnly: false},
             {headerName:"内容", headerWidth:150, dataCode:"content", dataType: "String", hAlign: "left", vAlign: "center", readOnly: false},
+            {headerName:"原人材机编码", headerWidth:90, dataCode:"original_code", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false},
+            {headerName:"可选人材机编码", headerWidth:150, dataCode:"option_codes", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false}
         ]
     },
     buildSheet: function (container) {
@@ -535,9 +537,9 @@ let gljAdjOprObj = {
         ],
         comboItems: {
             //调整类型下拉菜单
-            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机','替换人材机'],
+            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机','替换人材机',"所选人材机"],
             //操作符下拉菜单
-            operator: ['+', '-', '*', '/', '=']
+            operator: ['+', '-', '*', '/', '=','+*']
         }
     },
     buildSheet: function (container) {