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

src/api/collect/collectOrder.js

@@ -75,6 +75,14 @@ export function autoCodeResult(query) {
 }
 
 
+export function bindWork(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/bindWork",
+    method: "post",
+    data: query
+  });
+}
+
 
 
 

src/views/collect/CollectOrderAllotComponents.vue

@@ -376,10 +376,6 @@ export default {
     },
 
     bindWorkPlace(_this,row) {
-      // if (this.multiplePreSelection.length == 0) {
-      //   this.$message.warning('请先选择处方!');
-      //   return
-      // }
       _this.prescribeListData = row
       _this.bindWorkPlaceVisible = true;
 

src/views/collect/DealOrder.vue

@@ -473,6 +473,7 @@ export default {
         if (res.code == 20000) {
           this.formData.tagStatus = 2;
           this.formData = res.data;
+          this.refreshCodesPanel(this);
         } else {
           this.$message.error(res.message)
         }

src/views/collect/IoCreateOrder.vue

@@ -495,7 +495,35 @@ export default {
     DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
   },
   methods: {
-
+    successCloseData(){
+      let workPlaceCode = this.orderFormData.workPlaceCode
+      this.orderFormData ={
+        billNo: null,
+          corpOrderId: null,
+          action: null,
+          invCode: null,
+          fromCorp: null,
+          fromCorpName: null,
+          fromName: null,
+          fromInvCode: null,
+          remark: null,
+          fromType: 2,
+          errMsg: null,
+          checkPreInOrders: null,
+          checkPreInInvCode: null,
+          checkPreInSpaceCode: null,
+          curSpaceCode: null,
+          preSpaceCode: null,
+          preCurSpaceCode: null,  //单据
+          sickerAdNum: null,
+          workPlaceCode: null,
+          fifoSplit: 1,
+      }
+      this.orderFormData.workPlaceCode = workPlaceCode
+      this.scanCode= "";
+      this.corpOrderIdDisabled = false;
+      this.refreshCodesPanel()
+    },
     //获取用户仓库列表
     findInvListByUser() {
       this.curInvOptions = [];
@@ -616,7 +644,9 @@ export default {
         if (response.code === 20000) {
           // this.$message.success("成功");
           const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
-          this.closeDialog();
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
           this.clearOrder();
         } else {
           // this.$message.error(response.message);
@@ -890,6 +920,10 @@ export default {
 
     //添加条码
     addCode() {
+      if (this.$isBlank(this.orderFormData.workPlaceCode)) {
+        this.$message.warning("请选择工位！");
+        return;
+      }
       this.originCode = "";
       this.sictomText = "";
       this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
@@ -1156,7 +1190,9 @@ export default {
               this.retractLoading = false
               if (response.code == 20000) {
                 this.$message.success("撤回成功！");
-                this.closeDialog();
+                  if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
               } else {
                 this.$message.error(response.message);
               }
@@ -1182,7 +1218,9 @@ export default {
         this.codeLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-          this.closeDialog();
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
         } else {
           this.$message.error(response.message);
         }
@@ -1195,7 +1233,9 @@ export default {
         this.checkLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-          this.closeDialog();
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
         } else {
           this.$message.error(response.message);
         }
@@ -1254,7 +1294,11 @@ export default {
           }
           if (response.code === 20000) {
             this.$message.success("提交成功,等待处理，请刷新后查看！");
-            this.closeDialog();
+            this.successCloseData()
+            console.log(this.closeDialog())
+              if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1276,7 +1320,10 @@ export default {
           }
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+              if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1295,7 +1342,10 @@ export default {
 
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+              if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1335,7 +1385,11 @@ export default {
           this.submitLoading = false
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
+
           } else {
             this.$message.error(response.message);
           }
@@ -1357,7 +1411,9 @@ export default {
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
-          this.closeDialog();
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
         } else {
           this.$message.error(response.message);
         }

src/views/collect/bindWorkDialog.vue

@@ -53,7 +53,7 @@ import {
   deleteWorkplace,
   createWorkplaceId
 } from '@/api/basic/sysWorkplaceManage'
-import {bindWork} from "@/api/basic/sicker/prescribeApi";
+import {bindWork} from "@/api/collect/collectOrder";
 
 
 export default {
@@ -71,7 +71,7 @@ export default {
   data() {
     return {
       query: {
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,//this.$store.getters.locInvCode
         page: 1,
         limit: 20
       },
@@ -201,7 +201,7 @@ export default {
 
     bindWork() {
       let query = {
-        prescribeListData: this.prescribeListData,
+        collOrder: this.prescribeListData,
         workplaceCode: this.currentRow.workplaceId
       }
       bindWork(query).then(res => {