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/technology/routing/routing-form.vue | 124 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 3665130..aaab516 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -564,48 +564,15 @@
</el-button>
</div>
</div>
- <el-table :data="paramData" class="l-mes" height="600">
- <el-table-column
- label="鍙傛暟椤�"
- prop="parameterItem"
- align="center"
- >
- <template slot-scope="scope">
- <span
- >{{ scope.row.parameterItem }}({{
- scope.row.unit
- }})</span
- >
- </template>
- </el-table-column>
- <el-table-column
- label="鍙傛暟绫诲瀷"
- prop="type"
- align="center"
- :formatter="getParam"
- >
- </el-table-column>
- <el-table-column label="鍊�" prop="paramValue" align="center">
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.paramValue"
- placeholder="鍊�"
- :disabled="!editable"
- ></el-input>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- v-if="editable && routingTemplateId != null"
- @click.stop="handleParamDelete(scope.row, scope.$index)"
- >鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
+ <div>
+ <component
+ :is="paramMergeTemplate"
+ :key="isShowTree"
+ :tableTreeData="paramData"
+ :routingTemplateId="routingTemplateId"
+ :handleParamDelete="handleParamDelete"
+ ></component>
+ </div>
</el-card>
</el-tab-pane>
</el-tabs>
@@ -672,6 +639,7 @@
import ElRow from 'element-ui/packages/row/src/row'
import ElCol from 'element-ui/packages/col/src/col'
import { getOperationParam } from '../../../api/basic/template'
+import paramMergeTemplate from '../../common/param-mergeTemplate.vue'
import zttdraggable from 'vuedraggable'
const capabilityArray = [
@@ -687,7 +655,9 @@
export default {
data() {
return {
+ paramMergeTemplate: '',
itemKey: '',
+ isShowTree: false,
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
@@ -772,7 +742,8 @@
operationPartDialog,
RichText,
editRoutingOperation,
- zttdraggable
+ zttdraggable,
+ paramMergeTemplate
},
mounted() {
window.addEventListener(
@@ -1060,6 +1031,12 @@
},
// 鍙傛暟闆嗘ā鏉跨偣鍑讳簨浠�
templateRowClick(row) {
+ if(this.isShowTree){
+ this.isShowTree=false
+ }else{
+ this.isShowTree=true
+ }
+ this.paramData=[]
this.getRoutingTemplateParam(row.id)
},
// 鏍规嵁宸ヨ壓銆佸伐搴廼d銆佹ā鏉縤d鍘昏幏鍙栨ā鏉夸笅鐨勫弬鏁�
@@ -1072,7 +1049,9 @@
})
).then((response) => {
if (response.data.data.length > 0) {
+ this.paramData = []
this.paramData = response.data.data
+ this.paramMergeTemplate = 'paramMergeTemplate'
} else {
this.paramData = []
}
@@ -1377,17 +1356,17 @@
// 妯℃澘鍙傛暟鐨勯�変腑缁撴灉杩斿洖
selectTemplateParam(param) {
- console.log(param);
- let idList=[]
- param.forEach(item=>{
- idList.push(item.id)
- })
- console.log(idList);
- let formData=new FormData()
- formData.append("idList",idList)
- fetchListByFather(formData).then((res) => {
- console.log(res);
- })
+ // console.log(param);
+ // let idList=[]
+ // param.forEach(item=>{
+ // idList.push(item.id)
+ // })
+ // console.log(idList);
+ // let formData=new FormData()
+ // formData.append("idList",idList)
+ // fetchListByFather(formData).then((res) => {
+ // console.log(res);
+ // })
if (param.length > 0) {
const paramrrs = {
id: this.dataForm.id,
@@ -1399,9 +1378,7 @@
const data = response.data
if (data.code == 0) {
const newParams = response.data.data
- for (let i = 0; i < newParams.length; i++) {
- this.paramData.push(newParams[i])
- }
+ console.log(newParams);
this.$message.success('娣诲姞鎴愬姛')
} else {
this.$message.error('娣诲姞澶辫触')
@@ -1412,13 +1389,23 @@
// 鍒犻櫎鍙傛暟
handleParamDelete(row, index) {
- this.$confirm('鏄惁纭鍒犻櫎鍙傛暟椤逛负' + row.parameterItem, '鎻愮ず', {
+ this.$confirm('鏄惁纭鍒犻櫎鍙傛暟椤逛负銆�' + row.paramItem +'銆戠殑鏁版嵁?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
})
.then(function() {
- return deleteRoutingTemplateParam(row.id)
+ let id = null
+ if(row.treeId && row.treeId!='null'){
+ id = row.treeId
+ }else{
+ if(row.twoId && row.twoId!='null'){
+ id = row.twoId
+ }else{
+ id = row.oneId
+ }
+ }
+ return deleteRoutingTemplateParam(id)
})
.then((response) => {
const data = response.data
@@ -1446,7 +1433,24 @@
},
// 淇濆瓨鎵�鏈夊弬鏁扮殑淇敼
saveAllParamChange() {
- const paramJson = { routingOperationParam: this.paramData }
+ let data = []
+ this.paramData.forEach(ele=>{
+ let o = {
+ id: null,
+ paramValue: ele.paramValue
+ }
+ if(ele.threeId && ele.threeId != 'null'){
+ o.id = ele.threeId
+ }else{
+ if(ele.twoId && ele.twoId != 'null'){
+ o.id = ele.twoId
+ }else{
+ o.id = ele.oneId
+ }
+ }
+ data.push(o)
+ })
+ const paramJson = { routingOperationParam: data }
putRoutingTemplateParam(paramJson).then((response) => {
const data = response.data
if (data.code == 0) {
--
Gitblit v1.9.3