From 508ca07de304f2d7b4c4cc8612875317307dccf6 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 07 四月 2024 11:26:10 +0800
Subject: [PATCH] Merge branch 'zzq' of http://192.168.5.5:10010/r/silk/silk-web

---
 src/views/systemSetting/silkStandardSetting/index.vue |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/systemSetting/silkStandardSetting/index.vue b/src/views/systemSetting/silkStandardSetting/index.vue
index f5a7c22..ea8f6f5 100644
--- a/src/views/systemSetting/silkStandardSetting/index.vue
+++ b/src/views/systemSetting/silkStandardSetting/index.vue
@@ -3,7 +3,7 @@
     <div class="filter-card">
       <CommonSearch :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
         <template slot="leftButton">
-          <el-button size="small" type="primary" @click="addBtnClick" :disabled="!isEdit">鏂板</el-button>
+          <el-button size="small" type="primary" @click="addBtnClick">鏂板</el-button>
           <el-button size="small" type="primary" @click="refreshClick">鍒锋柊</el-button>
           <el-button size="small" type="primary" @click="printClick" disabled>鎵撳嵃</el-button>
         </template>
@@ -76,7 +76,7 @@
       projectOptions: getDataByType("projectOptions"),
       rankObj: {},
       columnInputList: [],
-      dynamicsRanks: []
+      dynamicsRanks: [],
     }
   },
   created() {
@@ -137,7 +137,14 @@
       this.silkTableList = {
         tableData: this.tableData,
         isReturn: false,
-        tableColumn: this.tableColumn
+        tableColumn: [
+          { label: "妫�鏌ラ」鐩悕绉�", prop: "projectName", projectName: true },
+          { label: "寮�濮嬬氦搴�", prop: "start", inputFloat: true },
+          { label: "缁撴潫绾ゅ害", prop: "end", inputFloat: true },
+          { label: "閲庣氦", prop: "price1", inputFloat: true },
+          { label: "澶ч噹", prop: "price2", inputFloat: true },
+          { label: "鐗归噹", prop: "price3", inputFloat: true }
+        ]
       }
     },
     // 鎼滅储
@@ -146,7 +153,14 @@
     },
     // 鏂板
     addBtnClick() {
-      this.tableData.push(this.dataObj)
+      this.tableData.push({
+        projectName: "",
+        start: 0,
+        end: 0,
+        price1: 0,
+        price2: 0,
+        price3: 0
+      })
     },
     // 鍒锋柊
     refreshClick() {

--
Gitblit v1.8.0