Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

src/views/collect/DealOrder.vue

@@ -3,7 +3,7 @@
     <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
       <el-card>
 
-        <el-row :gutter="0"  v-if="isLinkDisabled">
+        <el-row :gutter="0" v-if="isLinkDisabled">
           <el-col :span="24" align="right">
             <div class="inv-hos-title">
             <span
@@ -106,7 +106,7 @@
           <el-col :span="8">
             <el-form-item prop="erpId" class="query-form-item" label="往来单位:">
               <el-select
-                v-model="formData.erpId"
+                v-model="formData.fromCorp"
                 placeholder="往来单位"
                 style="width: 90%"
                 filterable
@@ -267,14 +267,14 @@ export default {
       erpList: [],
       formData: {
         tagStatus: -1,
-        invCode:null,
-        workPlaceCode:null,
-        erpId:null,
+        invCode: null,
+        workPlaceCode: null,
+        erpId: null,
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
       isLinkDisabled: false,
-      userInfo:{
+      userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
@@ -329,7 +329,7 @@ export default {
       }
       listPage(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1 ) {
+        if (this.curWorkPlaces.length == 1) {
           this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
         }
       })
@@ -440,6 +440,7 @@ export default {
         this.loading = false
         if (res.code == 20000) {
           this.formData.tagStatus = 2;
+          this.formData = res.data;
         } else {
           this.$message.error(res.message)
         }
@@ -449,7 +450,6 @@ export default {
     },
 
     saveDraftOrder() {
-
       this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -465,8 +465,6 @@ export default {
         })
       }).catch(() => {
       });
-
-
     },
 
     finishOrder() {
@@ -504,7 +502,7 @@ export default {
     },
 
     printCodeResult(data, isSuccess) {
-      const resultParts = ["追溯码：" + data.code+"\r\n"];
+      const resultParts = ["追溯码：" + data.code + "\r\n"];
 
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
@@ -536,13 +534,12 @@ export default {
       this.fromList = re.data.fromList;
     });
     this.formData.invCode = this.$store.getters.locInvCode;
-    this.findCurWorkPlaces();
-    if (this.$route.query.workplaceId != null){
+    if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
       this.corpOrderIdDisabled = true
       this.formData.workplaceCode = Number(this.$route.query.workplaceId);
     }
-
+    this.findCurWorkPlaces();
 
   }