modified: src/views/basic/template/index.vue modified: src/views/tech...

Fixiaobai

2023-11-09 1b82be7ee8ce6f462d8d090e6a3e3216e3aba567

	modified:   src/views/basic/template/index.vue
	modified:   src/views/technology/document/index.vue

 src/views/basic/template/index.vue

@@ -67,7 +67,7 @@
                align="center"
              >
              </el-table-column>
              <!-- <el-table-column
              <el-table-column
                label="参数类型"
                prop="type"
                align="center"
@@ -106,7 +106,7 @@
              </el-table-column>

              <el-table-column label="单位" prop="unit" align="center">
              </el-table-column> -->
              </el-table-column>
              <el-table-column label="操作" align="center">
                <template slot-scope="scope">
                  <el-button
@@ -116,13 +116,13 @@
                    @click="saveSample(scope.$index, scope.row)"
                    >保存
                  </el-button>
                  <!-- <el-button
                  <el-button
                    type="text"
                    v-if="!scope.row.isUpdate"
                    size="mini"
                    @click="editSample(scope.$index, scope.row)"
                    >编辑
                  </el-button> -->
                  </el-button>
                  <el-button
                    type="text"
                    size="mini"
@@ -444,7 +444,6 @@
    },
    // 添加
    relateOperationParam() {
      console.log(11111);
      if (this.templateId !== 0) {
        // 筛选出当前页面已有的参数
        this.paramSelArr = []

 src/views/technology/document/index.vue

@@ -141,26 +141,26 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          // 绝缘颜色
          {
            minWidth: '120',
            prop: 'insulationColor',
            label: '绝缘颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 护套颜色
          {
            minWidth: '120',
            prop: 'sheathColor',
            label: '护套颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // // 绝缘颜色
          // {
          //   minWidth: '120',
          //   prop: 'insulationColor',
          //   label: '绝缘颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // // 护套颜色
          // {
          //   minWidth: '120',
          //   prop: 'sheathColor',
          //   label: '护套颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'testStandard',
@@ -230,47 +230,47 @@
            searchInfoType: 'text',
            noShowTip: false
          },
          {
            minWidth: '120',
            prop: 'projectNo',
            label: '项目号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'projectType',
            label: '项目类别',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
              return this.getProjectTypeOptionList()
            },
            formatter: (row, column, cellValue) => {
              var formatVal
              if (cellValue == 0) {
                formatVal = '国内项目'
              } else if (cellValue == 1) {
                formatVal = '特缆研发项目'
              } else {
                formatVal = ''
              }
              return formatVal
            }
          },
          {
            minWidth: '120',
            prop: 'country',
            label: '国家',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'projectNo',
          //   label: '项目号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'projectType',
          //   label: '项目类别',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   optList: () => {
          //     return this.getProjectTypeOptionList()
          //   },
          //   formatter: (row, column, cellValue) => {
          //     var formatVal
          //     if (cellValue == 0) {
          //       formatVal = '国内项目'
          //     } else if (cellValue == 1) {
          //       formatVal = '特缆研发项目'
          //     } else {
          //       formatVal = ''
          //     }
          //     return formatVal
          //   }
          // },
          // {
          //   minWidth: '120',
          //   prop: 'country',
          //   label: '国家',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },

          // 描述
          {