From 11ef915934e2c074c32a6fda2081a56ce144e453 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 20 Oct 2024 19:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop/express/model/index.ts           |  1 +
 src/views/shop/goods/components/goodsEdit.vue | 70 +++++++++----------
 .../system/express/components/expressEdit.vue | 29 ++++++--
 3 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/src/api/shop/express/model/index.ts b/src/api/shop/express/model/index.ts
index dcc1d37..3e88be4 100644
--- a/src/api/shop/express/model/index.ts
+++ b/src/api/shop/express/model/index.ts
@@ -10,6 +10,7 @@ export interface Express {
   expressName?: string;
   // 物流公司编码 (快递100)
   kuaidi100Code?: string;
+  wxCode?: string;
   // 物流公司编码 (快递鸟)
   kdniaoCode?: string;
   // 是否删除, 0否, 1是
diff --git a/src/views/shop/goods/components/goodsEdit.vue b/src/views/shop/goods/components/goodsEdit.vue
index 16e8f8b..b8a4e48 100644
--- a/src/views/shop/goods/components/goodsEdit.vue
+++ b/src/views/shop/goods/components/goodsEdit.vue
@@ -148,16 +148,16 @@
             </a-space>
             <div class="ele-text-placeholder">经销商价格</div>
           </a-form-item>
-          <a-form-item label="进货价" name="buyingPrice"  v-if="!merchantId">
+          <a-form-item label="供应商价" name="buyingPrice"  v-if="!merchantId">
             <a-space>
               <a-input-number
-                :placeholder="`进货价`"
+                :placeholder="`供应商价`"
                 :min="0.01"
                 style="width: 240px"
                 v-model:value="form.buyingPrice"
               />
             </a-space>
-            <div class="ele-text-placeholder">进货价</div>
+            <div class="ele-text-placeholder">供应商价</div>
           </a-form-item>
           <a-form-item label="连锁店价格" name="chainStorePrice" v-if="!merchantId">
             <a-space>
@@ -205,37 +205,37 @@
             </a-space>
             <div class="ele-text-placeholder">会员店差价比例(%)</div>
           </a-form-item>
-          <a-form-item label="会员超市价格" name="memberMarketPrice" v-if="!merchantId">
-            <a-space>
-              <a-input-number
-                :placeholder="`请输入会员超市价格`"
-                :min="0.01"
-                style="width: 240px"
-                v-model:value="form.memberMarketPrice"
-              />
-            </a-space>
-            <div class="ele-text-placeholder">会员超市价格</div>
-          </a-form-item>
-          <a-form-item label="会员超市差价比例(%)" name="memberMarketRate" v-if="!merchantId">
-            <a-space>
-              <a-input-number
-                :placeholder="`请输入会员超市差价比例(%)`"
-                :min="0.01"
-                :max="100"
-                style="width: 240px"
-                v-model:value="form.memberMarketRate"
-              />
-            </a-space>
-            <div class="ele-text-placeholder">会员超市差价比例(%)</div>
-          </a-form-item>
-          <a-form-item label="当前库存" name="stock">
-            <a-input-number
-              :placeholder="`商品库存`"
-              style="width: 240px"
-              v-model:value="form.stock"
-            />
-            <div class="ele-text-placeholder">划线价仅用于商品页展示</div>
-          </a-form-item>
+<!--          <a-form-item label="会员超市价格" name="memberMarketPrice" v-if="!merchantId">-->
+<!--            <a-space>-->
+<!--              <a-input-number-->
+<!--                :placeholder="`请输入会员超市价格`"-->
+<!--                :min="0.01"-->
+<!--                style="width: 240px"-->
+<!--                v-model:value="form.memberMarketPrice"-->
+<!--              />-->
+<!--            </a-space>-->
+<!--            <div class="ele-text-placeholder">会员超市价格</div>-->
+<!--          </a-form-item>-->
+<!--          <a-form-item label="会员超市差价比例(%)" name="memberMarketRate" v-if="!merchantId">-->
+<!--            <a-space>-->
+<!--              <a-input-number-->
+<!--                :placeholder="`请输入会员超市差价比例(%)`"-->
+<!--                :min="0.01"-->
+<!--                :max="100"-->
+<!--                style="width: 240px"-->
+<!--                v-model:value="form.memberMarketRate"-->
+<!--              />-->
+<!--            </a-space>-->
+<!--            <div class="ele-text-placeholder">会员超市差价比例(%)</div>-->
+<!--          </a-form-item>-->
+<!--          <a-form-item label="当前库存" name="stock">-->
+<!--            <a-input-number-->
+<!--              :placeholder="`商品库存`"-->
+<!--              style="width: 240px"-->
+<!--              v-model:value="form.stock"-->
+<!--            />-->
+<!--            <div class="ele-text-placeholder">划线价仅用于商品页展示</div>-->
+<!--          </a-form-item>-->
           <a-form-item label="是否新品">
             <a-switch size="small" v-model:checked="form.isNew" :checked-value="1" :un-checked-value="0"/>
           </a-form-item>
@@ -668,7 +668,7 @@ const rules = reactive({
   buyingPrice: [
     {
       required: true,
-      message: '请填写进货价',
+      message: '请填写供应商价',
       type: 'number',
       trigger: 'blur'
     }
diff --git a/src/views/system/express/components/expressEdit.vue b/src/views/system/express/components/expressEdit.vue
index be2bb58..7e07c71 100644
--- a/src/views/system/express/components/expressEdit.vue
+++ b/src/views/system/express/components/expressEdit.vue
@@ -33,6 +33,13 @@
           v-model:value="form.kuaidi100Code"
         />
       </a-form-item>
+      <a-form-item label="编码 (微信)" name="wxCode">
+        <a-input
+          allow-clear
+          placeholder="编码 (微信)"
+          v-model:value="form.wxCode"
+        />
+      </a-form-item>
       <a-form-item label="编码 (快递鸟)" name="kdniaoCode">
         <a-input
           allow-clear
@@ -88,16 +95,12 @@
     expressId: undefined,
     expressName: undefined,
     kuaidi100Code: undefined,
+    wxCode: undefined,
     kdniaoCode: undefined,
     deleted: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    expressId: undefined,
-    expressName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */
@@ -114,6 +117,22 @@
         message: '请填写物流公司名称',
         trigger: 'blur'
       }
+    ],
+    kuaidi100Code: [
+      {
+        required: true,
+        type: 'string',
+        message: '请输入快递100编码',
+        trigger: 'blur'
+      }
+    ],
+    wxCode: [
+      {
+        required: true,
+        type: 'string',
+        message: '请输入微信编码',
+        trigger: 'blur'
+      }
     ]
   });