From 1414e58069d4624bc0f9dec8301cdbf84f6c4115 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Sat, 16 Dec 2023 19:19:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLading.vue     | 145 ++++++++++++++++--
 .../inventory/distrilbutionBillLadingList.vue |  37 ++++-
 .../distribution/reservation/reservation.vue  |  20 +--
 .../stockup/distributionStockupDiscuss.vue    |  20 +--
 .../stockup/distributionStockupSelf.vue       |  10 ++
 5 files changed, 189 insertions(+), 43 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 5780f175..142bc4f5 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -90,10 +90,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="物品明细" prop="certificateType">
-              <el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
+        <el-row :gutter="20" class="toscontent">
+          <el-col :span="24" >
+            <el-form-item label="物品明细" prop="certificateType" >
+              <el-tabs type="border-card"  @tab-click="handleChlickTab" style="width: 100%;">
                 <el-tab-pane label="定制品">
                   <el-button
                     type="primary"
@@ -114,15 +114,15 @@
                     @selection="selectionChange"
                   >
                     <template #default="slotProps">
-                      <el-text
+                      <el-button
                         v-if="slotProps.scope.row.isZero === '1'"
                         type="primary"
                         text
                         icon="el-icon-delete"
                         @click.stop="handleZeroOrder(slotProps.scope.row)"
-                        >录入预约数量</el-text
+                        >录入预约数量</el-button
                       >
-                      <el-text
+                      <el-button
                         v-if="
                           slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
                         "
@@ -130,23 +130,23 @@
                         text
                         icon="el-icon-delete"
                         @click.stop="handleStockZeroOrder(slotProps.scope.row)"
-                        >维护在库数量</el-text
+                        >维护在库数量</el-button
                       >
-                      <el-text
+                      <el-button
                         type="primary"
                         text
                         icon="el-icon-delete"
                         @click="rowOrder(slotProps.scope.row)"
-                        >移除</el-text
+                        >移除</el-button
                       >
                       <!-- 零担订单时不能选择包件 -->
-                      <el-text
+                      <el-button
                         v-if="Number(slotProps.scope.row.isZero) !== 1"
                         type="primary"
                         @click="handleChooseOrder(slotProps.scope.row)"
                         text
                         icon="el-icon-delete"
-                        >选择包件</el-text
+                        >选择包件</el-button
                       >
                     </template>
                   </tablecmt>
@@ -179,6 +179,82 @@
               </el-tabs>
             </el-form-item>
           </el-col>
+          <el-col v-if = !view :span="8">
+            <el-form-item label="提货证件" label-width="120px">
+              <el-upload
+                v-model:file-list="fileListSell"
+                class="upload-demo"
+                :action="action"
+                :headers="headers"
+                multiple
+                :on-preview="handlePreview"
+                :on-success="
+                  (response, file, fileList) => {
+                    uploadSuccess(fileListSell);
+                  }
+                "
+                :on-remove="handleRemove"
+                list-type="picture"
+              >
+                <el-button type="primary">上传</el-button>
+                <template #tip>
+                  <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </el-col >
+          <el-col v-if = !view :span="8">
+            <el-form-item label="文员确定图片" label-width="120px">
+              <el-upload
+                v-model:file-list="fileListClerk"
+                class="upload-demo"
+                :action="action"
+                :headers="headers"
+                multiple
+                :on-preview="handlePreview"
+                :on-success="
+                  (response, file, fileList) => {
+                    uploadSuccess(fileListClerk);
+                  }
+                "
+                :on-remove="handleRemove"
+                list-type="picture"
+              >
+                <el-button type="primary">上传</el-button>
+                <template #tip>
+                  <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col v-if = !view :span="8">
+            <el-form-item label="库管签收图片" label-width="120px">
+              <el-upload
+                v-model:file-list="fileListLibrary"
+                class="upload-demo"
+                :action="action"
+                :headers="headers"
+                multiple
+                :on-preview="handlePreview"
+                :on-success="
+                  (response, file, fileList) => {
+                    uploadSuccess(fileListLibrary);
+                  }
+                "
+                :on-remove="handleRemove"
+                list-type="picture"
+              >
+                <el-button type="primary">上传</el-button>
+                <template #tip>
+                  <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if = view>
+        <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="提货证件" label-width="120px">
               <el-upload
@@ -230,6 +306,7 @@
           <el-col :span="8">
             <el-form-item label="库管签收图片" label-width="120px">
               <el-upload
+
                 v-model:file-list="fileListLibrary"
                 class="upload-demo"
                 :action="action"
@@ -244,7 +321,7 @@
                 :on-remove="handleRemove"
                 list-type="picture"
               >
-                <el-button type="primary">上传</el-button>
+                <el-button type="primary"  :disabled = "!view">上传</el-button>
                 <template #tip>
                   <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                 </template>
@@ -252,9 +329,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-      <!-- 表单按钮 -->
-      <div class="foot" v-if="!view">
+      </div>
+
+<!--      &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
+      <div class="foot"   :disabled="view"  >
         <div class="dialog-footer">
           <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
             >提 交</el-button
@@ -492,6 +570,12 @@
         </template>
       </el-dialog>
     </template>
+    <div class="LoadIMG">
+      <el-dialog v-model="dialogImg">
+        <img w-full :src="Imgurl" alt="Preview Image" />
+      </el-dialog>
+    </div>
+
   </basic-container>
 </template>
 
@@ -518,6 +602,8 @@ import { nextTick, ref } from 'vue';
 export default {
   data() {
     return {
+      dialogImg:false,
+      Imgurl:undefined,
       OrdercolumnList: [
         {
           prop: 'serviceNumber',
@@ -549,6 +635,8 @@ export default {
       loading: false,
       // 是否为查看模式
       view: false,
+      // 是否为上传模式
+      viewSC: false,
       // 查询信息
       query: {},
       queryOrder: {},
@@ -1736,6 +1824,10 @@ export default {
       this.onLoad(this.page);
     } else if (this.$route.query.type == '3') {
       this.onLoadCj();
+    }else if (this.$route.query.type == '4') {
+      //查询提货编辑数据
+      this.view = true;
+      this.getDetailOen();
     }
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
@@ -2254,6 +2346,8 @@ export default {
     },
     handlePreview(file) {
       console.log(file);
+        this.Imgurl =file.url;
+        this.dialogImg =true;
     },
     textbox(e, index) {
       let nu = index + 1;
@@ -3023,4 +3117,23 @@ export default {
 .el-input-number {
   width: 100%;
 }
+:deep(.maboxhi){
+   height: 100% !important;
+}
+.toscontent{
+   :deep(.el-form-item__content){
+      height: 400px;
+      overflow-y: scroll;
+      align-items: flex-start;
+     }
+   :deep(.el-tabs){
+      height: 100% !important;
+     }
+}
+.LoadIMG{
+   img{
+      width: 100%;
+      height: 100%;
+   }
+}
 </style>
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 09149623..56dabc05 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -31,12 +31,12 @@
       <el-row>
         <el-col :span="4">
           <span style="margin-bottom: 2%; font-size: 16px">
-            待提货：{{ treatNum }}单/{{ numBill }}件
+            待提货：{{ treatNum }}单/{{ this.sumTotal - this.signedFor }}件
           </span>
         </el-col>
         <el-col :span="10">
           <span style="margin-bottom: 2%; font-size: 16px">
-            已提货：{{ stopNum }}单/{{ numBill }}件</span
+            已提货：{{ stopNum }}单/{{ signedFor }}件</span
           >
         </el-col>
       </el-row>
@@ -116,12 +116,22 @@
               type="primary"
               text
               icon="el-icon-edit"
-              @click="handleEdits(slotProps.scope)"
+              @click="handleEdits(slotProps.scope,'1')"
               v-if="
                 permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20
               "
               >编辑提货信息</el-text
             >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdits(slotProps.scope,'2')"
+              v-if="
+                permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions > 20
+              "
+              >上传签收图片</el-text
+            >
             <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
 
             <el-text size="small" text 
@@ -704,6 +714,8 @@ export default {
       stopNum: 0,
       treatNum: 0,
       numBill: 0,
+      signedFor: 0,
+      sumTotal: 0,
       // 分页信息
       page: {
         currentPage: 1,
@@ -1103,13 +1115,22 @@ export default {
     },
 
 
-    handleEdits(row) {
+    handleEdits(row,index) {
+       let name ;
+       let type ;
+       if(index === '1' ){
+         name = '编辑提货单'
+         type = "2";
+       }else{
+         name = "上传签收图片";
+         type = "4";
+       }
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
         query: {
           id: row.row.id,
-          name: '编辑提货单',
-          type: '2',
+          name: name,
+          type: type,
         },
       });
     },
@@ -1213,7 +1234,9 @@ export default {
         if (!!res.data.data) {
           this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum);
           this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum;
-          this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum);
+          this.signedFor = parseInt(res.data.data.signedFor); //已签收
+          this.sumTotal = parseInt(res.data.data.sumTotal); //全部
+          console.log(",.,.已签收",this.signedFor,"全部",this.sumTotal);
         }
       });
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 884a4285..2b848ba3 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -769,16 +769,16 @@ export default {
         //   sortable: true,
         // },
 
-        // {
-        //   prop: 'notes',
-        //   label: '备注',
-        //   type: 1,
-        //   values: '',
-        //   width: '140',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: false,
-        // },
+        {
+          prop: 'operator',
+          label: '操作人',
+          type: 1,
+          values: '',
+          width: '140',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
         {
           prop: '',
           label: '操作',
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 39a3aea5..2e340496 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -381,16 +381,16 @@ export default {
           sortable: true,
           head: false,
         },
-        // {
-        //   prop: 'stockupUser',
-        //   label: '操作人',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'consignee',
+          label: '客户名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'stockupStatusName',
           label: '备货状态',
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index d2956268..3bf02a31 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -370,6 +370,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
+        {
+          prop: 'consignee',
+          label: '客户名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'stockupStatusName',
           label: '备货状态',

From 920490669c1bc19e71582887f73455d55efc733c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 16 Dec 2023 20:14:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListedt.vue           | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 81527d63..6d9bc366 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -820,26 +820,26 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'isUrgentName',
-          label: '是否加急',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'assignStatusName',
-          label: '备货指派状态',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'isUrgentName',
+        //   label: '是否加急',
+        //   type: 1,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'assignStatusName',
+        //   label: '备货指派状态',
+        //   type: 1,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'stockupStatusName',
           label: '备货状态',