UDI待校验修改

src/api/inout/order.js

@@ -554,7 +554,6 @@ export function orderChange(query) {
 }
 
 
-
 export function rollbackWaitcheck(params) {
   return axios({
     url: "/udiwms/inout/order/waitCheck/rollback",
@@ -564,4 +563,20 @@ export function rollbackWaitcheck(params) {
 }
 
 
+export function submitCodeResult(query) {
+  return axios({
+    url: "/warehouse/inout/codeResult/submitOrderWeb",
+    method: "post",
+    data: query
+  });
+}
+
+export function submitCheckResult(query) {
+  return axios({
+    url: "/warehouse/inout/codeCheck/submitOrderWeb",
+    method: "post",
+    data: query
+  });
+}
+
 

src/api/inout/orderDetailCode.js

@@ -9,6 +9,15 @@ export function getDetailCodes(query) {
   });
 }
 
+
+export function getCheckDetailCodes(query) {
+  return axios({
+    url: "/admin/warehouse/inout/findCheckCode",
+    method: "get",
+    params: query
+  });
+}
+
 //获取业务明细
 export function getDetailBizs(query) {
   return axios({

src/views/inout/DialogCreateOrder.vue

@@ -22,12 +22,19 @@
           >草稿保存
           </el-button>
           <el-button size="mini" type="primary" @click.native="submit()"
-
+                     v-if="viewType != 7"
           >立即提交
           </el-button>
-          <el-button size="mini" type="primary" @click.native="revokeBill()"
 
-          >撤回单据
+          <el-button type="primary" @click="submit(1)"
+                     v-if="viewType == 7">校验结果提交
+          </el-button>
+          <el-button type="primary" @click="submit(2)"
+                     v-if="viewType == 7">扫码结果提交
+          </el-button>
+
+          <el-button size="mini" type="primary" @click.native="revokeBill()"
+                     v-if="viewType == 7">撤回单据
           </el-button>
 
           <!--                     v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2  || viewType !=1)"-->
@@ -429,7 +436,6 @@
         ></codesPanel>
       </el-tab-pane>
     </el-tabs>
-
     <el-dialog
       :title="editTitle"
       :visible.sync="editOriginCodeVisible"
@@ -520,11 +526,16 @@
       title="提示"
       :visible.sync="checkTipDialogVisible"
       width="30%"
+      append-to-body
       center>
       <span>{{ checkTip }}</span>
       <span slot="footer" class="dialog-footer">
           <el-button @click="checkTipDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submit()">确定</el-button>
+          <el-tooltip content="" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          <el-button type="primary" @click="submit(1)">校验结果提交</el-button>
+          <el-button type="primary" @click="submit(2)">扫码结果提交</el-button>
       </span>
     </el-dialog>
 
@@ -539,7 +550,7 @@ import {
   submitOrderWeb,
   saveOrderWeb,
   updateCodeBindSup,
-  enterCodeWeb, submitAllocateBiz, rollbackWaitcheck,
+  enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult,
 } from "../../api/inout/order";
 import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
 import {parseTime} from "../../utils/coTools";
@@ -1231,7 +1242,7 @@ export default {
 
     //撤回单据
     revokeBill() {
-      this.$confirm("是否确定撤回改单据?", "提示", {
+      this.$confirm("是否确定撤回单据至草稿状态?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -1255,14 +1266,32 @@ export default {
     },
 
 
-    //待校验以扫码结果为准
+    submitCheckDialog() {
-    submitCodeResult() {
+      this.checkTipDialogVisible = true;
+    },
 
+    //待校验以扫码结果为准
+    submitCodeResult(query) {
+      submitCodeResult(query).then((response) => {
+        if (response.code === 20000) {
+          this.$message.success("提交成功");
+          this.closeDialog();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
     },
 
     //待校验以正确结果为准
-    submitCheckResult() {
+    submitCheckResult(query) {
-
+      submitCheckResult(query).then((response) => {
+        if (response.code === 20000) {
+          this.$message.success("提交成功");
+          this.closeDialog();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
     },
 
 
@@ -1289,13 +1318,10 @@ export default {
           return;
         }
       }
-
-
       let tQuery = Object.assign(
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.orderId = this.orderFormData.billNo;
-      console.log(this.curAction)
       if (this.viewType == 2) {   //扫码单据立即提交
         submitCodes(tQuery).then((response) => {
           if (response.code === 20000) {
@@ -1329,8 +1355,31 @@ export default {
         });
       }
       if (this.viewType = 7) {    //待校验提交
+        if (val = 1) {
+          this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.submitCheckResult(tQuery);
+            })
+            .catch(() => {
+            });
 
+        } else {
+          this.$confirm("此操作将以扫码结果重新生成业务单并提交，是否继续？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.submitCodeResult(tQuery);
+            })
+            .catch(() => {
+            });
 
+        }
       } else {   //配货拣货后后提交
         submitOrderWeb(tQuery).then((response) => {
           if (response.code === 20000) {
@@ -1341,7 +1390,6 @@ export default {
           }
         });
       }
-
     },
     saveOrder() {
       let tQuery = Object.assign(

src/views/inout/PanelCreateOrderCodes.vue

@@ -94,13 +94,24 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-row>
+      <el-col span="2">
+        <span><div style="background-color: #FC4A45;width: 10px;height: 10px"></div>红色:多余条码</span>
+      </el-col>
+      <el-col span="2">
+        <div style="background-color: #F4BD25;width: 10px;height: 10px"></div>
+        <span>黄色:包含多余条码</span>
+      </el-col>
+
+    </el-row>
     <div class="block">
       <pagination
         v-show="total>0"
         :total="total"
         :page.sync="query.page"
         :limit.sync="query.limit"
-        @pagination="getList"
+        @pagination="getCodeList"
       />
     </div>
 
@@ -166,6 +177,7 @@ import selectRlDialog from "./DialogSelectRl";
 import DialogSelectUnit from "./DialogSelectUnit";
 import editCodeDialog from "./DialogEditCode";
 import {parseTime} from "@/utils/coTools";
+import {getCheckDetailCodes} from "@/api/inout/orderDetailCode";
 
 export default {
   name: "IoAddCodeDetail",
@@ -189,6 +201,10 @@ export default {
     editTitle: {
       type: Object,
       required: true,
+    },
+    viewType: {
+      type: Object,
+      required: true,
     }
 
   },
@@ -214,22 +230,41 @@ export default {
     getCodeList() {
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
-      errorCodeList(this.query) //查找该单号下的所有条码
+
-        .then((response) => {
+      if (this.viewType == 7) {
-          this.codeArray = response.data.list || [];
+        //展示带校验条码
-          this.total = response.data.total || 0;
+        getCheckDetailCodes(this.query) //查找该单号下的所有条码
-          for (let i = 0; i < this.codeArray.length; i++) {
+          .then((response) => {
-            this.codeArray[i].fromType = this.formData.fromType;
+            this.codeArray = response.data.list || [];
-            this.codeArray[i].billType = this.formData.billType;
+            this.total = response.data.total || 0;
-          }
+            this.loading = false;
-          this.tableSelection();
+          })
-          this.loading = false;
+          .catch(() => {
-        })
+            this.loading = false;
-        .catch(() => {
+            this.detailList = [];
-          this.loading = false;
+            this.total = 0;
-          this.list = [];
+          });
-          this.total = 0;
+
-        });
+      } else {
+        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;
+          });
+      }
+
+
     },
 
     deleteCode(index, row) {
@@ -277,6 +312,11 @@ export default {
       if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
         rowBackground.color = '#f60303';
       }
+      if (row.checkStatus == 2) {
+        rowBackground.color = '#F7BB29';
+      } else if (row.checkStatus == 1) {
+        rowBackground.color = '#FC4A45';
+      }
       return rowBackground;
     },