代码更新

lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue

@@ -35,16 +35,17 @@
         <el-select
           v-model="form.bill_type"
           clearable
+          filterable
+          size="mini"
           placeholder="业务类型"
-          style="width: 210px"
           class="filter-item"
-          :disabled="true"
+          disabled
         >
           <el-option
-            v-for="item in billtypelist"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
+            v-for="item in dict.ST_INV_OUT_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
         </el-select>
       </el-form-item>
@@ -138,11 +139,7 @@
         <el-table-column prop="pcsn" label="子卷批次号" align="center" />
         <el-table-column prop="storagevehicle_code" label="箱号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-<<<<<<< HEAD
         <el-table-column prop="struct_code" label="起始位置" align="center" />
-=======
-        <el-table-column prop="start_point_code" label="起始位置" align="center" />
->>>>>>> 695691a39c6d107f14dda8207696b91d671272a4
         <el-table-column prop="next_point_code" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
@@ -163,7 +160,7 @@ export default {
   name: 'ViewDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL'],
+  dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL','ST_INV_OUT_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -178,7 +175,6 @@ export default {
       dialogVisible: false,
       tableDtl: [],
       tabledis: [],
-      billtypelist: [],
       storlist: [],
       currentdtl: null,
       currentDis: {},