Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-12-13 74c2ee57f01f17cf61f69440b8981321452377b2

 src/views/technology/document/index.vue

@@ -11,21 +11,21 @@
        ref="documentTable"
      >
        <template #toolbar>
          <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
          <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
            >ERP同步</el-button
          >
          > -->
          <el-button
            type="primary"
            @click="deleteBatch"
            v-if="permissions.technology_document_del"
            >批量删除</el-button
          >
          <el-button
          <!-- <el-button
            type="primary"
            @click="bindTestStandard"
            v-if="permissions.technology_document_standard_upload"
            >批量绑定检测标准</el-button
          >
          > -->
        </template>
      </ttable>
      <el-dialog
@@ -142,25 +142,25 @@
            searchInfoType: 'text'
          },
          // 绝缘颜色
          {
            minWidth: '120',
            prop: 'insulationColor',
            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: 'sheathColor',
          //   label: '护套颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'testStandard',
@@ -239,7 +239,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '120',
            prop: 'projectType',
            label: '项目类别',
@@ -271,7 +271,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },

 */
          // 描述
          {
            minWidth: '120',
@@ -330,12 +330,12 @@
            disabled: false,
            permitArr: []
          },
          {
            text: '复制',
            fun: this.copyDocument,
            disabled: false,
            permitArr: []
          },
          // {
          //   text: '复制',
          //   fun: this.copyDocument,
          //   disabled: false,
          //   permitArr: []
          // },
          {
            text: '批准',
            fun: () => {