new file: src/views/common/param-mergeTemplate.vue modified: src/view...

zouyu

2023-11-09 63cf73490519e96183b2b89de19eaf70a9efeb40

 src/views/technology/routing/routing-form.vue

@@ -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) {