报工部分代码修改

src/views/modules/scheduleReport/com_separate_roll.vue

@@ -6,6 +6,13 @@
       <el-form :inline="true" label-position="top" style="height: 100px;"
                label-width="80px">
         <!-- 半成品卷卷号 -->
+        <el-row>
+          <el-col :span="24" style="margin-top: -5px;">
+            <el-form-item label="材料卷号:">
+              <el-input ref="rmRollNo" v-model="pageData.rmRollNo" style="width: 180px;"  @keyup.enter.native="checkRmRollNo" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24" style="margin-top: -5px;">
             <el-form-item :label=labels.rollQty>
@@ -64,6 +71,7 @@ export default {
         username: this.$store.state.user.name,
         orderNo: '',
         itemNo: '',
+        rmRollNo: '',
         seqNo: '',
         rollNo: '',
         reportDate: '',
@@ -195,10 +203,11 @@ export default {
       this.getSeqStandardRollQtyFun();
       //清空参数
       this.pageData.rollNums = 1;
+      this.pageData.rmRollNo = '';
       this.visible = true;
       //获取焦点
       this.$nextTick(() => {
-        this.$refs.rollQty.focus();
+        this.$refs.rmRollNo.focus();
       });
       this.titleCon = this.labels.titleCon;//重置标题
     },
@@ -246,8 +255,28 @@ export default {
       }
     },
 
+    /*检查材料卷号的数据*/
+    checkRmRollNo() {
+      //判断null和空字符串
+      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
+        this.$message.error('卷号不能为空!');
+        return false;
+      } else {
+        //分拆site 和 卷号
+        let siteAndRollNo = this.pageData.rmRollNo.trim().split(',');
+        //判断材料卷号是否合规
+        if(siteAndRollNo.length != 2){
+          this.$message.error('材料卷号非法!');
+          return false;
+        }
+        this.pageData.rmRollNo = siteAndRollNo[1];
+      }
+      this.pageData.rollNo =  this.pageData.rmRollNo;
+    },
+
     //检查创建
     createSeparateRollFun() {
+      let rmRollNo = this.pageData.rmRollNo;
       //获取当前是的数量
       let rollQty = parseInt(this.pageData.rollQty);
       //判断是否可以修改

src/views/modules/scheduleReport/produce_order.vue

@@ -205,24 +205,6 @@ export default {
           status: true,
           fixed: ''
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceQtyReported',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'qtyReported',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '已报告数量',
-          columnWidth: 100,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: true,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
         {
           userId: this.$store.state.user.name,
           functionId: functionId,
@@ -259,78 +241,6 @@ export default {
           status: true,
           fixed: ''
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceRemark',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnWidth: 180,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceScheduledDate',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'scheduledDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '排产日期',
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceShiftNo',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'shiftNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '班次',
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceCustomerName',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'customerName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '客户名称',
-          columnWidth: 180,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
       ],
       reportButton: {
         dieCuttingButton: true,