切换分支代码备份

src/api/inout/order.js

@@ -553,3 +553,15 @@ export function orderChange(query) {
   });
 }
 
+
+
+export function rollbackWaitcheck(params) {
+  return axios({
+    url: "/udiwms/inout/order/waitCheck/rollback",
+    method: "get",
+    params: params
+  });
+}
+
+
+

src/views/basic/product/productEdit.vue

@@ -345,7 +345,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="!editQuery.useMuti"
-                          type="number" v-model="editQuery.zdcfsycs"></el-input>
+                          type="number" v-model="editQuery.useNum"></el-input>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">

src/views/inout/DialogCreateOrder.vue

@@ -22,23 +22,29 @@
           >草稿保存
           </el-button>
           <el-button size="mini" type="primary" @click.native="submit()"
-                     v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2  || viewType !=1)"
+
           >立即提交
           </el-button>
-          <el-button size="mini" type="primary" @click.native="submit(1)"
+          <el-button size="mini" type="primary" @click.native="revokeBill()"
-                     v-if="curAction.checkWebNew > 1  && viewType == 1"
-          >待配货提交
-          </el-button>
 
-          <el-button size="mini" type="primary" @click.native="submit(1)"
+          >撤回单据
-                     v-if="viewType == 5"
-          >完成验收
           </el-button>
 
-          <el-button size="mini" type="primary" @click.native="submit(1)"
+          <!--                     v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2  || viewType !=1)"-->
-                     v-if=" viewType == 6"
+          <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-          >完成验收
+          <!--                     v-if="curAction.checkWebNew > 1  && viewType == 1"-->
-          </el-button>
+          <!--          >待配货提交-->
+          <!--          </el-button>-->
+
+          <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
+          <!--                     v-if="viewType == 5"-->
+          <!--          >完成验收-->
+          <!--          </el-button>-->
+
+          <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
+          <!--                     v-if=" viewType == 6"-->
+          <!--          >完成验收-->
+          <!--          </el-button>-->
 
         </el-button-group>
         <el-row>
@@ -69,7 +75,6 @@
           </el-col>
         </el-row>
         <el-row>
-
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
               <el-select
@@ -387,12 +392,12 @@
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
       <el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
-        <biz-detail-panel
+        <checkResultPanel
           :idQuery="orderFormData"
           :viewType="viewType"
           :curBustype="curAction"
           v-if="isCheckResultAlive"
-        ></biz-detail-panel>
+        ></checkResultPanel>
       </el-tab-pane>
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible || (viewType ==5 || viewType==6)">
         <biz-detail-panel
@@ -477,7 +482,6 @@
       ></DialogSelectUnit>
     </el-dialog>
 
-
     <!--    绑定产品-->
     <el-dialog
       :title="selectRlTitle"
@@ -496,7 +500,6 @@
       ></selectRlDialog>
     </el-dialog>
 
-
     <el-dialog
       title="请指定当前产品所在货位"
       :visible.sync="selectSpaceVisible"
@@ -513,6 +516,18 @@
     </el-dialog>
 
 
+    <el-dialog
+      title="提示"
+      :visible.sync="checkTipDialogVisible"
+      width="30%"
+      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>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -524,7 +539,7 @@ import {
   submitOrderWeb,
   saveOrderWeb,
   updateCodeBindSup,
-  enterCodeWeb, submitAllocateBiz,
+  enterCodeWeb, submitAllocateBiz, rollbackWaitcheck,
 } from "../../api/inout/order";
 import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
 import {parseTime} from "../../utils/coTools";
@@ -618,7 +633,7 @@ export default {
       fromOptions: [],
       isCodeAlive: true,
       bizShow: true,
-      isCheckResultAlive: false,
+      isCheckResultAlive: true,
       isBizDetailAlive: true,
       isCodeDetailAlive: true,
       editCodeVisible: false,
@@ -679,6 +694,8 @@ export default {
       preSpaceShow: false,     //寄售，预验收仓库界面
 
       spaceCodeList: [],
+      checkTipDialogVisible: false,
+      checkTip: null,
     };
   },
   components: {
@@ -1189,18 +1206,66 @@ export default {
       this.isCodeAlive = false;
       this.isBizDetailAlive = false;
       this.isCodeDetailAlive = false;
+
       this.$nextTick(() => {
         //重新加载组件
         this.isCodeAlive = true;
         this.isBizDetailAlive = true;
         this.isCodeDetailAlive = true;
+
+      });
+
+      //选择性刷新
+      if (this.isCheckResultAlive) {
+        this.isCheckResultAlive = false;
+        this.$nextTick(() => {
+          //重新加载组件
+          this.isCheckResultAlive = true;
         });
+      }
     },
 
     refreshOrder(orderQuery) {
       this.orderFormData = orderQuery;
     },
 
+    //撤回单据
+    revokeBill() {
+      this.$confirm("是否确定撤回改单据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {billNo: this.orderFormData.billNo};
+
+          rollbackWaitcheck(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message.success("撤回成功！");
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+
+
+    //待校验以扫码结果为准
+    submitCodeResult() {
+
+    },
+
+    //待校验以正确结果为准
+    submitCheckResult() {
+
+    },
+
+
     submit(val) {
       if (this.$isBlank(this.orderFormData.action)) {
         this.$message.warning("单据类型不能为空！");
@@ -1262,7 +1327,11 @@ export default {
             this.$message.error(response.message);
           }
         });
-      } else {   //校验后提交
+      }
+      if (this.viewType = 7) {    //待校验提交
+
+
+      } else {   //配货拣货后后提交
         submitOrderWeb(tQuery).then((response) => {
           if (response.code === 20000) {
             this.$message.success("提交成功");

src/views/inout/IoDealCheckOrder.vue

@@ -342,6 +342,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        vueType: "waitCheck",
       },
       viewType: 7,
       checkStatus: {
@@ -460,6 +461,7 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
+        vueType: "waitCheck",
         invCode: this.$store.getters.locInvCode,
       };
       this.actDateRange = [];
@@ -495,7 +497,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        vueType: "supDelivery",
+        vueType: "waitCheck",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -639,6 +641,9 @@ export default {
       if (!row.checkSuccess) {
         rowBackground.color = '#f60303';
       }
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
       return rowBackground;
     },
 

src/views/inout/IoDealOrder.vue

@@ -366,6 +366,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        vueType: "waitDeal",
       },
       viewType: 3,
       checkStatus: {
@@ -484,6 +485,7 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
+        vueType: "waitDeal",
         invCode: this.$store.getters.locInvCode,
       };
       this.actDateRange = [];
@@ -519,7 +521,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        vueType: "supDelivery",
+        vueType: "waitDeal",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -664,6 +666,9 @@ export default {
       if (!row.checkSuccess) {
         rowBackground.color = '#f60303';
       }
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
       return rowBackground;
     },
 

src/views/inout/PanelCreateOrderCheckDetail.vue

@@ -151,11 +151,11 @@ export default {
   methods: {
     getOrderDetails() {
       this.loading = true;
-      this.query.orderId = this.idQuery.billNo;
+      this.query.orderIdFk = this.idQuery.billNo;
       getCheckDetailList(this.query) //查找该单号下的所有条码
         .then((response) => {
-          this.detailList = response.data.list || [];
+          this.detailList = response.data || [];
-          this.total = response.data.total || 0;
+          this.total = response.data || 0;
           this.loading = false;
         })
         .catch(() => {
@@ -198,6 +198,9 @@ export default {
       if (!row.checkSuccess) {
         rowBackground.color = '#f60303';
       }
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
       return rowBackground;
     },