From b7968858014ab02aa91e52e63c2a266963d3a8f9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 18:06:22 +0800
Subject: [PATCH] 4807 4812）

---
 src/views/service/serviceContract/index.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 072f64e..82b640e 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -56,6 +56,12 @@
     isDetail: {
       type: Boolean,
       default: false
+    },
+    addConfig: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   mixins: [pageMixin],
@@ -108,11 +114,20 @@
         value: "number",
         label: "鏈嶅姟鍚堝悓缂栧彿"
       },
-      selValueList: []
+      selValueList: [],
+      keyword: "",
+      keywordType: ""
     }
   },
   created() {
     this.setTable()
+    if (!this.isDetail) {
+      this.keyword = ""
+      this.keywordType = ""
+    } else {
+      this.keyword = this.addConfig.keyword
+      this.keywordType = this.addConfig.keywordType
+    }
     this.getData()
   },
   methods: {
@@ -120,8 +135,8 @@
       this.tableList = {
         tableInfomation: [],
         tableColumn: [
-          { label: "鏈嶅姟鍚堝悓缂栧彿", prop: "number", min: 100, isCommonClick: true }, // 鏈嶅姟鍚堝悓缂栧彿
-          { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
+          { label: "鏈嶅姟鍚堝悓缂栧彿", prop: "number", isCommonClick: true }, // 鏈嶅姟鍚堝悓缂栧彿
+          { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true }, // 瀹㈡埛鍚嶇О
           { label: "绛剧害鏃ユ湡", prop: "signTime" }, // 绛剧害鏃ユ湡
           { label: "鍚堝悓绫诲瀷", prop: "serviceContractType" }, // 鍚堝悓绫诲瀷
           { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus" }, // 鍚堝悓鐘舵��
@@ -129,7 +144,7 @@
           { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
           { label: "鏈嶅姟寮�濮嬫棩", prop: "startTime" }, // 鏈嶅姟寮�濮嬫棩
           { label: "鏈嶅姟鍒版湡鏃�", prop: "endTime" }, // 鏈嶅姟鍒版湡鏃�
-          { label: "浠风◣鍚堣", prop: "priceTax" } // 浠风◣鍚堣
+          { label: "浠风◣鍚堣", prop: "amountTotal" } // 浠风◣鍚堣
         ]
       }
       this.searchOptions = []
@@ -140,11 +155,11 @@
       }
     },
     // 璇锋眰鏁版嵁
-    async getData(keyword, keywordType) {
+    async getData() {
       this.loading = true
       await getServiceContractList({
-        keyword: keyword,
-        keywordType: keywordType,
+        keyword: this.keyword,
+        keywordType: this.keywordType,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
@@ -179,25 +194,32 @@
     },
     // 鎼滅储
     searchClick(val, content) {
-      console.log(val, content)
-      this.getData(content, val.label)
+      this.keyword = content
+      this.keywordType = val.label
+      this.getData()
     },
     resetClick() {
-      this.search_map = {}
+      this.keyword = ""
+      this.keywordType = ""
       this.getData()
     },
     // 鏂板缓
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = {}
+      this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
     },
     // 缂栬緫
     handleClick(row) {
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row }
+      this.editConfig.infomation = {
+        ...row,
+        contract_number: row.salesDetails.number,
+        quotation_number: row.quotation.number,
+        currency: "浜烘皯甯�"
+      }
     },
     // 鍒犻櫎
     delClick() {

--
Gitblit v1.8.0