From f92bcebb68afe6f8ec4c9da660986d0751eb6e5b Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Thu, 26 Dec 2024 11:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/beforehand_order/add.vue      |  2 +-
 .../beforehand_order/component/goodsOffer.vue | 19 +++++++++---
 src/views/order/beforehand_order/index.vue    |  1 +
 src/views/store/store_product/edit.vue        | 31 ++++++++++++++++++-
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/views/order/beforehand_order/add.vue b/src/views/order/beforehand_order/add.vue
index 49ac3575e..06aea479f 100644
--- a/src/views/order/beforehand_order/add.vue
+++ b/src/views/order/beforehand_order/add.vue
@@ -62,7 +62,7 @@
                                 <!-- <el-radio :label="4">线上订单</el-radio> -->
                                 <el-radio :label="5">仓库补货</el-radio>
                                 <el-radio :label="6">往期补单</el-radio>
-                                <el-radio :label="7">采购单</el-radio>
+                                <el-radio :label="8">其他订单</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
diff --git a/src/views/order/beforehand_order/component/goodsOffer.vue b/src/views/order/beforehand_order/component/goodsOffer.vue
index 9aa55f8c5..0c52c7374 100644
--- a/src/views/order/beforehand_order/component/goodsOffer.vue
+++ b/src/views/order/beforehand_order/component/goodsOffer.vue
@@ -52,6 +52,15 @@
             <el-table-column label="采购状态" prop="buyer_confirm_name" show-overflow-tooltip />
             <el-table-column label="支付方式" prop="pay_type_name" show-overflow-tooltip />
             <el-table-column label="是否入库" prop="is_storage_name" show-overflow-tooltip />
+            <el-table-column label="来源订单信息" prop="unit_name" show-overflow-tooltip>
+				<template #default="{ row }">
+				    <div v-for="item in row.source_order_info">
+						<div>订单id：{{item.source_order_id}}</div>
+						<div>数量：{{item.need_num}}</div>
+						<div>订单备注：{{item.mark}}</div>
+					</div>
+				</template>
+			</el-table-column>
             <el-table-column label="操作" fixed="right" width="180">
                 <template #default="{ row }">
                     <el-button type="primary" link @click="procureClick(row)">采购设置</el-button>
@@ -116,12 +125,8 @@
                 <el-select
                     v-model="formData.supplier_id"
                     filterable
-                    remote
                     reserve-keyword
                     placeholder="输入供应商名称搜索"
-                    remote-show-suffix
-                    :remote-method="remoteMethodSupplier"
-                    :loading="supplierLoading"
                     style="width: 240px"
                 >
                     <el-option
@@ -366,6 +371,11 @@ const productOfferInfo = () => {
     })
 }
 const procureClick = (data: any) => {
+	if (supplierList.value.length <= 0) {
+		apiSupplierLists({ mer_name: '' }).then((res) => {
+		    supplierList.value = res.lists
+		})
+	}
     formData.value.id = data.id
     formData.value.buyer_nums = data.need_num
     formData.value.purchase = data.price
@@ -376,6 +386,7 @@ const procureClick = (data: any) => {
     formData.value.marques = data.marques
     formData.value.after_sales = data.after_sales
     formData.value.pay_type = data.pay_type
+    formData.value.supplier_id = data.supplier_id
 
     dictData.outbound_floating.forEach((item) => {
         if (item.value == data.top_cate_name) {
diff --git a/src/views/order/beforehand_order/index.vue b/src/views/order/beforehand_order/index.vue
index e14870fcc..78d689442 100644
--- a/src/views/order/beforehand_order/index.vue
+++ b/src/views/order/beforehand_order/index.vue
@@ -33,6 +33,7 @@
                         <el-option :value="4" label="线上订单"></el-option>
                         <el-option :value="5" label="仓库补货"></el-option>
                         <el-option :value="7" label="采购订单"></el-option>
+                        <el-option :value="8" label="其他订单"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="门店名称" prop="store_id">
diff --git a/src/views/store/store_product/edit.vue b/src/views/store/store_product/edit.vue
index 36cb3521e..adc57aa53 100644
--- a/src/views/store/store_product/edit.vue
+++ b/src/views/store/store_product/edit.vue
@@ -132,6 +132,19 @@
                         :readonly="false"
                     />
                 </el-form-item>
+                <el-form-item label="产地" prop="made_place">
+                    <el-input
+                        v-model="formData.made_place"
+                        class="w-[500px]"
+                        clearable
+                        placeholder="请输入产地"
+                    />
+                </el-form-item>
+                <el-form-item label="保质期" prop="shelf_life">
+					<el-input v-model="formData.shelf_life" class="w-[500px]" placeholder="请输入保质期">
+						<template #suffix>月</template>
+					</el-input>
+                </el-form-item>
                 <el-form-item label="毛利率" prop="rose">
                     <el-input-number
                         v-model="formData.rose"
@@ -271,7 +284,9 @@ const formData = reactive({
     rose: '0',
     is_return: 1, // 1支持退货,2不支持退货
     is_store_all: 1, //门店类型 1 全部门店 2 部分门店
-    is_show: 1
+    is_show: 1,
+	made_place: '',
+	shelf_life: ''
 })
 
 // 定义验证输入的函数
@@ -453,6 +468,20 @@ const formRules = reactive<any>({
             message: '请输入商品图片',
             trigger: ['blur', 'change']
         }
+    ],
+    made_place: [
+        {
+            required: true,
+            message: '请输入产地',
+            trigger: ['blur', 'change']
+        }
+    ],
+    shelf_life: [
+        {
+            required: true,
+            message: '请输入保质期',
+            trigger: ['blur', 'change']
+        }
     ]
 })