11/12 单据bug优化1.0

src/views/basic/workplace/addBusTypeDialog.vue

@@ -253,7 +253,7 @@
         <el-col :span="12" class="el-col">
           <el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">
             <el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"
-                       @change="change"
+                       @change="changeUploadIsMatching"
             >
               <el-option label="内部" :value="0"></el-option>
               <el-option label="外部" :value="1"></el-option>
@@ -264,10 +264,9 @@
           <el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">
             <el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"
                        style="width: 80%"
-                       @change="documentTypeChange"
             >
               <el-option
-                v-for="item in busTypes"
+                v-for="item in uploadTypes"
                 :key="item.name"
                 :label="item.name"
                 :value="item.code"
@@ -350,6 +349,7 @@ export default {
       },
       invList: [],
       busTypes: [],
+      uploadTypes: [],
       formRules: {
         busName: [
           {required: true, message: '请输入业务名称', trigger: 'blur'}
@@ -360,12 +360,12 @@ export default {
         documentTypeCode: [
           {required: true, message: '请选择单据类型', trigger: 'blur'}
         ],
-        uploadIsMatching: [
+        // uploadIsMatching: [
-          {required: true, message: '请选择回传系统', trigger: 'blur'}
+        //   {required: true, message: '请选择回传系统', trigger: 'blur'}
-        ],
+        // ],
-        uploadDocumentTypeCode: [
+        // uploadDocumentTypeCode: [
-          {required: true, message: '请选择回传单据类型', trigger: 'blur'}
+        //   {required: true, message: '请选择回传单据类型', trigger: 'blur'}
-        ],
+        // ],
         scanType: [
           {required: true, message: '请选择扫码方式', trigger: 'blur'}
         ],
@@ -429,6 +429,7 @@ export default {
         .catch(() => {
         })
     },
+
     change() {
       this.formData.documentTypeCode = null
       if (this.formData.isMatching == 0) {
@@ -437,7 +438,59 @@ export default {
         this.getBusTypeList()
       }
     },
+    changeUploadIsMatching() {
+      this.formData.uploadDocumentTypeCode = null
+      if (this.formData.uploadIsMatching == 0){
+        this.getUploadBusTypeList()
+      }else {
+        this.getUploadBusType()
+      }
 
+    },
+    getUploadBusType() {
+      let query = {
+        thirdSys: null,
+        key: "",
+        page: 1,
+        limit: 50
+      }
+      getOriginBusType(query)
+        .then((response) => {
+          let busTypeList = response.data.list || []
+          let busTypes = busTypeList.map(busType => {
+            return {
+              code: busType.action,
+              name: busType.name
+            }
+          })
+          this.uploadTypes = busTypes
+        })
+        .catch(() => {
+        })
+    },
+    getUploadBusTypeList() {
+      let query = {
+        enable: 1,
+        page: 1,
+        limit: 50
+      }
+      getBusTypeList(query).then(res => {
+        if (res.code == 20000) {
+          // this.uploadTypes = res.data.list || []
+          let busTypeList = res.data.list || []
+          // _this.options.getWorkPlace = res.data.list || [];
+          let busTypes = busTypeList.map(busType => {
+            return {
+              code: busType.action,
+              name: busType.name
+            }
+          })
+          this.uploadTypes = busTypes
+        } else {
+          this.$message.error('获取错误')
+        }
+      })
+    },
     documentTypeChange(val) {
       if (this.formData.isMatching == 0) {
 
@@ -489,8 +542,7 @@ export default {
           this.$message.error('获取错误')
         }
       })
-    }
+    },
-    ,
     formSubmit() {
       this.formData.workplaceCode = this.workplaceId
       if (this.formData.scanType == 1) {
@@ -594,6 +646,11 @@ export default {
       } else {
         this.getBusTypeList()
       }
+      if (this.formData.uploadIsMatching == 0){
+        this.getUploadBusTypeList()
+      }else {
+        this.getUploadBusType()
+      }
     } else {
       this.getBusTypeList()
     }
@@ -605,5 +662,9 @@ export default {
 </script>
 
 <style scoped>
-
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
 </style>

src/views/basic/workplace/workplaceQueue.vue

@@ -44,15 +44,15 @@
       >
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="出货槽编号" prop="code" show-overflow-tooltip width="160"></el-table-column>
-        <el-table-column label="货架名称" prop="name" show-overflow-tooltip width="160"></el-table-column>
+        <!--<el-table-column label="货架名称" prop="name" show-overflow-tooltip width="160"></el-table-column>-->
         <el-table-column label="产品ID" prop="relId" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="DI标识" prop="nameCode" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="所属取货架编号" prop="freightCode" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="所属摆货层编号" prop="layerCode" show-overflow-tooltip width="160"></el-table-column>
-        <el-table-column label="格数" prop="grid" show-overflow-tooltip width="160"></el-table-column>
+        <!--<el-table-column label="格数" prop="grid" show-overflow-tooltip width="160"></el-table-column>-->
-        <el-table-column label="层级标记" prop="layer" show-overflow-tooltip width="160"></el-table-column>
+        <!--<el-table-column label="层级标记" prop="layer" show-overflow-tooltip width="160"></el-table-column>-->
         <el-table-column label="是否特殊槽" prop="specialQueue" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="分配条件1" prop="assignmentTerms1" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="分配条件2" prop="assignmentTerms2" show-overflow-tooltip width="160"></el-table-column>

src/views/inoutDrug/DialogSelectProduct.vue

@@ -71,7 +71,7 @@
       >
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            <el-radio :label="scope.row.nameCode" v-model="radioCheck"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
@@ -287,7 +287,7 @@ export default {
     },
 
     handleChange(val) {
-      this.radioCheck = val.id;
+      this.radioCheck = val.nameCode;
       this.currentRow = val;
     },