From ccb3fd8ad5b5a459ea3188b3f3e417e3668d1290 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 15 Jun 2023 20:27:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basic/basicForklift.js             | 16 +++++++++++++
 .../distribution/distributionSigndetail.js    |  2 +-
 .../distribution/distributionSignfor.js       | 16 ++++++-------
 .../signdetail/distributionSigndetail.vue     | 14 ++++++++++-
 .../signfor/distributionSignfor.vue           | 23 ++++++++++++++-----
 5 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/option/basic/basicForklift.js b/src/option/basic/basicForklift.js
index cbf3e025..7b05d2eb 100644
--- a/src/option/basic/basicForklift.js
+++ b/src/option/basic/basicForklift.js
@@ -172,6 +172,22 @@ export default {
         value: 'dictKey',
       },
     },
+
+    {
+      label: "所属仓库",
+      prop: "owningWarehouse",
+      type: "select",
+      labelWidth:'150',
+      width:"100px",
+      align:'center',
+      span:11,
+      filterable: true,
+      dicUrl: "/api/logpm-basicdata/warehouse/dictionary",
+      props: {
+        label: "name",
+        value: "id",
+      },
+    },
     {
       label: "摘要",
       prop: "abstract",
diff --git a/src/option/distribution/distributionSigndetail.js b/src/option/distribution/distributionSigndetail.js
index 017712ef..2d97d8e2 100644
--- a/src/option/distribution/distributionSigndetail.js
+++ b/src/option/distribution/distributionSigndetail.js
@@ -98,7 +98,7 @@ export default {
       label: "服务号",
       prop: "serviceNumber",
       display: false,
-      hide: true,
+      // hide: true,
     },
     {
       label: "配送/自提单号",
diff --git a/src/option/distribution/distributionSignfor.js b/src/option/distribution/distributionSignfor.js
index 054e143a..5cd7601b 100644
--- a/src/option/distribution/distributionSignfor.js
+++ b/src/option/distribution/distributionSignfor.js
@@ -170,14 +170,14 @@ export default {
       label: "签收类型;1-签收,2-代签收",
       prop: "signingType",
     },
-    {
-      label: "文员复核图片",
-      prop: "clerkSignPictures",
-    },
-    {
-      label: "司机签收图片",
-      prop: "deliverySignPictures",
-    },
+    // {
+    //   label: "文员复核图片",
+    //   prop: "clerkSignPictures",
+    // },
+    // {
+    //   label: "司机签收图片",
+    //   prop: "deliverySignPictures",
+    // },
     {
       label: "服务号",
       prop: "serviceNumber",
diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index fdaa348a..ac7f5a70 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -4,6 +4,16 @@
       <el-row :hidden="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
+          <el-form-item label="时间">
+            <!--            <el-input v-model="query.warehousingTime" placeholder="请输入时间"></el-input>-->
+            <el-date-picker
+              v-model="query.warehousingTime"
+              type="date"
+              placeholder="请输入时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
           <!-- 查询按钮 -->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -308,7 +318,9 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      // this.query.warehousingTime =  new Date(this.query.warehousingTime)
+      // console.log("this.query.warehousingTime>>>>>>>>",this.query.warehousingTime);
+      getPage(page.currentPage, page.pageSize,  this.query).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 12cc06cb..9578faf6 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -91,9 +91,9 @@
           <el-form-item label="收货地址" prop="deliveryAddress">
             <el-input v-model="form.deliveryAddress" placeholder="请输入收货地址"/>
           </el-form-item>
-          <el-form-item label="服务类型" prop="serveType">
-            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>
-          </el-form-item>
+<!--          <el-form-item label="服务类型" prop="serveType">-->
+<!--            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
+<!--          </el-form-item>-->
 <!--          <el-form-item label="配送仓库" prop="distributingWarehouse">-->
 <!--            <el-input v-model="form.distributingWarehouse" placeholder="请输入配送仓库"/>-->
 <!--          </el-form-item>-->
@@ -134,8 +134,8 @@
 <!--              </el-option>-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="签收类型;1-签收,2-代签收" prop="signingType">
-            <el-select v-model="form.signingType" clearable placeholder="请选择签收类型;1-签收,2-代签收">
+          <el-form-item label="签收类型" prop="signingType">
+            <el-select v-model="form.signingType" clearable placeholder="请选择签收类型">
               <el-option
                 v-for="item in signingTypeData"
                 :key="item.dictKey"
@@ -145,7 +145,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="文员复核图片" prop="clerkSignPictures">
-            <el-input v-model="form.clerkSignPictures" placeholder="请输入文员复核图片"/>
+            <el-input v-model="form.clerkSignPictures" placeholder="请上传文员复核图片"/>
           </el-form-item>
 <!--          <el-form-item label="司机签收图片" prop="deliverySignPictures">-->
 <!--            <el-input v-model="form.deliverySignPictures" placeholder="请输入司机签收图片"/>-->
@@ -173,6 +173,7 @@
 import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionSignfor";
 import option from "@/option/distribution/distributionSignfor";
 import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
 
 export default {
   data () {
@@ -190,6 +191,9 @@ export default {
       view: false,
       // 查询信息
       query: {},
+      //签收类型
+      signingTypeData:[],
+      signingStatusData:[],
       // 分页信息
       page: {
         currentPage: 1,
@@ -207,6 +211,7 @@ export default {
     }
   },
   mounted () {
+    this.queryDictionary();
     this.init();
     this.onLoad(this.page);
   },
@@ -221,6 +226,11 @@ export default {
     }
   },
   methods: {
+    queryDictionary() {
+      getDictionaryBiz('yes_no').then(res => {
+        this.isDepositData = res.data.data;
+      });
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -337,6 +347,7 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
+      this.query.signingStatus_notequal = 2
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;