需求121 PDA-集运签收-批量签收

src/api/cons.js

@@ -66,7 +66,7 @@ export const selectPda = (params) => {
  * 生成快递单号
  */
 export function getCourierNumber() {
-    return http(`/ecw/cons/getCourierNumber`, {
+    return http(`/ecw/cons/courier/number`, {
         method: 'GET',
     })
 }

src/pages/cons/components/batchSignCons.vue

@@ -12,7 +12,7 @@
           @submit="keyword=$event;search()"
       ></scanlistener>
       <!-- <text class="cuIcon-scan" style="font-size: 21px;" @click="scanCode"></text> -->
-      <button class="margin-left-xs" type="primary" size="mini" @click="batchSign()"
+      <button class="margin-left-xs" type="primary" size="mini" @click="getCourierNumber()"
               style="float: right;margin-top: 10rpx">
         {{ $t('生成单号') }}
       </button>
@@ -128,15 +128,17 @@
       </view>
     </uni-forms>
 
-    <uni-row class="padding-xl">
+    <uni-row class="padding-xl text-center">
       <uni-col :span="12">
-        <button type="primary" size="mini" @click="submit('form')">{{ $t('签收完成') }}</button>
+        <button type="primary" size="mini" @click="submit('form')" v-if="!newTag">
+          {{ $t('签收完成') }}
+        </button>
       </uni-col>
       <uni-col :span="12">
         <button size="mini" @click="goList">{{ $t('取消') }}</button>
       </uni-col>
       <uni-col :span="12">
-        <button type="primary" size="mini" @click="submitModel('form')">
+        <button type="primary" size="mini" @click="submitModel('form')" v-if="newTag">
           {{ $t('添加包裹并签收完成') }}
         </button>
       </uni-col>
@@ -192,7 +194,15 @@
 
 <script>
 
-import {createCons, getConsById, getConsWarehouseApp, getExpressApp, selectPda, signedPda} from "@/api/cons";
+import {
+  createCons,
+  getConsById,
+  getConsWarehouseApp,
+  getCourierNumber,
+  getExpressApp,
+  selectPda,
+  signedPda
+} from "@/api/cons";
 import {DICT_TYPE, getDictDatas} from "@/util/dict";
 import {getProductList} from "@/pages/warehousing/api";
 import selectCombox from "@/components/select-combox/select-combox.vue";
@@ -280,6 +290,12 @@ export default {
     this.getProductList();
   },
   methods: {
+    getCourierNumber() {
+      getCourierNumber().then(row => {
+        this.keyword = row
+        this.getList()
+      })
+    },
     goList() {
       uni.navigateBack({
         delta: 1
@@ -299,7 +315,6 @@ export default {
       console.log(row)
     },
     getList() {
-      console.log(this.keyword)
       if (this.keyword !== '') {
         getConsById({expressNo: this.keyword}).then(row => {
           if (row !== null) {
@@ -329,7 +344,6 @@ export default {
             })
             this.newTag = false
             this.form = row
-            console.log(this.form, '1234143212')
           } else {
             // 获取当前时间精确至[年、月、日、时、分、秒]
             var now = new Date()
@@ -457,6 +471,7 @@ export default {
       uni.scanCode({
         success: (res) => {
           this.keyword = res.result
+          this.goList()
         }
       })
     },
@@ -512,10 +527,12 @@ export default {
         }
         var form = {
           ...this.form,
-          mediaUrl: this.form.mediaUrl.map(e => e.url).join(','),
-          status: 1,
-          signer: this.$store.getters.userInfo().id,
-          signed: 1
+          mediaUrl: this.form.mediaUrl.map(e => e.url).join(',')
+        }
+        if (form.needInspect === 0) {
+          form.status = 1
+          form.signer = this.$store.getters.userInfo().id
+          form.signed = 1
         }
         if (form.mediaUrl === "") {
           uni.showToast({

src/pages/cons/components/signCons.vue

@@ -355,10 +355,7 @@ export default {
       this.$refs[ref].validate().then(res => {
         var form = {
           ...this.cons,
-          mediaUrl: this.cons.mediaUrl.map(e => e.url).join(','),
-          status: 1,
-          signer: this.$store.getters.userInfo().id,
-          signed: 1
+          mediaUrl: this.cons.mediaUrl.map(e => e.url).join(',')
         }
         if (form.mediaUrl === "") {
           uni.showToast({
@@ -367,6 +364,11 @@ export default {
           })
           return
         }
+        if (form.needInspect === 0) {
+          form.status = 1
+          form.signer = this.$store.getters.userInfo().id
+          form.signed = 1
+        }
         signedPda(form).then(() => {
           uni.showToast({
             title: `签收成功`

src/pages/cons/list.vue

@@ -72,8 +72,8 @@ export default {
       },
     };
   },
-  created() {
-    this.getData(this.keyword);
+  onShow() {
+    this.getData();
   },
   methods: {
     scanCode() {
@@ -83,7 +83,7 @@ export default {
         }
       })
     },
-    getData(keyword) {
+    getData() {
       let that = this
       const params = {
         page: this.page,