ysy 2 лет назад
Родитель
Сommit
86de858f67
2 измененных файлов с 14 добавлено и 11 удалено
  1. 10 7
      src/views/produceOrder/components/order-dailog.vue
  2. 4 4
      src/views/produceOrder/index.vue

+ 10 - 7
src/views/produceOrder/components/order-dailog.vue

@@ -1,8 +1,8 @@
 <template>
   <ele-modal
     :visible.sync="visible"
-    title="添加工单-选择设备"
-    width="65vw"
+    title="添加工单"
+    width="75vw"
     append-to-body
   >
     <div class="search-box">
@@ -54,14 +54,16 @@
             showOverflowTooltip: true
           },
           {
-            slot: 'code',
+            prop: 'code',
             label: '生产工单号',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'productionPlanCode',
             label: '计划编号',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'planType',
@@ -69,8 +71,8 @@
             align: 'center'
           },
           {
-            prop: 'produceVersionName',
-            label: '生产版本',
+            prop: 'produceRoutingName',
+            label: '工艺路线',
             align: 'center'
           },
           {
@@ -189,6 +191,7 @@
           pageNum: page,
           size: limit,
           code: this.orderCode,
+          isSplit: 0,
           statusList: [5, 4, 7]
         });
       },

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

@@ -45,14 +45,14 @@
             <el-link type="primary" :underline="false" icon="el-icon-truck" v-if="row.status == 6" @click="toCancel(row)">
               取消完结
             </el-link></template>
-          <template v-else>
-            <el-link type="primary" :underline="false" icon="el-icon-truck" @click="handleOrderPublish(1, row)">
+          <template v-if="activeName != 'second'">
+            <el-link v-if="row.isSplit == 0" type="primary" :underline="false" icon="el-icon-truck" @click="handleOrderPublish(1, row)">
               报工
             </el-link>
-            <el-link type="primary" v-if="row.status == 4" :underline="false" icon="el-icon-truck" @click="toUnpack(row)">
+            <el-link v-if="row.status == 4 && row.isSplit == 0 && !row.originalCode " type="primary" :underline="false" icon="el-icon-truck" @click="toUnpack(row)">
               拆分
             </el-link>
-            <el-link type="primary" :underline="false" icon="el-icon-edit" @click="toEnd(row)">
+            <el-link v-if="row.isSplit == 0" type="primary" :underline="false" icon="el-icon-edit" @click="toEnd(row)">
               完结
             </el-link>
           </template>