界面优化

src/api/collect/collectOrder.js

@@ -9,6 +9,14 @@ export function orderPage(query) {
   });
 }
 
+export function getNextOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/next",
+    method: "get",
+    params: query
+  });
+}
+
 export function orderDetail(query) {
   return axios({
     url: "/udiwms/basic/collect/order/detail",

src/api/collect/splitCreateOrder.js

@@ -20,6 +20,14 @@ export function tagCode(query) {
   });
 }
 
+export function startSplit(query) {
+  return axios({
+    url: "/udiwms/ioSplit/material/order/split",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function finishOrder(query) {
   return axios({

src/views/collect/DealOrder.vue

@@ -38,7 +38,7 @@
               <el-button
                 type="primary"
                 :disabled="isSelectOrder"
-                @click.native="selectPrescribe()"
+                @click.native="nextCollectOrder()"
               >下一单据
               </el-button>
               <el-button
@@ -234,9 +234,10 @@ import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {enterCodeWeb} from "@/api/inout/order";
-import {draftOrder, finishOrder, tagCode} from "@/api/collect/splitCreateOrder";
+import {draftOrder, finishOrder, startSplit, tagCode} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
+import {getNextOrder} from "@/api/collect/collectOrder";
 
 export default {
   /**
@@ -265,7 +266,7 @@ export default {
       list: [],
       total: 0,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      formDataVisible:{
+      formDataVisible: {
         operationType: null,
         unitTittle: "往来单位",
         corpType: 1,
@@ -309,7 +310,7 @@ export default {
   methods: {
     findFromInvList(val) {
       let cQuery = {
-        corpType:this.formDataVisible.corpType,
+        corpType: this.formDataVisible.corpType,
       };
       selectCorpList(cQuery)
         .then((response) => {
@@ -318,9 +319,12 @@ export default {
         .catch(() => {
         });
     },
-    workPlaceCodeChange(value){
-      this.curWorkPlaces.forEach(item => {if(item.workplaceId == value){ this.formDataVisible =  item
-      } })
+    workPlaceCodeChange(value) {
+      this.curWorkPlaces.forEach(item => {
+        if (item.workplaceId == value) {
+          this.formDataVisible = item
+        }
+      })
       if (this.formDataVisible.operationType == 1){
         this.findFromInvList("");
       }
@@ -355,7 +359,7 @@ export default {
       }
       listPage(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1  && this.formData.workPlaceCode == null) {
+        if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) {
           this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
         }
         this.workPlaceCodeChange(this.formData.workPlaceCode);
@@ -513,10 +517,26 @@ export default {
 
     },
 
+    //选择单据
     selectPrescribe() {
       this.selectPrescriptionVisible = true;
     },
 
+    //获取下一单据
+    nextCollectOrder() {
+      getNextOrder(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.formData = res.data;
+          this.dealSplitOrder()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
     closeDialog() {
       this.selectPrescriptionVisible = false;
     },
@@ -525,9 +545,27 @@ export default {
       this.selectPrescriptionVisible = false;
       this.formData = row;
       this.curRow = row;
+      this.dealSplitOrder()
       this.refreshCodesPanel(this);
     },
 
+    //开始拆零
+    dealSplitOrder() {
+      startSplit(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          console.log(res.data)
+          this.refreshCodesPanel(this);
+        } else {
+          console.log(res.message)
+
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
+
     printCodeResult(data, isSuccess) {
       const resultParts = ["追溯码：" + data.code + "\r\n"];