From c942d88e04a2ab92572e564f2cd74e763314bc3d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 18 四月 2024 18:25:40 +0800
Subject: [PATCH] 生丝标准设置模块 连续添加2个表头错误的问题修改，修改添加表头的逻辑

---
 src/views/systemSetting/silkStandardSetting/components/silkTableList.vue |   37 +++++++++++++-----
 src/views/systemSetting/silkStandardSetting/index.vue                    |   26 ++++++++++--
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
index c25faab..bc3226f 100644
--- a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
+++ b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
@@ -6,6 +6,7 @@
           
           <el-table
             ref="fromTable"
+            v-if="tableShow"
             :data="tableList.tableData"
             style="width: 100%"
             @selection-change="handleSelectionChange"
@@ -46,7 +47,8 @@
                       }
                     "
                   ></el-input>
-                  <div class="common-select-btn" @click="clearupColumn(item.prop)">
+                  {{item.prop}}
+                  <div class="common-select-btn" @click="clearupColumn(item.prop,i)">
                     <i class="el-icon-remove" title="鍒犻櫎"></i>
                   </div>
                 </div>
@@ -237,6 +239,11 @@
       type: Boolean,
       default: true
     },
+    // 鏄惁鍙互缂栬緫琛ㄥご
+    isEdit: {
+      type: Boolean,
+      default: false
+    },
     silkTableList: {
       type: Object,
       default: () => {
@@ -257,7 +264,8 @@
       productList: [],
       tableList: [],
       projectIndex: 0,
-      projectOptions: getDataByType("projectOptions")
+      projectOptions: getDataByType("projectOptions"),
+      tableShow:true,
     }
   },
   created() {
@@ -272,7 +280,18 @@
         this.getTableInfo()
       },
       immediate: true
-    }
+    },
+    'silkTableList.tableColumn': {
+      handler() {
+        this.tableShow=false;
+        this.$nextTick(()=>{
+          this.tableShow=true;
+          this.$forceUpdate()
+        })
+        
+      },
+      immediate: true
+    },
   },
   computed: {},
   methods: {
@@ -321,21 +340,17 @@
       this.$emit("addColumnInputChange", val, prop)
     },
     editColumnInput(item,i,prop){
-      console.log(item,'===item')
-      console.log(i,'===i')
-      console.log(prop,'===prop')
-      if(prop.indexOf('prop')!=-1){
+      if(prop.indexOf('prop')!=-1&&this.isEdit){
         item.addColumn=true;
         this.$set(this.tableList.tableColumn[i],'addColumn',true)
         this.$forceUpdate()
         this.$emit("editColumnInput", item, i,prop)
       }
-      
     },
     // 鍒犻櫎鍒�
-    clearupColumn(prop) {
+    clearupColumn(prop,index) {
       console.log(prop)
-      this.$emit("clearupColumn", prop)
+      this.$emit("clearupColumn", prop,index)
     }
   },
   //瑙ｅ喅琛ㄦ牸鎶栧姩闂
@@ -426,7 +441,7 @@
  }
   .el-input__inner {
     // text-align: left;
-    text-align: center !important;
+    // text-align: center !important;
   }
 }
 </style>
diff --git a/src/views/systemSetting/silkStandardSetting/index.vue b/src/views/systemSetting/silkStandardSetting/index.vue
index 651e5ef..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,7 +146,6 @@
           currentIndex = index
         }
       })
-      this.columnNum = list.length + 1
       for (let j = 0; j < list.length; j++) {
         this.tableColumn.splice(currentIndex+j, 0, list[j])
       }
@@ -226,10 +225,21 @@
     },
     // 淇濆瓨缂栬緫鎸夐挳鍒囨崲
     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)
                 );
@@ -276,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,
@@ -298,6 +313,7 @@
       })
       this.tableData = allList
       this.silkTableList.tableData = allList
+      this.$forceUpdate()
     },
     // 鍒犻櫎鍒�
     clearupColumn(prop) {

--
Gitblit v1.8.0