From c4f0393ee2ef22eeb180fb384a15316566747259 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 20 三月 2024 10:17:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web

---
 src/views/systemSetting/silkStandardSetting/components/silkTableList.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
index 8875782..d900a09 100644
--- a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
+++ b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
@@ -67,7 +67,7 @@
                       :disabled="!isOperate"
                       @change="
                         (val) => {
-                          commonInputChange(val, item.prop, scope.row, scope)
+                          commonInputChange(val, item.prop, scope)
                         }
                       "
                     ></el-input>
@@ -83,7 +83,7 @@
                           v-for="(item, index) in projectOptions"
                           :key="index"
                           :label="item.value"
-                          :value="item.value"
+                          :value="item.id"
                         >
                         </el-option>
                       </el-select>
@@ -162,6 +162,11 @@
                     "
                   ></el-input-number>
                 </el-form-item>
+                <div v-else-if="item.isCallMethod">
+                  <span :class="item.isClass ? item.getClassName(scope.row[item.prop], scope.row) : ''">{{
+                    item.getCallMethod(scope.row[item.prop], scope.row)
+                  }}</span>
+                </div>
                 <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
               </template>
             </el-table-column>
@@ -198,6 +203,7 @@
 
 <script>
 // import { getProductList } from "@/api/common/other"
+import { getDataByType } from "@/api/data"
 export default {
   name: "CommmonFormTableView",
   components: {},
@@ -250,13 +256,7 @@
       productList: [],
       tableList: [],
       projectIndex: 0,
-      projectOptions: [
-        { id: 1, value: "绾ゅ害鍋忓樊" },
-        { id: 2, value: "浜屾鍙樺寲" },
-        { id: 3, value: "娓呮磥鍒�" },
-        { id: 4, value: "娲佸噣鍒�" },
-        { id: 5, value: "鏈�澶у亸宸�" }
-      ]
+      projectOptions: getDataByType("projectOptions")
     }
   },
   created() {
@@ -299,8 +299,8 @@
         this.$emit("addProjectClick")
       }
     },
-    commonInputChange(val, prop, row, scope) {
-      this.$emit("inputContent", val, prop, row, scope)
+    commonInputChange(val, prop, scope) {
+      this.$emit("inputContent", val, prop, scope)
     },
     // 鍒犻櫎
     deleteClick(scope) {
@@ -317,6 +317,7 @@
     // 娣诲姞鍒楀ご閮ㄦ爣棰樿緭鍏�
     addColumnInputChange(val, prop) {
       console.log(val, prop, "娣诲姞鍒楀ご閮ㄦ爣棰樿緭鍏�")
+      this.$emit("addColumnInputChange", val, prop)
     },
     // 鍒犻櫎鍒�
     clearupColumn(prop) {

--
Gitblit v1.8.0