Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

2023-03-24 10:24:24 +08:00
parent d8c2987480 0e948809ad
commit 3ffed9356c
3 changed files with 116 additions and 130 deletions
@@ -935,7 +935,7 @@
            headFieldEn:'Number',
            field: 'serialNumber',
            key: 1,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
            status:1,
          },
          {
@@ -946,7 +946,7 @@
            headFieldEn:'title',
            field: 'title',
            key: 2,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
            status:2,
          },
          {
@@ -956,7 +956,7 @@
            headFieldEn:'Sub-title',
            field: 'subtitle',
            key: 3,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -965,7 +965,7 @@
            headFieldEn:'List Confirmation Status',
            field: 'inventoryAffirmStatusName',
            key: 4,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -974,7 +974,7 @@
            headFieldEn:'Task Confirmation Status',
            field: 'taskAffirmStatusName',
            key: 5,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -983,7 +983,7 @@
            headFieldEn:'Area',
            field: 'region_dictText',
            key: 6,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -992,7 +992,7 @@
            headFieldEn:'Compare EU/CN',
            field: 'correspondingStandard',
            key: 7,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1001,7 +1001,7 @@
            headFieldEn:'Usage',
            field: 'implementType_dictText',
            key: 8,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1010,7 +1010,7 @@
            headFieldEn:'New Type Execution Date',
            field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String',
            key: 9,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1019,7 +1019,7 @@
            headFieldEn:'New Vehicle Execution Date',
            field: 'implementTimeString',
            key: 10,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1028,7 +1028,7 @@
            headFieldEn:'Certification Type',
            field: 'attestationType_dictText',
            key: 11,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1037,7 +1037,7 @@
            headFieldEn:'Certification Level',
            field: 'attestationRank_dictText',
            key: 12,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1046,7 +1046,7 @@
            headFieldEn:'Applicable Supplement',
            field: 'applicableSupplement',
            key: 13,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1055,7 +1055,7 @@
            headFieldEn:'WVTA ID',
            field: 'wvtaId',
            key: 14,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1064,7 +1064,7 @@
            headFieldEn:'Responsible Field',
            field: 'dutyTerritory_dictText',
            key: 15,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1073,7 +1073,7 @@
            headFieldEn:'Regulation Engineer',
            field: 'regulationOwnerName',
            key: 16,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1082,7 +1082,7 @@
            headFieldEn:'Homo Engineer',
            field: 'homologationEngineerName',
            key: 17,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1091,7 +1091,7 @@
            headFieldEn:'Eng. Interface',
            field: 'engineeringInterfacePersonName',
            key: 18,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1100,7 +1100,7 @@
            headFieldEn:'Comments',
            field: 'remark',
            key: 19,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1110,7 +1110,7 @@
            field: 'designDeliverableTemplateName',
            affirmFlag:'1',
            key: 20,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1120,7 +1120,7 @@
            field: 'designInitiatorName',
            affirmFlag:'1',
            key: 21,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1130,7 +1130,7 @@
            field: 'designDutyName',
            affirmFlag:'1',
            key: 22,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1140,7 +1140,7 @@
            field: 'designDueDate',
            affirmFlag:'1',
            key: 23,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1150,7 +1150,7 @@
            field: 'designRemark',
            affirmFlag:'1',
            key: 24,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1160,7 +1160,7 @@
            field: 'prehomoDeliverableTemplateName',
            affirmFlag:'2',
            key: 25,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1170,7 +1170,7 @@
            field: 'prehomoInitiatorName',
            affirmFlag:'2',
            key:26,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1180,7 +1180,7 @@
            field: 'prehomoDutyName',
            affirmFlag:'2',
            key: 27,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1190,7 +1190,7 @@
            field: 'prehomoDueDate',
            affirmFlag:'2',
            key: 28,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1200,7 +1200,7 @@
            field: 'prehomoRemark',
            affirmFlag:'2',
            key: 29,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1210,7 +1210,7 @@
            field: 'verifyDeliverableTemplateName',
            affirmFlag:'3',
            key: 30,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1220,7 +1220,7 @@
            field: 'verifyInitiatorName',
            affirmFlag:'3',
            key: 31,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1230,7 +1230,7 @@
            field: 'verifyDutyName',
            affirmFlag:'3',
            key: 32,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1240,7 +1240,7 @@
            field: 'verifyDueDate',
            affirmFlag:'3',
            key: 33,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1250,7 +1250,7 @@
            field: 'verifyRemark',
            affirmFlag:'3',
            key: 34,
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
          },
          {
            sort: '',
@@ -1260,7 +1260,7 @@
            headFieldEn:'Operation',
            key: 35,
            field:'operation',
-            moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
+            moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单',
            status:2,
          },
        ],
@@ -1335,7 +1335,7 @@
      }
    },
    created() {
-      if (this.$route.query.title == '虚拟清单详情') {
+      if (this.$route.query.title == '市场清单详情') {
        document.title = this.$t('virtualListDetails')
      } else {
        document.title = this.$t('maintainVirtualList')
@@ -1343,14 +1343,14 @@
    },
    mounted() {
      this.title = this.$route.query.title
-      this.isTrue = this.$route.query.title == '虚拟清单详情' ? false : true
+      this.isTrue = this.$route.query.title == '市场清单详情' ? false : true
      this.getHeader()
      this.getList()
    },
    computed: {
      columns() {
        let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.title === '虚拟清单详情') {
+        if (this.title === '市场清单详情') {
          for (var i = 0; i < columnResult.length; i++) {
            if (columnResult[i].title === this.$t('operation')) {
              columnResult.splice(i, 1)
@@ -1483,7 +1483,7 @@
      },
      getHeader(){
        getAction('head/headCustomEO/list', {
-          moduleFlag: this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单'
+          moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
        }).then((res) => {
          if (res.success) {
            console.log(res.result)
@@ -363,7 +363,7 @@
            name: item.name,
            useExplain: item.useExplain,
            id: item.id,
-            title: '维护虚拟清单'
+            title: '维护市场清单'
          }
        })
        window.open(newUrl.href, '_blank')
@@ -416,7 +416,7 @@
            name: item.name,
            useExplain: item.useExplain,
            id: item.id,
-            title: '虚拟清单详情'
+            title: '市场清单详情'
          }
        })
        window.open(newUrl.href, '_blank')
@@ -331,7 +331,8 @@
        </span>
        <span slot="designFlowStatusName" slot-scope="text,result">
           <span v-if="result.designFlowStatus == 'List to be released' ||
-                       result.designFlowStatus == 'List to be checked'">
+                       result.designFlowStatus == 'List to be checked'"
+                 :title="text">
              {{text}}
           </span>
           <a v-else @click="designFlowStatusClick(result,$t('designComplianceReview'))"
@@ -339,7 +340,8 @@
        </span>
        <span slot="verifyFlowStatusName" slot-scope="text,result">
          <span v-if="result.verifyFlowStatus == 'List to be released' ||
-                       result.verifyFlowStatus == 'List to be checked'">
+                       result.verifyFlowStatus == 'List to be checked'"
+                :title="text">
              {{text}}
           </span>
           <a v-else @click="designFlowStatusClick(result,$t('verificationComplianceReview'))"
@@ -731,7 +733,7 @@
            title: this.$t('operation'),
            align: 'left',
            fixed: 'right',
-            width: 200,
+            width: 260,
            scopedSlots: { customRender: 'operation' }
          }
        ],
@@ -906,7 +908,7 @@
            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
            headFieldCn: '责任人',
            headFieldEn: 'Assignee',
-            field: 'designDutyName',
+            field: 'designDutyIdName',
            affirmFlag: '1',
            key: 22,
            moduleFlag: '法规清单'
@@ -937,7 +939,7 @@
            headFieldCn: '交付物模板',
            headFieldEn: 'Deliverable Template',
            field: 'designDeliverableTemplate',
-            affirmFlag: '3',
+            affirmFlag: '1',
            key: 25,
            moduleFlag: '法规清单'
          },
@@ -946,7 +948,7 @@
            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
            headFieldCn: '责任人',
            headFieldEn: 'Assignee',
-            field: 'verifyDutyName',
+            field: 'verifyDutyIdName',
            affirmFlag: '3',
            key: 32,
            moduleFlag: '法规清单'
@@ -1876,88 +1878,6 @@
        this.getList()
      },

-      getHeader() {
-        getAction('head/headCustomEO/list', {
-          moduleFlag: '法规清单'
-        }).then((res) => {
-          if (res.success) {
-            this.columnsAll = this.column
-            this.columnsAll.forEach((item) => {
-              if (item.children) {
-                item.children.forEach((val) => {
-                  this.checkedList.push(item.dataIndex, val.dataIndex)
-                })
-              } else {
-                this.checkedList.push(item.dataIndex)
-              }
-            })
-            return
-            if (res.result.length != 0) {
-              this.columnsAll = res.result
-            } else {
-              this.columnsAll = this.column
-            }
-            this.columnsAll.forEach((item, index) => {
-              if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认' && item.title != '操作') {
-                item.width = 180
-                item.align = 'left'
-                if (item.title == '编号') {
-                  item.sorter = true
-                  item.scopedSlots = {
-                    customRender: 'standard'
-                  }
-                } else if (item.title == '标题') {
-                  item.scopedSlots = {
-                    customRender: 'titleName'
-                  }
-                } else if (item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' ||
-                  item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人') {
-                  item.sorter = true
-                }
-              } else {
-                delete item.dataIndex
-                delete item.fixed
-                item.children.forEach((val, index) => {
-                  val.width = 180
-                  val.align = 'left'
-                  val.ellipsis = true
-                })
-              }
-            })
-            if (res.result.length != 0) {
-              this.columnsAll.push({
-                  title: this.$t('operation'),
-                  align: 'left',
-                  fixed: 'right',
-                  width: 200,
-                  scopedSlots: { customRender: 'operation' }
-                },
-                {
-                  title: this.$t('operation'),
-                  align: 'left',
-                  fixed: 'right',
-                  width: 140,
-                  scopedSlots: { customRender: 'operationOne' }
-                })
-            }
-            this.columnsAll.forEach((item) => {
-              if (item.children) {
-                item.children.forEach((val) => {
-                  this.checkedList.push(item.dataIndex, val.dataIndex)
-                })
-              } else {
-                this.checkedList.push(item.dataIndex)
-              }
-            })
-            this.loading = false
-            this.JLoading = false
-          } else {
-            this.JLoading = false
-            this.loading = false
-          }
-        })
-      },
-
      getList() {
        let roleCode = this.roleSwitchingCode
        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2015,7 +1935,8 @@
      },

      onCheckAllChange(e) {
-        this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []
+        let selectedValue = ['serialNumber', 'title', 'operation']
+        this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
        this.selectedValue = this.checkedList
        this.indeterminate = false
      },
@@ -2028,6 +1949,71 @@
      cancel() {
        this.customizevisible = false
      },
+
+      getHeader() {
+        getAction('head/headCustomEO/list', {
+          moduleFlag: '法规清单'
+        }).then((res) => {
+          if (res.success) {
+            this.columnsAll = res.result
+            for (let j = 0; j < this.columnsAll.length; j++) {
+              for (let i = 0; i < this.column.length; i++) {
+                if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
+                  if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
+                    if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                      for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                        for (let l = 0; l < this.column[i].children.length; l++) {
+                          if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+                            this.columnsAll[j].children[k] = this.column[i].children[l]
+                          }
+                        }
+                      }
+                    }
+                  }
+                } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
+                  if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
+                    if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                      for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                        for (let l = 0; l < this.column[i].children.length; l++) {
+                          if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+                            this.columnsAll[j].children[k] = this.column[i].children[l]
+                          }
+                        }
+                      }
+                    }
+                  }
+                } else {
+                  if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
+                    this.columnsAll[j] = this.column[i]
+                  }
+                }
+              }
+            }
+            this.columnsAll.push({
+              title: this.$t('operation'),
+              align: 'left',
+              fixed: 'right',
+              width: 260,
+              scopedSlots: { customRender: 'operation' }
+            })
+            this.columnsAll.forEach((item) => {
+              if (item.children) {
+                item.children.forEach((val) => {
+                  this.checkedList.push(item.dataIndex, val.dataIndex)
+                })
+              } else {
+                this.checkedList.push(item.dataIndex)
+              }
+            })
+            this.loading = false
+            this.JLoading = false
+          } else {
+            this.JLoading = false
+            this.loading = false
+          }
+        })
+      },
+
      handleSubmit() {
        let list = []
        let uniqueArray = this.selectedValue.filter((item, index, array) => {