From 504e00da9a9898ac419e97f93fc66cc7c7c6f620 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 28 二月 2024 14:30:25 +0800
Subject: [PATCH] 服务合同-去掉产品为空的判断增加保存时去掉未选择产品的对象

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   66 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 4da1e9c..f7d6074 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -29,9 +29,11 @@
           </div>
         </div>
         <TableCommonView
+          class="bg-list"
           ref="tableListRef"
           :table-list="tableList"
           :select-box="editCommonConfig.isSelectBox"
+          :selectBoxList="selectBoxList"
           @selCommonClick="selNameClick"
           @selTableCol="selTableCol"
           @getSelectArray="getSelectArray"
@@ -71,19 +73,24 @@
       default: () => {
         return {
           editVisible: false,
-          isSelectBox:false,
+          isSelectBox: false,
           title: "",
           clientId: 0,
+          isRequest: true,
           client_name: "",
           tableInfomation: []
         }
       }
     },
     // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
-    quotationNumber:{
-      type:[String,Number],
-      default:''
+    quotationNumber: {
+      type: [String, Number],
+      default: ""
     },
+    selectBoxList: {
+      type: Array,
+      default: () => []
+    }
   },
   components: {},
   computed: {},
@@ -104,7 +111,7 @@
       keywordType: "",
       tableColumn: [],
       showCol: [],
-      selectArray:[],
+      selectArray: []
     }
   },
   created() {
@@ -175,6 +182,7 @@
         this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
         this.tableList = {
           selectIndex: true,
+
           tableInfomation: [],
           allcol: [],
           showcol: this.showCol,
@@ -202,10 +210,14 @@
         this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
       } else if (this.editConfig.title === "浜у搧鍚嶇О") {
         this.tableColumn = [
-          { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox?false:true, default: true }, // 浜у搧鍚嶇О
-          { label: "浜у搧缂栧彿", prop: "number" }
+          { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox ? false : true, default: true }, // 浜у搧鍚嶇О
+          { label: "浜у搧缂栧彿", prop: "number" },
+          { label: "閿�鍞崟浠�", prop: "price" },
+          { label: "鍗曚綅", prop: "unit" },
+          { label: "浜у搧瑙勬牸", prop: "specs" },
+          { label: "鍨嬪彿", prop: "type" }
         ]
-        this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
+        this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閿�鍞崟浠�", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"]
         this.tableList = {
           selectIndex: true,
           tableInfomation: [],
@@ -266,11 +278,11 @@
       this.tableList.tableColumn = this.setColumnVisible(val)
     },
     // 鍒楄〃澶氶��
-    getSelectArray(val){
-      this.selectArray=val;
+    getSelectArray(val) {
+      this.selectArray = val
     },
-    saveClick(){
-      this.$emit('getSelectArray',this.selectArray)
+    saveClick() {
+      this.$emit("getSelectArray", this.selectArray)
       this.editConfig.editVisible = false
     },
     // 璇锋眰鏁版嵁
@@ -347,6 +359,16 @@
     },
     // 鎶ヤ环鍗�
     async getQuotationList() {
+      if (!this.editConfig.isRequest) {
+        this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
+          return {
+            ...item,
+            member_name: item.member.username
+          }
+        })
+        this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
+        return true
+      }
       await getQuotationList({
         search_map: this.search_map,
         page: this.pagerOptions.currPage,
@@ -372,7 +394,7 @@
     // 閿�鍞槑缁嗗崟
     async getSalesDetailsList() {
       await getSalesDetailsList({
-        clientId:Number(this.editCommonConfig.clientId),
+        clientId: Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -427,15 +449,15 @@
     },
     // 浜у搧鍚嶇О
     async getProductList() {
-      let params={
+      let params = {
         productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
         productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }
-       // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
-      if(this.quotationNumber){
-        params.quotationNumber=this.quotationNumber
+      // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+      if (this.quotationNumber) {
+        params.quotationNumber = this.quotationNumber
       }
       await getProductList(params).then((res) => {
         console.log(res.data)
@@ -457,7 +479,7 @@
     },
     async getSalesReturnList() {
       await getSalesReturnList({
-        clientId:Number(this.editCommonConfig.clientId),
+        clientId: Number(this.editCommonConfig.clientId),
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -506,8 +528,8 @@
       this.editConfig.editVisible = false
     },
     selNameClick(row) {
-      if(this.editCommonConfig.isSelectBox){
-        return true;
+      if (this.editCommonConfig.isSelectBox) {
+        return true
       }
       this.editConfig.editVisible = false
       if (this.editConfig.title === "閿�鍞�诲崟") {
@@ -552,6 +574,9 @@
 <style lang="scss" scoped>
 .bg-view {
   margin: 10px;
+  .bg-list {
+    min-height: 370px;
+  }
   .query-bg {
     margin-left: -20px;
     margin-bottom: 10px;
@@ -563,6 +588,7 @@
         width: 100px;
       }
     }
+
     .btn {
       float: right;
     }

--
Gitblit v1.8.0