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

src/api/collect/collectOrder.js

@@ -74,6 +74,19 @@ export function autoCodeResult(query) {
   });
 }
 
+/**
+ * 删除或减扫码明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function codeRemove(query) {
+  return axios({
+    url: "/udiwms/ioSplit/collect/code/remove",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function bindWork(query) {
   return axios({

src/components/inout/baziPanel.vue

@@ -40,7 +40,7 @@
           <el-button-group style=" float: right;">
             <el-button type="primary" @click="onCodeSubmit" style="margin-left: 10px ;"
                        icon="el-icon-thumb"
-            >处理单据
+            >开始作业
             </el-button>
           </el-button-group>
         </el-form-item>

src/views/collect/PannelOrderBiz.vue

@@ -127,7 +127,7 @@
 import {convertDate} from "@/utils/date";
 import {detail} from "@/api/basic/sicker/prescribeApi";
 import {executeFuc, getHead} from "@/utils/customConfig";
-import {orderDetail} from "@/api/collect/collectOrder";
+import {orderDetail,codeRemove} from "@/api/collect/collectOrder";
 
 /**
  * 原始处方明细
@@ -179,7 +179,43 @@ export default {
     }
   },
   methods: {
-
+    deleteMan(_this, row) {
+      _this.$confirm("是否确定删除该条扫码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        _this.loading = true;
+        _this.codeRemoveMan(row.id, 2);
+      })
+    },
+    deleteCode(_this, row) {
+      _this.$confirm("是否确定移除一个条码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        _this.loading = true;
+        _this.codeRemoveMan(row.id, 1);
+      })
+    },
+    codeRemoveMan(codeManId,delType){
+      let post = {
+        codeManId: codeManId,
+        delType: delType
+      }
+      codeRemove(post).then((response) => {
+        if (response.code === 20000) {
+          this.$message.success("操作成功！");
+          this.getList(this)
+        } else {
+          this.$message.error(response.message);
+        }
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+      })
+    },
     //界面配置-------------end
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value);