From 4562a1abf14aa624bd883ad36b052201083effc9 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 9 Jul 2024 13:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=90=A5=E9=94=80?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=8D=8F=E8=AE=AE=E5=92=8C=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BA=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BA=86?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=95=88=E7=8E=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing_contract/edit.vue         | 14 ++++++++++
 .../marketing_framework_agreement/edit.vue    | 26 ++++++++++++-------
 .../marketing_framework_agreement/index.vue   |  2 +-
 src/views/statistic_zj/index.vue              |  1 -
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/marketing_contract/edit.vue b/src/views/marketing_contract/edit.vue
index f1d8e36..59bc2e3 100644
--- a/src/views/marketing_contract/edit.vue
+++ b/src/views/marketing_contract/edit.vue
@@ -406,6 +406,20 @@ const customEvent = (e) => {
     formData.part_b_signatory = e.part_b_signatory
     formData.part_b_signatory_name = e.part_b_signatory_name
     formData.business_nature = e.business_nature
+    formData.signed_rate = e.signed_rate
+    formData.signed_amount = e.signed_amount
+    formData.signed_dept = e.signed_dept
+    formData.signed_head_name = e.signed_head_name
+    formData.signed_head = e.signed_head
+    formData.seal_name = e.seal_name
+    formData.is_limit = e.is_limit
+    formData.file_type = e.file_type
+    formData.seal_num = e.seal_num
+    formData.seal_user_name = e.seal_user_name
+    formData.seal_user = e.seal_user
+    formData.plance_seal = e.plance_seal
+    formData.send_date = e.send_date
+    formData.mailing_number = e.mailing_number
     showDialog1.value = false
 }
 
diff --git a/src/views/marketing_framework_agreement/edit.vue b/src/views/marketing_framework_agreement/edit.vue
index c8e0a0a..1dccc64 100644
--- a/src/views/marketing_framework_agreement/edit.vue
+++ b/src/views/marketing_framework_agreement/edit.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -20,7 +19,7 @@
                     <el-col :span="8">
                         <el-form-item label="甲方签订单位" prop="part_a">
                             <el-input v-model="formData.part_a_name" clearable placeholder="点击选择甲方签约单位"
-                                @click="showDialog1 = true" readonly />
+                                @click="showDialog1 = true, isPartb = false" readonly />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -35,7 +34,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="乙方签约单位" prop="part_b">
-                            <el-input v-model="formData.part_b" clearable placeholder="请输入乙方签约单位" />
+                            <el-input v-model="formData.part_b" @click="showDialog1 = true, isPartb = true" clearable
+                                placeholder="点击选择乙方签约单位" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -54,8 +54,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="暂估签订金额" prop="signed_amount">
-                            <el-input v-model="formData.signed_amount" clearable placeholder="请输入暂估签订金额"
-                                type="number" />
+                            <el-input v-model="formData.signed_amount" clearable placeholder="请输入暂估签订金额" type="number" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -238,14 +237,21 @@ const formData = reactive({
     "create_time": ""
 })
 
+const isPartb = ref(false)
+
 const customEvent = (e) => {
-    formData.part_a = e.id
-    formData.part_a_name = e.name
+    if (isPartb.value) {
+        formData.part_b = e.name
+        formData.part_b_signatory_name = e.invoice_contact_name
+    } else {
+        formData.part_a = e.id
+        formData.part_a_name = e.name
+        formData.part_a_contact = e.invoice_contact_name
+        formData.part_a_address = e.invoice_company_address
+    }
     showDialog1.value = false
 }
 
-
-
 let value;
 const userclick = async (val) => {
     showDialog.value = true
diff --git a/src/views/marketing_framework_agreement/index.vue b/src/views/marketing_framework_agreement/index.vue
index 74e61ed..d509300 100644
--- a/src/views/marketing_framework_agreement/index.vue
+++ b/src/views/marketing_framework_agreement/index.vue
@@ -118,7 +118,7 @@ const queryParams = reactive({
     business_nature: '',
     signed_dept: '',
     part_a: '',
-    review_status: 1,
+    review_status: 0,
 })
 
 // 选中数据
diff --git a/src/views/statistic_zj/index.vue b/src/views/statistic_zj/index.vue
index 546975a..63d413c 100644
--- a/src/views/statistic_zj/index.vue
+++ b/src/views/statistic_zj/index.vue
@@ -133,7 +133,6 @@ const getData2 = () => {
         visitorOption.series = []
         console.log(res)
         visitorOption.xAxis.data = Object.keys(res[0].value)
-
         res.forEach((item, index) => {
             visitorOption.series[index] = {
                 type: 'line',