From 69be1e17629ee50cbc2f63aec9627360535d61f0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 09:54:23 +0800
Subject: [PATCH] modified: src/views/common/param-mergeTemplate.vue
---
src/views/technology/routing/routing-form.vue | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index af7f6b3..723de44 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -58,13 +58,13 @@
style="width: 280px"
></el-input>
</el-form-item>
- <el-form-item prop="wireCore" label="绾胯姱">
+ <!-- <el-form-item prop="wireCore" label="绾胯姱">
<el-input
v-model="dataForm.wireCore"
placeholder="绾胯姱"
style="width: 60px"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="BOM" prop="bomId">
<el-select v-model="dataForm.bomId" placeholder="" filterable>
<el-option
@@ -97,7 +97,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate">
+ <!-- <el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate">
<el-date-picker
v-model="dataForm.phaseInDate"
style="width: 100%"
@@ -114,8 +114,8 @@
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
- </el-form-item>
- <el-form-item prop="alternativeNo" label="鏇夸唬">
+ </el-form-item> -->
+ <!-- <el-form-item prop="alternativeNo" label="鏇夸唬">
<el-input
v-model="dataForm.alternativeNo"
placeholder="鏇夸唬"
@@ -135,7 +135,7 @@
</el-form-item>
<el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -564,7 +564,17 @@
</el-button>
</div>
</div>
- <el-table :data="paramData" class="l-mes" height="600">
+ <!-- <paramMergeTemplate
+ :tableData="paramData"
+ :page="{}"
+ >
+ </paramMergeTemplate> -->
+ <component
+ :is="paramMergeTemplate"
+ :tableData="paramData"
+ :routingTemplateId="routingTemplateId"
+ ></component>
+ <!-- <el-table :data="paramData" class="l-mes" height="600">
<el-table-column
label="鍙傛暟椤�"
prop="parameterItem"
@@ -605,7 +615,7 @@
</el-button>
</template>
</el-table-column>
- </el-table>
+ </el-table> -->
</el-card>
</el-tab-pane>
</el-tabs>
@@ -659,6 +669,7 @@
} from '@/api/technology/routing'
import { fetchList as getBomList } from '@/api/technology/completeproductstructure'
import { getByOperation } from '@/api/aps/capability'
+import { fetchListByFather} from '@/api/basic/param'
import { remote } from '@/api/admin/dict'
import diagram from './diagram'
import operationDialog from '@/views/common/operation.vue'
@@ -671,6 +682,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 = [
@@ -686,6 +698,7 @@
export default {
data() {
return {
+ paramMergeTemplate: '',
itemKey: '',
typeOptions: [],
paramTemplateSelArr: [],
@@ -771,7 +784,8 @@
operationPartDialog,
RichText,
editRoutingOperation,
- zttdraggable
+ zttdraggable,
+ paramMergeTemplate
},
mounted() {
window.addEventListener(
@@ -1072,6 +1086,7 @@
).then((response) => {
if (response.data.data.length > 0) {
this.paramData = response.data.data
+ this.paramMergeTemplate = 'paramMergeTemplate'
} else {
this.paramData = []
}
@@ -1376,6 +1391,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);
+ // })
if (param.length > 0) {
const paramrrs = {
id: this.dataForm.id,
@@ -1387,9 +1413,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('娣诲姞澶辫触')
@@ -1434,7 +1458,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