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

src/api/cons.js

@@ -6,7 +6,7 @@ import http from '../util/http'
 export const consPage = (params) => {
     return http(`/ecw/cons/page`, params, {
         method: 'GET',
-    });
+    })
 }
 
 /**
@@ -15,7 +15,7 @@ export const consPage = (params) => {
 export const getConsWarehouseApp = () => {
     return http(`/ecw/warehouse/getConsWarehouseApp`, {
         method: 'GET',
-    });
+    })
 }
 
 /**
@@ -24,7 +24,7 @@ export const getConsWarehouseApp = () => {
 export function getExpressApp() {
     return http(`/ecw/express/getExpressApp`, {
         method: 'GET',
-    });
+    })
 }
 
 /**
@@ -46,10 +46,28 @@ export const getConsById = (params) => {
 }
 
 /**
- * 新增包裹
+ * 签收包裹
  */
 export const signedPda = (params) => {
     return http('/ecw/cons/signedPda', params, {
         method: 'put',
     })
 }
+/**
+ * 获得客户联系人下拉框列表
+ */
+export const selectPda = (params) => {
+    return http('/ecw/customer-contacts/selectPda', params, {
+        method: 'get',
+    })
+}
+
+/**
+ * 生成快递单号
+ */
+export function getCourierNumber() {
+    return http(`/ecw/cons/getCourierNumber`, {
+        method: 'GET',
+    })
+}
+

src/pages.json

@@ -409,6 +409,13 @@
 			{
 				"navigationBarTitleText": "包裹签收"
 			}
+		},
+		{
+			"path" : "pages/cons/components/batchSignCons",
+			"style" :
+			{
+				"navigationBarTitleText": "批量签收包裹"
+			}
 		}
     ],
 	"globalStyle": {

src/pages/cons/components/createCons.vue

@@ -2,8 +2,8 @@
   <view style="background: #fff; min-height: calc(100vh - 44px)">
     <!-- 自定义表单校验 -->
     <uni-forms ref="form" :rules="rules" :modelValue="form" label-width="100" class="padding-xs">
-      <uni-forms-item :label="$t('集运仓库')" required name="warehouseId">
-        <uni-data-checkbox v-model="form.warehouseId" :localdata="warehouseList" mode="tag"></uni-data-checkbox>
+      <uni-forms-item :label="$t('集运仓库')" required name="wareId">
+        <uni-data-checkbox v-model="form.wareId" :localdata="warehouseList" mode="tag"></uni-data-checkbox>
       </uni-forms-item>
       <uni-forms-item label="快递单号" required name="expressNo">
         <uni-easyinput placeholder="请输入快递单号" v-model="form.expressNo"/>
@@ -16,7 +16,7 @@
       </uni-forms-item>
       <uni-row class="padding-xs" v-for="(item,index) in consItemVOList">
         <uni-col :span="3">
-          <uni-forms-item :label="'商品'+(index + 1)" class="align-center"/>
+          <uni-forms-item :label="'商品'+(index + 1)"/>
         </uni-col>
         <uni-col :span="8">
           <view @click="tagIndex(index)">
@@ -41,7 +41,7 @@
         </uni-col>
       </uni-row>
       <button class="margin-left-xs" type="primary" size="mini" @click="addProduct()">
-        {{ $t('添加') }}
+        {{ $t('添加一行') }}
       </button>
       <uni-forms-item label="填单数据" class="align-center">
         {{ sum }}个
@@ -111,7 +111,6 @@ export default {
   },
   data() {
     return {
-      range: [{"value": 0, "text": "义乌仓"}, {"value": 1, "text": "佛山仓"}],
       // 自定义表单数据
       form: {},
       // 自定义表单校验规则
@@ -122,7 +121,7 @@ export default {
             errorMessage: '快递单号不能为空'
           }]
         },
-        warehouseId: {
+        wareId: {
           rules: [{
             required: true,
             errorMessage: '集运仓库不能为空'
@@ -154,7 +153,7 @@ export default {
     getConsWarehouseApp().then(row => {
       this.warehouseList = row
       if (row) {
-        this.form.warehouseId = row[0].value
+        this.form.wareId = row[0].value
       }
     })
     getExpressApp().then(row => {

src/pages/cons/components/signCons.vue

@@ -182,7 +182,6 @@ export default {
   data() {
     return {
       iconPath,
-      range: [{"value": 0, "text": "义乌仓"}, {"value": 1, "text": "佛山仓"}],
       // 自定义表单校验规则
       rules: {
         expressNo: {
@@ -257,7 +256,7 @@ export default {
           var defaultDate = `${year}-${month}-${date} ${hours}:${minutes}:${seconds}`
           row['signedTime'] = defaultDate
         }
-        row.mediaUrl = row.mediaUrl.split(',').map(e => {
+        row.mediaUrl = (row.mediaUrl === null || row.mediaUrl === '') ? [] : row.mediaUrl.split(',').map(e => {
           return {
             url: e,
             type: ['jpg', 'png', 'jpeg', 'heic'].includes(e.split('.')?.reverse()[0]) ? 'image' : 'video'
@@ -406,8 +405,8 @@ export default {
       })
     },
     goList() {
-      uni.redirectTo({
-        url: '/pages/cons/list'
+      uni.navigateBack({
+        delta: 1
       })
     },
     delProduct(index) {

src/pages/cons/list.vue

 <template>
   <view style="background: #fff; min-height: calc(100vh - 44px)">
+
     <view class="search-header">
       <!-- <uni-search-bar class="uni-mt-10" @confirm="search" placeholder="请输入订单号" radius="100" v-model="keyword" cancelButton="none" clearButton="none" ></uni-search-bar> -->
       <scanlistener
@@ -12,6 +13,9 @@
           @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()" style="float: right">
+        {{ $t('批量签收') }}
+      </button>
     </view>
 
     <view class="scroll">
@@ -119,7 +123,12 @@ export default {
       //   url: '/pages/cons/components/createCons'
       // });
       uni.navigateTo({
-        url: '/pages/cons/components/signCons?consId='+v.id
+        url: '/pages/cons/components/signCons?consId=' + v.id
+      });
+    },
+    batchSign() {
+      uni.navigateTo({
+        url: '/pages/cons/components/batchSignCons'
       });
     }
   }