12/26 单据审核界面优化

src/api/collect/collectOrder.js

@@ -295,3 +295,10 @@ export function uploadCount(query) {
   });
 }
 
+export function abandonOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/abandon",
+    method: "post",
+    data: query
+  });
+}

src/views/collect/IocCollectOrderCheckCode.vue

@@ -13,6 +13,12 @@
         <el-row :gutter="0" style="margin-top: 15px">
           <el-col :span="24" align="right">
             <el-button-group>
+              <el-button
+                type="primary"
+                :disabled="orderData.billNo"
+                @click.native="selectPrescribe()"
+              >选单
+              </el-button>
               <el-button
                 type="primary"
                 :disabled="!orderData.billNo"
@@ -184,6 +190,26 @@
 
 
     </el-form>
+
+    <el-dialog
+      title="选入业务单据"
+      :visible.sync="selectPrescriptionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectPrescriptionVisible"
+      width="65%"
+      append-to-body
+    >
+      <selectPrescribeDialog
+        ref="childRef"
+        :workPlaceCode="null"
+        :busType="this.orderData.busType"
+        :fromCorp="this.orderData.fromCorp"
+        :confirmSelect="this.confirmSelect"
+        :closeDialog="this.closeDialog"
+        :viewType="viewType"
+      ></selectPrescribeDialog>
+    </el-dialog>
   </div>
 </template>
 
@@ -191,8 +217,16 @@
 import { isBlank } from '@/utils/strUtil'
 import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
 import { enterCodeBillNo, enterCodeWeb } from '@/api/inout/order'
-import { autoCodeResult, findByBill, manualCodeDetail, orderDetail } from '@/api/collect/collectOrder'
+import {
-import {  checkCollectOrderManCode, finishCheckOrder } from '@/api/collect/splitCreateOrder'
+  autoCodeResult,
+  findByBill,
+  manualCodeDetail,
+  orderDetail,
+  abandonOrder,
+  getCurOrder
+} from '@/api/collect/collectOrder'
+import { checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder } from '@/api/collect/splitCreateOrder'
+import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
 
 export default {
   name: 'IocCollectOrderCheckCode',
@@ -202,6 +236,7 @@ export default {
       required: true
     }
   },
+  components: {selectPrescribeDialog},
   data() {
     return {
       detailList: [],
@@ -254,6 +289,8 @@ export default {
       busDataTotal:0,
       //用于校验扫码数量
       codeCount: 0,
+      selectPrescriptionVisible: false,
+      viewType: 1,
 
     }
   },
@@ -382,6 +419,7 @@ export default {
           this.scanCode = ''
           this.getCodeList()
           this.getBizDetailList()
+          this.updateOrder()
         }else {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
@@ -691,11 +729,102 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.init()
+        abandonOrder(this.orderData).then(res => {
-        this.$message.success("放弃成功")
+          if (res.code == 20000){
+            this.init()
+            this.$message.success("放弃成功")
+          }else {
+            this.$message.error(res.message)
+          }
+        })
       }).catch(() => {
       });
     },
+    selectPrescribe() {
+      this.selectPrescriptionVisible = true;
+    },
+    confirmSelect(row) {
+      this.placeholder = '已选入单据，请扫描追溯码进行审核'
+      this.orderData = row;
+      this.orderData.workPlaceCode = this.workplaceId;
+      this.scanCode = ''
+      this.getCodeList()
+      this.getBizDetailList()
+      this.getInputFocus()
+      this.updateOrder()
+      this.closeDialog()
+      // this.startDeal();
+    },
+    selectAllData(){
+      this.placeholder = '已选入单据，请扫描追溯码进行审核'
+      this.scanCode = ''
+      this.orderData.workPlaceCode = this.workplaceId;
+      this.getCodeList()
+      this.getBizDetailList()
+      this.getInputFocus()
+      this.updateOrder()
+    },
+    closeDialog() {
+      this.selectPrescriptionVisible = false;
+    },
+    updateOrder() {
+      this.orderData.tagStatus = 2;
+      this.orderData.workPlaceCode = this.workplaceId;
+      updateOrder(this.orderData).then(res => {
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    saveDraftOrder() {
+      this.$confirm('此操作将挂起当前正在审核单据，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        draftOrder(this.orderData).then(res => {
+          this.loading = false
+          if (res.code == 20000) {
+            this.init()
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      }).catch(() => {
+      });
+    },
+    findCurOrder() {
+      let nextQuery = {
+        // workPlaceCode: this.formData.workPlaceCode,
+        busType: this.$route.query.busType
+      }
+      getCurOrder(nextQuery).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          let temp = res.data;
+          if (temp.tagStatus === -1) {
+            this.$confirm('检测到当前工位存在挂起单据，是否继续上一次单据处理?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.orderData = temp;
+              this.selectAllData()
+            }).catch(() => {
+            });
+          } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
+            this.orderData = temp;
+            this.selectAllData()
+          }
+
+        } else {
+          // this.$message.error(res.message)
+          this.$refs.inputRef.focus();
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
     init() {
       this.filterQuery = {
         code: '',
@@ -764,6 +893,7 @@ export default {
     // this.init()
     this.checkCodeList = []
     this.codeCount = 0
+    this.findCurOrder()
   },
   mounted() {
     this.getInputFocus()