Преглед изворни кода

feat: 生产工单添加生产订单查询字段,生产订单列表 - 将查询[生产工单]改为[生产订单]

zhuyong пре 11 месеци
родитељ
комит
308d301263
2 измењених фајлова са 35 додато и 6 уклоњено
  1. 33 4
      src/views/produceOrder/index.vue
  2. 2 2
      src/views/produceWord/components/order-search.vue

+ 33 - 4
src/views/produceOrder/index.vue

@@ -48,6 +48,10 @@
           </el-link>
         </template>
 
+        <template v-slot:apsWorkOrderCode="{ row }">
+          <label>{{ row.apsWorkOrderCode || '' }}</label>
+        </template>
+
         <template v-slot:priority="{ row }">
           <div style="display: flex">
             <el-input v-model="row.priority" type="number" size="mini" :min="0" :max="10" @change="priorityChange(row)"
@@ -226,6 +230,12 @@ export default {
           placeholder: '',
           labelWidth: 100,
         },
+        {
+          label: "生产订单号:",
+          value: 'apsWorkOrderCode',
+          type: "input",
+          labelWidth: 100,
+        },
         {
           label: "计划编码:",
           value: 'productionPlanCode',
@@ -362,7 +372,6 @@ export default {
         // },
 
         {
-          prop: 'code',
           slot: 'code',
           label: '生产工单号',
           align: 'center',
@@ -376,13 +385,17 @@ export default {
         // },
 
         {
-          prop: 'QRcode',
           slot: 'QRcode',
           label: '二维码',
           align: 'center',
           minWidth: 110
         },
-
+        {
+          label: "生产订单号",
+          slot: 'apsWorkOrderCode',
+          align: 'center',
+          minWidth: 110
+        },
         {
           prop: 'productionPlanCode',
           label: '计划编号',
@@ -555,12 +568,28 @@ export default {
         }
       },
       immediate: true
+    },
+    tabValue: {
+      handler(newVal) {
+        if (newVal === '6') {
+          this.newColumns.splice(3,1)
+        }else {
+          if (this.newColumns[3].label !== '生产订单号') {
+            this.newColumns.splice(3,0,{
+              label: "生产订单号",
+              slot: 'apsWorkOrderCode',
+              align: 'center',
+              minWidth: 110
+            })
+          }
+        }
+      },
+      immediate: true
     }
   },
   created() {
     this.getFieldModel();
   },
-
   mounted() {
 
     this.reload()

+ 2 - 2
src/views/produceWord/components/order-search.vue

@@ -15,7 +15,7 @@
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="生产单号:">
+        <el-form-item label="生产单号:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
@@ -91,7 +91,7 @@
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
-         
+
           >
           </el-date-picker>
         </el-form-item>