From 13ac7d4539bd67dbd1f7ebee2c24719939750d88 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 13 Feb 2023 16:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  18 +-
 src/views/basic/corpMaintain/corpMaintain.vue |   1 -
 src/views/inout/DialogEditCode.vue            |   1 -
 src/views/inout/IoAuditedOrder.vue            |  46 ++--
 src/views/inout/IoCheckErrorOrder.vue         |  99 ++++----
 src/views/inout/IoCheckSuccessOrder.vue       |  80 ++----
 src/views/inout/IoCreateOrder.vue             |  21 +-
 src/views/inout/IoCreateOrderBizDetail.vue    |   8 +
 src/views/inout/IoCreateOrderCodes.vue        | 238 +++++++++---------
 src/views/inout/IoNewOrder.vue                |  50 ++--
 src/views/inout/IoReviewOrder.vue             |   3 +-
 src/views/inout/IoUnCheckedOrder.vue          |  90 +++----
 12 files changed, 317 insertions(+), 338 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index b0b74332..a36d2ec3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -78,7 +78,7 @@ service.interceptors.request.use(config => {
 // 响应拦截器
 service.interceptors.response.use(res => {
     // 未设置状态码则默认成功状态
-    const code = res.data.code || 20000;
+    const code = res.data.code || 200;
     // 获取错误信息
     const msg = errorCode[code] || res.data.message
     // 二进制数据则直接返回
@@ -103,21 +103,27 @@ service.interceptors.response.use(res => {
         });
       }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
+    }else {
+      return res.data
+    }
+  },
+
+  /**
+   * else if (code === 500) {
       Message({
         message: msg,
         type: 'error'
       })
       return Promise.reject(new Error(msg))
-    } else if (code !== 20000) {
+    }
+
+   else if (code !== 20000) {
       Notification.error({
         title: msg
       })
       return Promise.reject('error')
-    } else {
-      return res.data
     }
-  },
+   */
   error => {
     console.log('err' + error)
     let {message} = error;
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 98313169..80c4d04f 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -322,7 +322,6 @@ export default {
         },
         // 隐藏表单
         hideForm() {
-          debugger
             // 更改值
             this.formVisible = !this.formVisible;
            // this.getList();
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 2d05e763..aabe6fca 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -109,7 +109,6 @@ export default {
       if (this.editTye == 1) {
         this.repeatAddCode(this.editData);
       } else {
-
         saveCode(this.editData)
           .then((response) => {
             console.log(response)
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index a9c675d1..07995f05 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -113,37 +114,30 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="校验状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="校验状态" prop="status" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
+<!--                checkStatus[scope.row.status]-->
+<!--              }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click.native.stop="addOrders(scope.row)"
-            >编辑
+              @click.native.stop="printDialog(scope.row)"
+            >打印
             </el-button
             >
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editBizDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -676,7 +660,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
@@ -695,7 +679,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index a42d6b48..2b5d4ad2 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -115,7 +116,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -133,17 +134,10 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editBizDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -322,16 +306,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editCodeDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -423,16 +397,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editResultDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="resultTotal>0"
@@ -444,6 +408,22 @@
       </el-tab-pane>
     </el-tabs>
 
+    <el-dialog
+      title="单据编辑"
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close='closeDialog'
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :errView="1"
+        :orderQuery="idQuery"
+      ></addOrder>
+    </el-dialog>
   </div>
 </template>
 
@@ -461,6 +441,8 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
+import addOrder from "./IoCreateOrder";
+
 const formJson = {
   site_id: "",
   site_name: "",
@@ -581,9 +563,15 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+
+
+      idQuery: {},
+      addOrderVisible: false,
     };
   },
-  components: {},
+  components: {
+    addOrder
+  },
   methods: {
     onReset() {
       this.$router.push({
@@ -701,7 +689,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
@@ -720,14 +708,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -879,18 +867,31 @@ export default {
         this.resultTotal = 0;
       });
     },
-    editResultDialog(row) {
 
+
+    //单据编辑---
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.getList();
     },
-  },
-  filters: {
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        6: "danger",
+        3: "success",
       };
       return statusMap[status];
     },
+
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 3da0e751..57733a86 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -115,7 +116,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -123,17 +124,19 @@
         </el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
+
             <el-button
               type="text"
               size="small"
-              @click.native.stop="addOrders(scope.row)"
-            >编辑
+              @click.native.stop="printDialog(scope.row.id)"
+            >打印
             </el-button
             >
+
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
@@ -230,16 +233,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editBizDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -322,16 +315,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editCodeDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -423,16 +406,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editResultDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="resultTotal>0"
@@ -444,7 +417,6 @@
       </el-tab-pane>
     </el-tabs>
 
-
     <el-dialog
       title="单据验收"
       :visible.sync="acceptOrderVisible"
@@ -502,12 +474,15 @@ export default {
         invCode: this.$store.getters.locInvCode,
       },
       checkStatus: {
-        '-1': "草稿",
-        // 1: "等待处理",
-        1: "等待处理",
-        2: "等待校验",
-        3: "校验异常",
-        4: "校验成功",
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待验收",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
       },
       storageList: [],
       invList: [],
@@ -700,7 +675,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
           if (response.code == 20000) {
@@ -718,14 +693,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -776,9 +751,6 @@ export default {
         this.bizDetailList = [];
         this.bizTotal = 0;
       })
-    },
-    editBizDialog(row) {
-
     },
     onCodeReset() {
       this.codeQuery = {
@@ -816,9 +788,6 @@ export default {
         this.codeDetailList = [];
         this.codeTotal = 0;
       })
-    },
-    editCodeDialog(row) {
-
     },
     onResultReset() {
       this.resultQuery = {
@@ -876,12 +845,13 @@ export default {
     parentByFn: function (childValue) {
       this.getList();
     },
-  },
-  filters: {
+
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
       };
       return statusMap[status];
     },
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 624a4f7d..fbde3ffb 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -151,6 +151,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="errView==1">
+          <el-col :span="20">
+            <el-form-item prop="errMsg" label="异常信息:">
+              <el-input
+                v-model="orderFormData.errMsg"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="20">
             <el-form-item prop="code" label="扫码录入:">
@@ -280,6 +290,10 @@ export default {
       type: Object,
       required: true,
     },
+    errView: {
+      type: Object,
+      required: true,
+    },
   },
   data() {
     return {
@@ -295,6 +309,7 @@ export default {
         remark: null,
         fromType: 2,
       },
+      errView: 0,
 
       //扫码相关
       codeFormData: {
@@ -498,14 +513,17 @@ export default {
       if (event == null) {
       } else event.target.select();
       this.$refs.inputRef.select();
+
       if (this.$isBlank(this.orderFormData.action)) {
         this.$message.warning("请选择单据类型！");
         return;
       }
+
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
         this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
       }
+
       this.codeFormData.code = this.codeFormData.code.trim();
       if (this.$isBlank(this.codeFormData.code)) return;
       this.loading = true;
@@ -545,6 +563,7 @@ export default {
             this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.selectUnitTitle = response.message;
+            this.$message.error(response.message);
             this.handleUnitClick(response.data);
           } else if (response.code == 504) {
 
@@ -630,7 +649,7 @@ export default {
     },
     saveOrder() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
-      tQuery.orderId = this.orderFormData.billNo;
+      tQuery.billNo = this.orderFormData.billNo;
       saveOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.closeDialog();
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/IoCreateOrderBizDetail.vue
index 050de55e..523979f0 100644
--- a/src/views/inout/IoCreateOrderBizDetail.vue
+++ b/src/views/inout/IoCreateOrderBizDetail.vue
@@ -19,6 +19,14 @@
           >第三方单据选入
           </el-button
           >
+          <el-button
+            type="primary"
+            ref="mainTable"
+            @click.native.stop="selectProductFunction()"
+            :loading="loading"
+          >领用单据选入
+          </el-button
+          >
         </el-button-group>
       </div>
 
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue
index 581f32e2..0d4d0a90 100644
--- a/src/views/inout/IoCreateOrderCodes.vue
+++ b/src/views/inout/IoCreateOrderCodes.vue
@@ -5,85 +5,87 @@
               border
               ref="multipleTable">
       <el-table-column
-          type="selection"
-          width="55">
+        type="selection"
+        width="55">
       </el-table-column>
       <el-table-column label="序号" type="index" width="55"></el-table-column>
       <el-table-column
-          label="UDI码"
-          prop="code"
-          width="280"
-          show-overflow-tooltip
+        label="UDI码"
+        prop="code"
+        width="280"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="生产日期"
-          prop="produceDate"
-          width="120"
-          show-overflow-tooltip
+        label="生产日期"
+        prop="produceDate"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="失效日期"
-          prop="expireDate"
-          width="120"
-          show-overflow-tooltip
+        label="失效日期"
+        prop="expireDate"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="批次号"
-          prop="batchNo"
-          width="120"
-          show-overflow-tooltip
+        label="批次号"
+        prop="batchNo"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="序列号"
-          prop="serialNo"
-          width="120"
-          show-overflow-tooltip
+        label="序列号"
+        prop="serialNo"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="供应商"
-          prop="supName"
-          width="180"
-          show-overflow-tooltip
+        label="供应商"
+        prop="supName"
+        width="180"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="扫码数量"
-          prop="count"
-          width="80"
-          show-overflow-tooltip
+        label="扫码数量"
+        prop="count"
+        width="80"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="实际数量"
-          prop="reCount"
-          width="80"
-          show-overflow-tooltip
+        label="实际数量"
+        prop="reCount"
+        width="80"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column label="操作" width="240">
         <template slot-scope="scope">
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteCode(scope.$index, scope.row)"
+            type="text"
+            size="small"
+            @click.native.stop="deleteCode(scope.$index, scope.row)"
           >减一
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="bindRl(scope.row)"
+            type="text"
+            size="small"
+            :disabled="scope.row.relId!=null"
+            @click.native.stop="bindRl(scope.row)"
           >绑定产品
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="handleUnitClick(scope.row)"
+            type="text"
+            size="small"
+            :disabled="scope.row.supId!=null"
+            @click.native.stop="handleUnitClick(scope.row)"
           >绑定供应商
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="editCode(scope.row)"
+            type="text"
+            size="small"
+            @click.native.stop="editCode(scope.row)"
           >编辑
           </el-button
           >
@@ -92,78 +94,78 @@
     </el-table>
     <div class="block">
       <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="query.page"
-          :limit.sync="query.limit"
-          @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
       />
     </div>
 
     <!--    绑定产品-->
     <el-dialog
-        :title="selectRlTitle"
-        :visible.sync="selectRlVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectRlVisible"
-        append-to-body
+      :title="selectRlTitle"
+      :visible.sync="selectRlVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectRlVisible"
+      append-to-body
     >
       <selectRlDialog
-          :curRow="curRow"
-          :fromCorp="fromCorp"
-          v-on:selectBindRl="selectBindRl"
-          v-on:closeBindDialog="closeBindDialog"
+        :curRow="curRow"
+        :fromCorp="fromCorp"
+        v-on:selectBindRl="selectBindRl"
+        v-on:closeBindDialog="closeBindDialog"
       ></selectRlDialog>
     </el-dialog>
 
 
     <!--    绑定供应商-->
     <el-dialog
-        :title="selectUnitTitle"
-        :visible.sync="dialogTableVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="dialogTableVisible"
-        width="80%"
-        append-to-body
+      :title="selectUnitTitle"
+      :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="dialogTableVisible"
+      width="80%"
+      append-to-body
     >
       <DialogSelectUnit
-          :codeId="curRow"
-          :fromCorp="fromCorp"
-          v-on:selectSupUnit="selectSupUnit"
-          v-on:closeBindDialog="closeBindDialog"
+        :codeId="curRow"
+        :fromCorp="fromCorp"
+        v-on:selectSupUnit="selectSupUnit"
+        v-on:closeBindDialog="closeBindDialog"
       ></DialogSelectUnit>
     </el-dialog>
 
     <el-dialog
-        :title="editTitle"
-        :visible.sync="editCodeVisible"
-        append-to-body width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="editCodeVisible"
+      :title="editTitle"
+      :visible.sync="editCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="editCodeVisible"
     >
       <editCodeDialog
-          editTye="2"
-          :closeCodeDialog="closeCodeDialog"
-          :codeDetail="codeDetail">
+        editTye="2"
+        :closeCodeDialog="closeCodeDialog"
+        :codeDetail="codeDetail">
       </editCodeDialog>
     </el-dialog>
 
     <el-dialog
-        :title="editTitle"
-        :visible.sync="editOriginCodeVisible"
-        append-to-body width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="editOriginCodeVisible">
+      :title="editTitle"
+      :visible.sync="editOriginCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="editOriginCodeVisible">
       <editCodeDialog
-          :closeCodeDialog="closeCodeDialog"
-          :repeatAddCode="repeatAddCode"
-          :codeDetail="idQuery"
-          editTye="1">
+        :closeCodeDialog="closeCodeDialog"
+        :repeatAddCode="repeatAddCode"
+        :codeDetail="idQuery"
+        editTye="1">
       </editCodeDialog>
     </el-dialog>
 
@@ -227,21 +229,21 @@ export default {
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
       errorCodeList(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            for (let i = 0; i < this.codeArray.length; i++) {
-              this.codeArray[i].fromType = this.formData.fromType;
-              this.codeArray[i].billType = this.formData.billType;
-            }
-            this.tableSelection();
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          for (let i = 0; i < this.codeArray.length; i++) {
+            this.codeArray[i].fromType = this.formData.fromType;
+            this.codeArray[i].billType = this.formData.billType;
+          }
+          this.tableSelection();
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
 
     deleteCode(index, row) {
@@ -255,14 +257,14 @@ export default {
           id: row.id
         }
         deleteCodesTempById(tQuery)
-            .then((response) => {
-              if (response.code === 20000) {
-                this.refreshPanel();
-              } else {
-                this.$message.error(response.message);
-              }
-              this.loading = false;
-            });
+          .then((response) => {
+            if (response.code === 20000) {
+              this.refreshPanel();
+            } else {
+              this.$message.error(response.message);
+            }
+            this.loading = false;
+          });
       }).catch(() => {
       });
     },
@@ -336,15 +338,16 @@ export default {
     },
 
 
-    closeBindDialog(val) {
+    closeBindDialog() {
       this.selectRlVisible = false;
       this.dialogTableVisible = false;
+      this.refreshPanel();
     },
 
     closeCodeDialog() {
       this.editCodeVisible = false;
       this.editOriginCodeVisible = false;
-      this.getCodeList();
+      this.refreshPanel();
     },
 
     repeatAddCode(editData) {
@@ -353,7 +356,6 @@ export default {
       tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
       tQuery.action = this.orderFormData.action;
       this.closeCodeDialog();
-      this.addCodeSubmit(tQuery);
 
     },
 
diff --git a/src/views/inout/IoNewOrder.vue b/src/views/inout/IoNewOrder.vue
index 482b8bbe..ecefe1fa 100644
--- a/src/views/inout/IoNewOrder.vue
+++ b/src/views/inout/IoNewOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -83,7 +84,7 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
+          <!--          <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>-->
           <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
         </el-button-group>
       </div>
@@ -116,7 +117,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -150,7 +151,7 @@
               type="text"
               size="small"
               v-if="scope.row.status !== -1"
-              @click.native.stop="onUpload(scope.row.id)"
+              @click.native.stop="onUpload(scope.row.billNo)"
             >立即处理
             </el-button
             >
@@ -260,19 +261,16 @@
 <script>
 import {
   deleteByOrderId,
-  commitOrder,
+  submitOrderWeb,
   updateUnit, mergeOrder,
   getOrderList
 } from "../../api/inout/order";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 import draggable from "vuedraggable";
-// import codeDetail from "./errorCode";
-// import ioErrorOrder from "./IOErrorOrder";todo
 import addOrder from "./IoCreateOrder";
 import store from "../../store";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
-import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 const formJson = {
@@ -307,7 +305,8 @@ export default {
         5: "校验成功",
         6: "校验异常",
         7: "审核通过",
-        8: "审核拒绝"
+        8: "审核拒绝",
+        9: "正在处理"
       },
       curIndex: "",
       unitQuery: {key: "", page: 1, limit: 20},
@@ -396,7 +395,6 @@ export default {
     };
   },
   components: {
-    draggable,
     // codeDetail,
     addOrder,
     // ioErrorOrder
@@ -422,7 +420,6 @@ export default {
       this.getList();
     },
     onSubmit() {
-      this.loading = true;
       if (this.actDateRange !== null) {
         this.filterQuery.startTime = this.actDateRange[0];
         this.filterQuery.endTime = this.actDateRange[1];
@@ -606,26 +603,18 @@ export default {
     onUpload(data) {
       this.loading = true;
       var idQuery = {
-        orderId: "",
+        billNo: "",
       };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
+      idQuery.billNo = data;
+      submitOrderWeb(idQuery)
         .then((response) => {
-          if (response.code == 20000) {
-            this.$message.success(response.data);
-            for (let i = 0; i < this.list.length; i++) {
-              if (this.list[i].id === idQuery.orderId) {
-                this.list.splice(i, 1);
-                break;
-              }
-            }
-            this.loading = false;
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
           } else {
-            this.loading = false
             this.$message.error(response.message);
           }
-        })
-        .catch(() => {
+          this.loading = false;
         });
     },
     handleErrorDetail(poistion) {
@@ -667,15 +656,16 @@ export default {
         }
       });
     },
-  },
-  filters: {
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
       };
       return statusMap[status];
     },
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoReviewOrder.vue b/src/views/inout/IoReviewOrder.vue
index d8db591b..0fdb2712 100644
--- a/src/views/inout/IoReviewOrder.vue
+++ b/src/views/inout/IoReviewOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card style="margin-top: -20px">
       <el-form :model="formData" ref="dataForm" label-width="100px">
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
@@ -37,6 +37,7 @@
             <el-form-item prop="fromCorp" label="单据类型:">
               <el-input v-model="formData.billTypeName" auto-complete="off"
                         disabled
+                        clearable
               ></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
index dfa9838a..1761c809 100644
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -133,17 +134,10 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editBizDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -322,16 +306,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editCodeDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -423,16 +397,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click.native.stop="editResultDialog(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
         </el-table>
         <pagination
           v-show="resultTotal>0"
@@ -444,6 +408,24 @@
       </el-tab-pane>
     </el-tabs>
 
+
+
+    <el-dialog
+      title="单据编辑"
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close='closeDialog'
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :orderQuery="idQuery"
+      ></addOrder>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -460,6 +442,9 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
+
+import addOrder from "./IoCreateOrder";
+
 const formJson = {
   site_id: "",
   site_name: "",
@@ -581,9 +566,15 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+
+
+      idQuery: {},
+      addOrderVisible: false,
     };
   },
-  components: {},
+  components: {
+    addOrder
+  },
   methods: {
     onReset() {
       this.$router.push({
@@ -682,7 +673,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
           if (response.code == 20000) {
@@ -700,14 +691,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -720,8 +711,6 @@ export default {
         .catch(() => {
         });
     },
-    checkOrder(orderId) {
-    },
     onBizReset() {
       this.bizQuery = {
         productName: null,
@@ -840,7 +829,18 @@ export default {
       });
     },
     editResultDialog(row) {
+    },
 
+    //单据编辑---
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.getList();
     },
   },
   filters: {