From 25e6a922618bbc25caba67c0acea524d200b4bd7 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Fri, 5 Jan 2024 11:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bid_document_examination/edit.vue |  2 --
 src/views/procurement_contract/edit.vue     | 23 +++++++++++++++++++--
 src/views/quotation/index.vue               |  6 +++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue
index 37ef099..60e38d1 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -257,8 +257,6 @@
                                 <el-input v-model="row.total_amount" />
                             </template>
                         </el-table-column>
-
-
                     </el-table>
                 </div>
             </el-form>
diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue
index 6af39a4..706cb87 100644
--- a/src/views/procurement_contract/edit.vue
+++ b/src/views/procurement_contract/edit.vue
@@ -101,7 +101,19 @@
 
 
 
-                        </el-form-item></el-col>
+                        </el-form-item>
+
+                    </el-col>
+                </el-row>
+                <div style=" display: flex;justify-content: flex-end;margin-bottom: 30px;">
+                    <el-button @click="showDialog1 = true" type="primary" plain>选择项目MRP缺口</el-button>
+                    <el-button @click="showDialog1 = true" type="primary" plain>选择订单MRP缺口</el-button>
+                    <el-button @click="showDialog2 = true" type="primary" plain>添加产品</el-button>
+                    <el-button @click="showDialog1 = true" type="primary" plain>下载导入表</el-button>
+
+                    <el-button @click="showDialog1 = true" type="primary" plain>导入产品</el-button>
+                </div>
+                <el-row>
                     <el-col :span="24">
                         <div style="margin-bottom: 30px;">采购合同明细</div>
                         <div style="margin-bottom: 30px;">
@@ -212,6 +224,9 @@
         <el-dialog v-model="showDialog1" title="选择供应商" width="70%">
             <suppliertable @customEvent="customEvent1"></suppliertable>
         </el-dialog>
+        <el-dialog v-model="showDialog2" title="选择产品" width="70%">
+            <prodctTable @customEvent="customEvent2"></prodctTable>
+        </el-dialog>
     </div>
 </template>
 
@@ -220,7 +235,7 @@ import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import projectTable from '@/components/project/index.vue'
 import suppliertable from '@/components/supplier/index.vue'
-
+import prodctTable from '@/components/product/index.vue'
 const list1 = reactive([])
 const list2 = reactive([])
 import { deptAll } from '@/api/org/department'
@@ -240,6 +255,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
+const showDialog2 = ref(false)
 const project_name = ref('')
 const project_code = ref('')
 const supplier_name = ref('')
@@ -372,6 +388,9 @@ const customEvent1 = (e: any) => {
     supplier_name.value = e.supplier_name
     showDialog1.value = false;
 };
+const customEvent2 = (e: any) => {
+    showDialog2.value = false;
+}
 
 // 表单验证
 const formRules = reactive<any>({
diff --git a/src/views/quotation/index.vue b/src/views/quotation/index.vue
index 790b021..125f28b 100644
--- a/src/views/quotation/index.vue
+++ b/src/views/quotation/index.vue
@@ -2,8 +2,8 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="客户" prop="customer_id">
-                    <el-select class="flex-1" v-model="queryParams.contract_id" clearable placeholder="请选择客户">
+                <el-form-item label="客户" prop="custom_id">
+                    <el-select class="flex-1" v-model="queryParams.custom_id" clearable placeholder="请选择客户">
                         <el-option v-for="(item, index) in customerList" :key="index" :label="item.name" :value="parseInt(item.id)" />
                     </el-select>
 
@@ -95,7 +95,7 @@ const customerList = ref([])
 
 // 查询条件
 const queryParams = reactive({
-    customer_id: '',
+    custom_id: '',
     code: '',
     create_user: '',
     invoice_type: ''