From e19e2aa1e8140a19fa85a32859b8c0e06e5dfd5a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 7 Nov 2023 17:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/moreProject/moreProject.vue        |  7 ++-
 pages/nongKe/gather/select_warehouse.vue | 67 +++++++++++++-----------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index dec447f..bb8dee9 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -227,7 +227,12 @@
                 <view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
                   <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
                   </image>
-                  <text class="text">代发补货</text>
+                  <text class="text">代发订单</text>
+                </view>
+                <view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
+                  <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
+                  </image>
+                  <text class="text">补货订单</text>
                 </view>
 
                 <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 997dcde..ddacc96 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -242,20 +242,22 @@
         showModel: false,
         showModelCode: '',
         goods: [
-           // {
-           //                  "id": 35,
-           //                                 "store_name": "DT15150（箱装）心相印茶语丝享系列150抽24包装三层塑装纸面巾（电商）",
-           //                                 "bar_code": "6903244675314",
-           //                                 "manu_address": "",
-           //                                 "price": "0.00",
-           //                                 "stock": 9999999,
-           //                                 "image": "https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230130/00ebcfdf75684f5494c0193075055d1.png",
-           //                                 "slider_image": [],
-           //                                 "spec": "1包",
-           //                                 "trademark": "心相印",
-           //                                 "manu_name": null,
-           //                                 "note": "备注：经查，该厂商识别代码已在中国物品编码中心注册，但编码信息未按规定通报"
-           //             },
+          //  {
+          //     "id": 7,
+          //     "store_name": "心心相印 纸面巾400张",
+          //     "bar_code": "6922868290895",
+          //     "manu_address": "",
+          //     "price": "4.80",
+          //     "stock": 9999999,
+          //     "image": "http://lihai001.oss-cn-chengdu.aliyuncs.com/def/2023-11-02/202311021740247976.jpg",
+          //     "slider_image": [
+          //         "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e4784202311041417185146.jpg"
+          //     ],
+          //     "spec": "****(企业未公开详细信息！)",
+          //     "trademark": "****(企业未公开详细信息！)",
+          //     "manu_name": null,
+          //     "note": "备注：经查，该厂商识别代码已在中国物品编码中心注册，但编码信息未按规定通报login_date：Jul 13 1998 12:00:00:000AM；valid_date：Jul 13 2020 12:00:00:000AM；"
+          // },
 
         ],
         putGoods: { // 加入店铺信息
@@ -316,25 +318,29 @@
         return flag;
       },
       clickImg(data, type, index){
-        if(!data.update&&!this.uploadImgIdList.get(data.id)){
-          let arr = [];
-          if(this.isNullImage(data.image))arr.push(-1);
-          if(this.isNullImage(data.slider_image[0]))arr.push(0);
-          if(this.isNullImage(data.slider_image[1]))arr.push(1);
-          if(this.isNullImage(data.slider_image[2]))arr.push(2);
-          this.uploadImgIdList.set(data.id, arr)
-        }
-        let obj = this.uploadImgIdList.get(data.id) || [];
-        if(type==1&&!obj.includes(-1)) return ;
-        if(type==2&&!obj.includes(index)) return ;
+        // 已有的图片不允许更改
+        // if(!data.update&&!this.uploadImgIdList.get(data.id)){
+        //   let arr = [];
+        //   if(this.isNullImage(data.image))arr.push(-1);
+        //   if(this.isNullImage(data.slider_image[0]))arr.push(0);
+        //   if(this.isNullImage(data.slider_image[1]))arr.push(1);
+        //   if(this.isNullImage(data.slider_image[2]))arr.push(2);
+        //   this.uploadImgIdList.set(data.id, arr)
+        // }
+        // let obj = this.uploadImgIdList.get(data.id) || [];
+        // if(type==1&&!obj.includes(-1)) return ;
+        // if(type==2&&!obj.includes(index)) return ;
         this.uploadImgInfo.id = data.id;
         this.uploadImgInfo.type = type;
         this.uploadImgInfo.index = index;
-        if(data.image==this.defaultImageSRC||(type==2&&this.isNullImage(data.slider_image[index]))){
-          this.chooseImg()
-        }else if(data.update){
-          this.chooseImg()
-        }
+        // if(data.image==this.defaultImageSRC||(type==2&&this.isNullImage(data.slider_image[index]))){
+        //   this.chooseImg()
+        // }else if(data.update){
+        //   this.chooseImg()
+        // }
+        
+        // 如需改成已有的图片不可更改,请将上部分代码注释解开并将以下代码注释
+        this.chooseImg()
       },
       chooseImg(){
         let that = this;
@@ -1210,6 +1216,7 @@
   }
 
   .list-box-put {
+    padding-bottom: 30rpx;
     .item {
       width: 694rpx;
       margin: 0 auto;