From cae7d67387b2f300b8ef6dec136b7e33a3f57a67 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 12 Nov 2024 17:54:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E4=BC=98=E5=8C=96=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E4=BA=A7=E5=93=81=E6=8A=A5=E4=BB=B7=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了产品报价弹窗中不必要的列
- 在采购产品报价单中添加了订单 ID 输入框
- 调整了表格列的宽度和布局
- 新增了包装、规格和售后等自定义输入字段
- 更新了表单数据结构，增加了 order_id 字段
---
 src/components/productOfferPop/index.vue      |  5 --
 .../order/purchase_product_offer/index.vue    | 60 +++++++++++++++++--
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/components/productOfferPop/index.vue b/src/components/productOfferPop/index.vue
index 1ef419e0f..ec5bd1028 100644
--- a/src/components/productOfferPop/index.vue
+++ b/src/components/productOfferPop/index.vue
@@ -33,14 +33,9 @@
                 <el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
                 <el-table-column label="分类" prop="cate_name" show-overflow-tooltip />
                 <el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
-                <el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
                 <el-table-column label="需求数量" prop="need_num" show-overflow-tooltip />
-
-                <el-table-column label="采购数量" prop="buyer_nums" show-overflow-tooltip />
                 <el-table-column label="采购价" prop="price" show-overflow-tooltip />
                 <el-table-column label="采购总价" prop="total_price" show-overflow-tooltip />
-                <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip />
-                <el-table-column label="采购状态" prop="buyer_confirm_name" show-overflow-tooltip />
             </el-table>
         </div>
         <div class="flex mt-4 justify-end">
diff --git a/src/views/order/purchase_product_offer/index.vue b/src/views/order/purchase_product_offer/index.vue
index 599fe9e81..0c3d48908 100644
--- a/src/views/order/purchase_product_offer/index.vue
+++ b/src/views/order/purchase_product_offer/index.vue
@@ -234,14 +234,22 @@
                     />
                 </el-select>
             </el-form-item>
+            <el-form-item label="订单id">
+                <el-input
+                    v-model="formBatchData.order_id"
+                    clearable
+                    placeholder="请输入订单id"
+                    :readonly="false"
+                    style="width: 240px"
+                />
+            </el-form-item>
             <el-form-item label="商品" prop="store_id">
                 <div class="flex-1 w-full">
                     <div class="mb-2">
                         <el-button type="primary" @click="showProduct = true">添加商品</el-button>
                     </div>
                     <el-table :data="productList">
-                        <el-table-column label="id" prop="id" show-overflow-tooltip />
-                        <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
+                        <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
                         <el-table-column label="商品图片" prop="image" min-width="80">
                             <template #default="{ row }">
                                 <el-image
@@ -268,7 +276,7 @@
                                 <el-input v-model="row.total_price" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="支付类型" width="180">
+                        <el-table-column label="支付类型" width="160">
                             <template #default="{ row }">
                                 <el-radio-group v-model="row.pay_type">
                                     <el-radio :label="1">赊账</el-radio>
@@ -276,6 +284,46 @@
                                 </el-radio-group>
                             </template>
                         </el-table-column>
+                        <el-table-column label="包装" width="80">
+                            <template #default="{ row }">
+                                <el-input
+                                    v-model="row.package"
+                                    clearable
+                                    placeholder="请输入包装"
+                                    :readonly="false"
+                                />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="规格" width="80">
+                            <template #default="{ row }">
+                                <el-input
+                                    v-model="row.store_info"
+                                    clearable
+                                    placeholder="请输入规格"
+                                    :readonly="false"
+                                />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="规格" width="80">
+                            <template #default="{ row }">
+                                <el-input
+                                    v-model="row.marques"
+                                    clearable
+                                    placeholder="请输入规格"
+                                    :readonly="false"
+                                />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="售后" width="80">
+                            <template #default="{ row }">
+                                <el-input
+                                    v-model="row.after_sales"
+                                    clearable
+                                    placeholder="请输入售后"
+                                    :readonly="false"
+                                />
+                            </template>
+                        </el-table-column>
                         <el-table-column label="操作" width="120" fixed="right">
                             <template #default="{ row }">
                                 <el-button type="danger" link @click="handleDeleteProdut(row.id)">
@@ -317,7 +365,8 @@ const queryParams = reactive({
     buyer_id: '',
     order_id: '',
     store_name: '',
-    buyer_confirm: ''
+    buyer_confirm: '',
+    is_user: 1
 })
 const formData = ref({
     id: '',
@@ -334,7 +383,8 @@ const formData = ref({
     pay_type: 1
 })
 const formBatchData = ref({
-    supplier_id: ''
+    supplier_id: '',
+    order_id: ''
 })
 const compute = () => {
     formData.value.total_price = (formData.value.buyer_nums * formData.value.purchase).toFixed(2)