From f991aa8e159ab30b79f7468883dc63f192af750b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 29 四月 2024 14:00:48 +0800
Subject: [PATCH] 1

---
 src/views/systemSetting/silkStandardSetting/index.vue |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/views/systemSetting/silkStandardSetting/index.vue b/src/views/systemSetting/silkStandardSetting/index.vue
index a9b3878..9d315e1 100644
--- a/src/views/systemSetting/silkStandardSetting/index.vue
+++ b/src/views/systemSetting/silkStandardSetting/index.vue
@@ -22,6 +22,7 @@
           :silk-table-list="silkTableList"
           @inputContent="inputContent"
           @addProjectClick="addBtnClick"
+          :isEdit='isEdit'
           @clearupProject="clearupProject"
           @deleteClick="clearupProject"
           @addColumnClick="addColumnClick"
@@ -64,7 +65,6 @@
         { label: "鐗归噹", prop: "rankC", inputFloat: true }
       ],
       tableColumn: [],
-      columnNum: 0,
       dataObj: {
         checkItem: 1,
         startFineness: 0,
@@ -146,9 +146,8 @@
           currentIndex = index
         }
       })
-      this.columnNum = list.length + 1
       for (let j = 0; j < list.length; j++) {
-        this.tableColumn.splice(currentIndex, 0, list[j])
+        this.tableColumn.splice(currentIndex+j, 0, list[j])
       }
       this.silkTableList.tableColumn = this.tableColumn
     },
@@ -173,7 +172,6 @@
     },
     // 鏂板
     addBtnClick() {
-      debugger
       console.log(this.silkTableList.tableData,'===1')
       console.log(this.tableData,'===2')
       if(this.isEdit){
@@ -227,14 +225,28 @@
     },
     // 淇濆瓨缂栬緫鎸夐挳鍒囨崲
     editSaveClick() {
+      let isOk=false;
+      this.silkTableList.tableColumn.map((item)=>{
+        if(!item.label||!item.prop){
+          isOk=true
+        }
+      })
+      if(isOk){
+        this.$message.error('璇峰厛濉啓瀹屾垚琛ㄥご锛�')
+        return true;
+      }
       this.isEdit = !this.isEdit
+      this.silkTableList.tableData.map((item)=>{
+        item.addColumn=false;
+      })
+      
       let tableData=JSON.parse(
                   JSON.stringify(this.silkTableList.tableData)
                 );
-        if(tableData.length==0&&!this.isEdit){
-          this.$message.error('璇峰厛鏂板鍐嶄繚瀛�!')
-          return true;
-        }
+        // if(tableData.length==0&&!this.isEdit){
+        //   this.$message.error('璇峰厛鏂板鍐嶄繚瀛�!')
+        //   return true;
+        // }
       if (!this.isEdit) {
         let params = this.saveParam(tableData)
         saveRankStandard({
@@ -274,20 +286,25 @@
     },
     // 娣诲姞鍒�
     addColumnClick() {
-      let propStr = "prop" + this.columnNum
       let currentIndex=0
       this.tableColumn.map((item, index) => {
         if (item.prop == 'rankA') {
           currentIndex = index
         }
       })
+      let num=0
+      if(this.tableColumn.length>0){
+        if(this.tableColumn[Number(currentIndex)-1].prop.indexOf('prop')!=-1){
+          num=this.tableColumn[Number(currentIndex)-1].prop.slice(4)
+        }
+      }
+      let propStr = "prop" + (Number(num)+1)
+      
       this.tableColumn.splice(currentIndex, 0, { label: "", prop: propStr, inputFloat: true, addColumn: true })
       this.$set(this.dataObj, propStr, 0)
       this.$set(this.rankObj, propStr, 0)
       this.columnInputList.push({ rankProp: propStr, rankName: "", rankValue: 0 })
-      console.log(this.tableColumn, this.dataObj, "32323", this.columnInputList)
       this.silkTableList.tableColumn = this.tableColumn
-      this.columnNum += 1
       let allList = this.tableData.map((item) => {
         return {
           ...item,
@@ -296,6 +313,7 @@
       })
       this.tableData = allList
       this.silkTableList.tableData = allList
+      this.$forceUpdate()
     },
     // 鍒犻櫎鍒�
     clearupColumn(prop) {
@@ -318,7 +336,6 @@
     },
     // 鍒楄〃澶磋緭鍏ュ洖璋�
     addColumnInputChange(val, prop) {
-      console.log(val, prop, this.columnInputList)
       this.columnInputList.forEach((item) => {
         if (item.rankProp == prop) {
           item.rankName = val

--
Gitblit v1.8.0