From 33ef6c3e299558f32afcdb670fcb8b2e9e3539f0 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Thu, 26 Dec 2024 17:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E3=80=81=E4=BF=9D?=
 =?UTF-8?q?=E8=B4=A8=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforehand_order/component/goodsOffer.vue | 44 ++++++++-----------
 src/views/store/store_product/edit.vue        | 15 +------
 src/views/warehouse_order/details.vue         | 19 ++++++--
 src/views/warehouse_order/editProduct.vue     | 10 ++++-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/views/order/beforehand_order/component/goodsOffer.vue b/src/views/order/beforehand_order/component/goodsOffer.vue
index 0c52c7374..1e7b4ef3d 100644
--- a/src/views/order/beforehand_order/component/goodsOffer.vue
+++ b/src/views/order/beforehand_order/component/goodsOffer.vue
@@ -170,36 +170,22 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="包装" prop="package">
-                <el-input
-                    v-model="formData.package"
-                    clearable
-                    placeholder="请输入包装"
-                    :readonly="false"
-                />
+                <el-input v-model="formData.package" placeholder="请输入包装" />
             </el-form-item>
             <el-form-item label="规格" prop="store_info">
-                <el-input
-                    v-model="formData.store_info"
-                    clearable
-                    placeholder="请输入规格"
-                    :readonly="false"
-                />
+                <el-input v-model="formData.store_info" placeholder="请输入规格" />
             </el-form-item>
             <el-form-item label="型号" prop="marques">
-                <el-input
-                    v-model="formData.marques"
-                    clearable
-                    placeholder="请输入型号"
-                    :readonly="false"
-                />
+                <el-input v-model="formData.marques" placeholder="请输入型号" />
             </el-form-item>
             <el-form-item label="售后" prop="after_sales">
-                <el-input
-                    v-model="formData.after_sales"
-                    clearable
-                    placeholder="请输入售后"
-                    :readonly="false"
-                />
+                <el-input v-model="formData.after_sales" placeholder="请输入售后" />
+            </el-form-item>
+            <el-form-item label="生产日期" prop="manufacture">
+				<el-date-picker v-model="formData.manufacture" type="date" value-format="YYYY-MM-DD" placeholder="请输入生产日期"/>
+            </el-form-item>
+            <el-form-item label="保质期" prop="expiration_date">
+				    <el-date-picker v-model="formData.expiration_date" type="date" value-format="YYYY-MM-DD" placeholder="请输入保质期"/>
             </el-form-item>
         </el-form>
         <template #footer>
@@ -305,7 +291,9 @@ const formData = ref({
     store_info: '',
     marques: '',
     after_sales: '',
-    pay_type: 1
+    pay_type: 1,
+	manufacture: '',
+	expiration_date: ''
 })
 
 const storeroom = ref({
@@ -334,7 +322,9 @@ const resetFormData = () => {
         store_info: '',
         marques: '',
         after_sales: '',
-        pay_type: 1
+        pay_type: 1,
+		manufacture: '',
+		expiration_date: ''
     }
 }
 const oneClickStorage = () => {
@@ -387,6 +377,8 @@ const procureClick = (data: any) => {
     formData.value.after_sales = data.after_sales
     formData.value.pay_type = data.pay_type
     formData.value.supplier_id = data.supplier_id
+    formData.value.manufacture = data.manufacture
+    formData.value.expiration_date = data.expiration_date
 
     dictData.outbound_floating.forEach((item) => {
         if (item.value == data.top_cate_name) {
diff --git a/src/views/store/store_product/edit.vue b/src/views/store/store_product/edit.vue
index adc57aa53..3d362d862 100644
--- a/src/views/store/store_product/edit.vue
+++ b/src/views/store/store_product/edit.vue
@@ -140,11 +140,6 @@
                         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"
@@ -285,8 +280,7 @@ const formData = reactive({
     is_return: 1, // 1支持退货,2不支持退货
     is_store_all: 1, //门店类型 1 全部门店 2 部分门店
     is_show: 1,
-	made_place: '',
-	shelf_life: ''
+	made_place: ''
 })
 
 // 定义验证输入的函数
@@ -475,13 +469,6 @@ const formRules = reactive<any>({
             message: '请输入产地',
             trigger: ['blur', 'change']
         }
-    ],
-    shelf_life: [
-        {
-            required: true,
-            message: '请输入保质期',
-            trigger: ['blur', 'change']
-        }
     ]
 })
 
diff --git a/src/views/warehouse_order/details.vue b/src/views/warehouse_order/details.vue
index 475d30d03..99956c5c7 100644
--- a/src/views/warehouse_order/details.vue
+++ b/src/views/warehouse_order/details.vue
@@ -107,7 +107,7 @@
             </el-tab-pane>
         </el-tabs>
     </el-drawer>
-    <el-dialog v-model="dialogShop" title="追加商品" width="1300">
+    <el-dialog v-model="dialogShop" title="追加商品" width="1500">
         <el-form ref="formRef" :model="updateInfo" label-width="90px">
             <div class="mb-2">
                 <el-button type="primary" @click="showProduct = true">添加商品</el-button>
@@ -214,6 +214,16 @@
                         </template>
                     </el-table-column>
                 </template>
+				<el-table-column label="生产日期" prop="manufacture" width="160">
+					<template #default="{ row }">
+						<el-date-picker v-model="row.manufacture" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入生产日期"/>
+					</template>
+				</el-table-column>
+				<el-table-column label="保质期" prop="expiration_date" width="160">
+					<template #default="{ row }">
+						<el-date-picker v-model="row.expiration_date" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入保质期"/>
+					</template>
+				</el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
                         <el-button type="danger" link @click="handleDeleteProdut(row.id)">
@@ -287,7 +297,9 @@ const formData = ref({
     system_store: '',
     pay_type: '',
     supplier_id: '',
-    financial_pm: ''
+    financial_pm: '',
+	manufacture: '',
+	expiration_date: ''
 })
 const updateInfo = ref({})
 const goodsOfferUpdate = () => {
@@ -320,7 +332,6 @@ const goodsOfferUpdate = () => {
         id: queryParams.oid,
         product_arr: product_arr
     }).then((res) => {
-        console.log(res)
         dialogShop.value = false
         getLists()
     })
@@ -376,6 +387,8 @@ const handleDeleteProdut = (id: number) => {
 const onBindProduct = (e: any[]) => {
     e.forEach((item: any) => {
         if (!productList.value.find((t: any) => t.id == item.id)) {
+			item.manufacture = ''
+			item.expiration_date = ''
             productList.value.push(item)
         }
     })
diff --git a/src/views/warehouse_order/editProduct.vue b/src/views/warehouse_order/editProduct.vue
index 547a7bad2..2703491fd 100644
--- a/src/views/warehouse_order/editProduct.vue
+++ b/src/views/warehouse_order/editProduct.vue
@@ -67,6 +67,12 @@
                         :readonly="false"
                     />
                 </el-form-item>
+				<el-form-item label="生产日期" prop="manufacture">
+				    <el-date-picker v-model="formData.manufacture" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入生产日期"/>
+				</el-form-item>
+				<el-form-item label="保质期" prop="expiration_date">
+				    <el-date-picker v-model="formData.expiration_date" type="date" clearable value-format="YYYY-MM-DD" placeholder="请输入保质期"/>
+				</el-form-item>
                 <el-form-item label="付款方式" prop="pay_type" v-if="formData.financial_pm == 1">
                     <el-radio-group v-model="formData.pay_type">
                         <el-radio :label="1" :value="1">赊账</el-radio>
@@ -114,7 +120,9 @@ const formData = reactive({
     pay_type: '',
     purchase: '',
     financial_pm: '',
-    price: ''
+    price: '',
+	manufacture: '',
+	expiration_date: ''
 })
 
 // 表单验证