From 2d88fe3e6a0744cd5893d8da27ce4f9cf467f568 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 18 Jan 2024 18:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                                     |  4 ++--
 manifest.json                                     |  4 ++--
 pages/nongKe/gather/select_warehouse.vue          | 13 ++++++++++++-
 pages/product/addGood/addGood_supply.vue          |  2 +-
 pages/product/addGood/components/price_supply.vue | 13 +++++++------
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/config/app.js b/config/app.js
index d94b1a2..479ac47 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/manifest.json b/manifest.json
index fc992aa..f185b40 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 0bf768d..00f57fb 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -355,7 +355,18 @@
         }
         delete item.id;
         delete item.stock;
-        uni.navigateTo({
+        if(this.userInfo.mer_info.type_code=='TypeSupplyChain') uni.navigateTo({
+          url: `/pages/product/addGood/addGood_supply?mer_id=${this.userInfo.service.mer_id}&import=1`,
+          success: (e) => {
+            e.eventChannel.emit('importAttrValue', item);
+            uni.$once('importAttrValueOK', (e)=>{
+              this.goods = this.goods.filter(t=>{
+                return t.id!=e;
+              })
+            })
+          }
+        })
+        else uni.navigateTo({
           url: `/pages/product/addGood/addGood?mer_id=${this.userInfo.service.mer_id}&import=1`,
           success: (e) => {
             e.eventChannel.emit('importAttrValue', item);
diff --git a/pages/product/addGood/addGood_supply.vue b/pages/product/addGood/addGood_supply.vue
index 119c71e..6d5a2af 100644
--- a/pages/product/addGood/addGood_supply.vue
+++ b/pages/product/addGood/addGood_supply.vue
@@ -687,7 +687,7 @@
             showFlag = '结算价不能小于0'
           }
           if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
-          if (!t.single_number || +t.single_number <= 0) showFlag = '零售价不能小于0';
+          // if (!t.single_number || +t.single_number <= 0) showFlag = '单件数量不能小于0';
           if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
           // if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
         })
diff --git a/pages/product/addGood/components/price_supply.vue b/pages/product/addGood/components/price_supply.vue
index 24a973a..11b196d 100644
--- a/pages/product/addGood/components/price_supply.vue
+++ b/pages/product/addGood/components/price_supply.vue
@@ -73,16 +73,17 @@
             model: 'stock',
             holder: '请填写库存',
             require: true,
-          }, {
+          }, 
+        ],
+        moreThanList: [
+          {
             id: 11,
             label: '单件数量',
             type: 'digit',
             model: 'single_number',
             holder: '请填写单件数量',
-            require: true,
-          }, 
-        ],
-        moreThanList: [{
+            require: false,
+          }, {
             id: 2,
             label: '成本价',
             type: 'digit',
@@ -179,7 +180,7 @@
       spliceMoreThan() {
         this.moreThanFlag = true;
         // this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length);
-        let len = 6;
+        let len = 5;
         if(this.$store.state.app?.userInfo?.mer_info?.type_code=="TypeSupplyChain")
           this.formList.splice(len, this.formList.length);
         else this.formList.splice(len-1, this.formList.length);