From d7bb04a5461b7eb8beb422108a21696b21126e71 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 13:26:39 +0800
Subject: [PATCH] 	modified:   src/views/basic/template/index.vue 	modified:   src/views/common/param-mergeTemplate.vue 	modified:   src/views/technology/routing/routing-form.vue

---
 src/views/basic/template/index.vue |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index a076b9c..14a19ff 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -32,7 +32,22 @@
                 </el-col>
               </el-row>
             </div>
-            <el-table
+            <paramMergeTemplate 
+            :key="isShowTree"
+            :isModel="true"
+            :option="paramTemplateOption"
+            :page="{}"
+            :textEllipsisWidth="60"
+            :handleParamDelete="deleteOperationParam"
+            :handleParamEdit="editSample"
+            :handleParamInsert="insertTechnologyOperationParam"
+            :handleParamSave="saveSample"
+            :tableTreeData="operationParams">
+            </paramMergeTemplate>
+            <!-- <component :is="paramMergeTemplate" 
+            :key="isShowTree"
+            :tableTreeData="operationParams"></component> -->
+            <!-- <el-table
               :data="operationParams"
               id="templateParamTable"
               ref="operationParam"
@@ -137,7 +152,7 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </el-table>
+            </el-table> -->
           </el-card>
         </el-col>
       </el-row>
@@ -172,9 +187,12 @@
   relateOperationParamTemplate
 } from '../../../api/basic/template'
 import { remote } from '@/api/admin/dict'
+import paramMergeTemplate from '../../common/param-mergeTemplate.vue'
 export default {
   data() {
     return {
+      isShowTree: false,
+      paramMergeTemplate: '',
       paramSelArr: [],
       paramSelCol: 'code',
       templateIndex: null,
@@ -283,13 +301,76 @@
           minWidth: 100
         }
       },
-      addOrUpdateVisible: false
+      addOrUpdateVisible: false,
+      paramTemplateOption: {
+        height: 300,
+        columnBtn: false,
+        index: true,
+        indexLabel: '搴忓彿',
+        indexWidth: 50,
+        menu: true,
+        menuWidth: 130,
+        menuAlign: 'center',
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        border: true,
+        size: 'small',
+        refreshBtn: false,
+        align: 'center',
+        column: [
+            {
+                label: '鍙傛暟缂栧彿',
+                prop: 'code',
+                width:80,
+                slot: true
+            },
+            {
+                label: '鍙傛暟椤�',
+                prop: 'paramItem',
+            },
+            {
+                label: '浜岀骇鍙傛暟',
+                prop: 'paramItemTwo',
+            },
+            {
+                label: '涓夌骇鍙傛暟',
+                prop: 'paramItemThree',
+            },
+            {
+                label: '鍙傛暟绫诲瀷',
+                prop: 'paramType',
+                formslot: true,
+                rules: [{
+                    required: true,
+                    message: "璇烽�夋嫨鍙傛暟绫诲瀷",
+                    trigger: "change"
+                }]
+            },
+            {
+                label: '鍊�',
+                prop: 'paramValue',
+                minWidth: 100,
+                slot: true,
+                formslot: true,
+                labelslot: true
+            }, {
+                label: '鍗曚綅',
+                prop: 'unit',
+                rules: [{
+                    required: true,
+                    message: "鍗曚綅涓嶈兘涓虹┖",
+                    trigger: "blur"
+                }]
+        },]
+      }
     }
   },
   components: {
     ttable,
     TableForm,
-    ParamDialog
+    ParamDialog,
+    paramMergeTemplate
   },
   computed: {
     ...mapGetters(['permissions'])
@@ -312,6 +393,11 @@
     },
     handleCurrentChange(val) {
       this.templateId = val.id
+      if(this.isShowTree){
+        this.isShowTree=false
+      }else{
+        this.isShowTree=true
+      }
       if (val != null) {
         this.operationParams = []
         this.getJoinParamTemplateData()
@@ -343,7 +429,12 @@
           technologyOperationTemplateId: this.templateId
         })
       ).then((response) => {
-        this.operationParams = response.data.data.records
+        let data = response.data.data
+        data.forEach(obj=>{
+          obj.templateId = this.templateId
+        })
+        this.operationParams = data
+        
       })
     },
     rowDrop() {
@@ -607,9 +698,20 @@
     saveSample(index, row) {
       console.log('row', row)
       var obj = {}
-      obj.technologyOperationParamId = row.id
-      obj.technologyOperationTemplateId = row.technologyOperationTemplateId
-      obj.defaultValue = row.defaultValue
+      let id = null
+      if(row.threeId && row.threeId!='null'){
+        id = row.threeId
+      }else{
+        if(row.twoId && row.twoId!='null'){
+          id = row.twoId
+        }else{
+          id = row.oneId
+        }
+      }
+      obj.technologyOperationParamId = id
+      obj.technologyOperationTemplateId = row.templateId
+      obj.defaultValue = row.paramValue
+      console.log(obj);
       putRelateOperationParamTemplate(obj).then((response) => {
         this.$message.success('鍙傛暟淇濆瓨鎴愬姛')
         this.$set(row, 'isUpdate', false)

--
Gitblit v1.9.3