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

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -231,6 +231,7 @@ export default {
           } else {
 
             this.form = res.result
+            this.form.otaId=''
             if (this.$route.query.type == 1 && res.result.cxmb == null) {
               this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
             } else {
@@ -261,17 +262,12 @@ export default {
       })
     },
     save() {
-      let otaId = localStorage.getItem('otaId')
-      if (otaId == null) {
-        otaId = ''
-      }
-      // if(this.form.bapc!=null && this.form.bapc!=undefined  && this.form.bapc!=''){
-      //  this.$nextTick(()=>{
-      //   this.$refs.ruleForm.clearValidate('bapc')
-      //  })
-      // }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          let otaId = localStorage.getItem('otaId')
+      if (otaId == null|| otaId == undefined) {
+        otaId = ''
+      }
           this.selectListPc.map(item => {
             if (item.id == this.form.bapc) {
               this.form.bapc = item.ggpc

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -384,7 +384,6 @@ import { message } from 'ant-design-vue'
             if(otaId==null || otaId == undefined){
               otaId=''
             }
-
             postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1055,22 +1055,22 @@
         isResultReported: false,
         // fieldList      | array   |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number
         fieldList: [
-          {
-            type: 'string',
-            value: 'correspondingStandard',
-            text: this.$t('correspondingStandard')
-          },
+          // {
+          //   type: 'string',
+          //   value: 'correspondingStandard',
+          //   text: this.$t('correspondingStandard')
+          // },
           {
             type: 'string',
             value: 'subtitle',
             text: this.$t('subtitle')
           },
-          {
-            type: '',
-            value: 'implementType',
-            text: this.$t('implementationCategory'),
-            dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          },
+          // {
+          //   type: '',
+          //   value: 'implementType',
+          //   text: this.$t('implementationCategory'),
+          //   dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          // },
           {
             type: 'date',
             value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
@@ -1104,24 +1104,12 @@
             text: this.$t('areaOfResponsibility'),
             dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
-          {
-            type: '',
-            value: 'region',
-            text: this.$t('zoneOfApplication'),
-            dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          },
           {
             type: 'Personnel',
             value: 'regulationOwnerId',
             valueName: 'regulationOwnerIdName',
             text: this.$t('regulatoryEngineer')
           },
-          {
-            type: 'Personnel',
-            value: 'homologationEngineerId',
-            valueName: 'homologationEngineerIdName',
-            text: this.$t('certifiedEngineer')
-          },
           {
             type: 'Personnel',
             value: 'engineeringInterfacePerson',

jero-web/src/views/projectManagement/historicalVersion/index.vue

@@ -35,12 +35,14 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px"
+                  <a-button class="box-button" type="primary"
+                            style="margin-right: 8px"
+                            @click="searchQuery">{{ $t('query') }}</a-button>
+                  <a-button class="box-button"
                             @click="searchReset">{{ $t('reset') }}</a-button>
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                </a-col>
             </span>
         </a-row>
@@ -58,37 +60,50 @@
         :columns="columns"
       >
         <span slot="titleName" slot-scope="text,record" :title="text">
-                  {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}
+              <span class="textName">
+                 {{ text }}
+              </span>
         </span>
-        <span slot="designDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.designDeliverableTypeName }}</span><br v-if="record.designDeliverableTypeName">
-           <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
-              @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
-             {{ record.designDeliverableTemplateName }}
-           </a>
-           <a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length > 1"
-              @click="clickButtonToUpload(record.designDeliverableTemplate)">{{ $t('viewFile') }}</a>
-           <span v-else>--</span>
+
+        <span slot="standard" slot-scope="text,record" :title="text">
+              <a class="textName" @click="standardClick(record)">
+                 {{ text }}
+              </a>
         </span>
-        <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
-           <span>{{ record.prehomoDeliverableTypeName }}</span><br v-if="record.prehomoDeliverableTypeName">
-           <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
-              @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
-             {{ record.prehomoDeliverableTemplateName }}
-           </a>
-           <a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length > 1"
-              @click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{ $t('viewFile') }}</a>
-           <span v-else>--</span>
+
+        <span slot="verifyDeliverableTemplateName" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.verifyDeliverableTemplate)"
+                      v-if="result.verifyDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
         </span>
-        <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.verifyDeliverableTypeName }}</span><br v-if="record.verifyDeliverableTypeName">
-           <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
-              @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
-             {{ record.verifyDeliverableTemplateName }}
-           </a>
-           <a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length > 1"
-              @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{ $t('viewFile') }}</a>
-           <span v-else>--</span>
+        <span slot="designDeliverableTemplate" slot-scope="text,result">
+                <span class="viewFile"
+                      @click="viewFileClick(result.designDeliverableTemplate)"
+                      v-if="result.designDeliverableTemplate">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
+        <span slot="designFlowStatusName" slot-scope="text,result">
+           <span v-if="result.designFlowStatus == 'List to be released' ||
+                       result.designFlowStatus == 'List to be checked'"
+                 :title="text">
+              {{text}}
+           </span>
+           <a v-else @click="designFlowStatusClick(result,$t('designComplianceReview'))"
+              :title="text">{{text}}</a>
+        </span>
+        <span slot="verifyFlowStatusName" slot-scope="text,result">
+          <span v-if="result.verifyFlowStatus == 'List to be released' ||
+                       result.verifyFlowStatus == 'List to be checked'"
+                :title="text">
+              {{text}}
+           </span>
+           <a v-else @click="designFlowStatusClick(result,$t('verificationComplianceReview'))"
+              :title="text">{{text}}</a>
         </span>
       </a-table>
     </div>
@@ -125,12 +140,16 @@
         </span>
       </a-table>
     </a-modal>
+    <viewFileModel ref="viewFileModelRef"/>
+    <designCompliance ref="designComplianceRef"/>
   </a-card>
 </template>
 
 <script>
   import ImportFile from '@/components/ImportFile/index'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import viewFileModel from '@/components/viewFileModel/index'
+  import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import { Base64 } from 'js-base64'
@@ -139,22 +158,25 @@
     name: 'index',
     components: {
       globalAdvancedQuery,
-      ImportFile
+      ImportFile,
+      viewFileModel,
+      designCompliance
     },
     data() {
       return {
         columns: [
           {
             title: this.$t('standard'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'serialNumber',
             width: 180,
             fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
+            sorter: true,
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'title',
             width: 180,
             fixed: 'left',
@@ -162,180 +184,140 @@
           },
           {
             title: this.$t('subtitle'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'subtitle',
-            width: 180,
-            fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
-          },
-          {
-            title: this.$t('listConfirmationStatus'),
-            align: 'center',
             ellipsis: true,
-            dataIndex: 'inventoryAffirmStatusName'
+            width: 180
           },
           {
-            title: this.$t('taskAffirmStatus'),
-            align: 'center',
+            title: this.$t('applicableSupplement'),
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'taskAffirmStatusName'
-          },
-          // {
-          //   title: this.$t('taskReleaseStatus'),
-          //   align: 'center',
-          //   dataIndex: 'taskReleaseStatus'
-          // },
-          {
-            title: this.$t('correspondingStandard'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'correspondingStandard'
-          },
-          {
-            title: this.$t('implementationCategory'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'implementType_dictText'
-          },
-          {
-            title: this.$t('ImplementationDate'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
-          },
-          {
-            title: this.$t('vehicleInProductionDate'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'implementTime'
-          },
-          {
-            title: 'WVTA ID',
-            align: 'center',
-            dataIndex: 'wvtaId',
-            ellipsis: true
+            dataIndex: 'applicableSupplement',
+            width: 200
           },
           {
             title: this.$t('certificationType'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'attestationType_dictText'
+            dataIndex: 'attestationType_dictText',
+            width: 180
           },
           {
             title: this.$t('certificationLevel'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'attestationRank_dictText'
+            dataIndex: 'attestationRank_dictText',
+            width: 180
           },
-          //
           {
             title: this.$t('areaOfResponsibility'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'dutyTerritory_dictText'
+            sorter: true,
+            dataIndex: 'dutyTerritory_dictText',
+            width: 180
           },
           {
             title: this.$t('regulatoryEngineer'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'regulationOwnerName'
-          },
-          {
-            title: this.$t('certifiedEngineer'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'homologationEngineerName'
+            sorter: true,
+            dataIndex: 'regulationOwnerName',
+            width: 180
           },
           {
             title: this.$t('engineeringInterfacePerson'),
-            align: 'center',
+            align: 'left',
             ellipsis: true,
-            dataIndex: 'engineeringInterfacePersonName'
+            sorter: true,
+            dataIndex: 'engineeringInterfacePersonName',
+            width: 180
           },
           {
             title: this.$t('remarks'),
-            align: 'center',
-            ellipsis: true,
-            dataIndex: 'remark'
+            align: 'left',
+            dataIndex: 'remark',
+            width: 180,
+            ellipsis: true
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
             children: [
-              {
-                title: this.$t('Deliverables'),
-                dataIndex: 'designDeliverableTemplateName',
-                align: 'center',
-                scopedSlots: { customRender: 'designDeliverableTemplateName' }
-              },
-              {
-                title: this.$t('Sponsor'),
-                dataIndex: 'designInitiatorName',
-                align: 'center'
-              },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'designDutyName',
-                align: 'center'
+                dataIndex: 'designDutyIdName',
+                align: 'left',
+                width: 180,
+                ellipsis: true
               },
               {
                 title: this.$t('TaskCutOffTime'),
                 dataIndex: 'designDueDate',
-                align: 'center'
-              }
-            ]
-          },
-          {
-            title: this.$t('PrehomoConfirmation'),
-            children: [
-              {
-                title: this.$t('Deliverables'),
-                dataIndex: 'prehomoDeliverableTemplateName',
-                align: 'center',
-                scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
+                align: 'left',
+                ellipsis: true,
+                width: 140
               },
               {
-                title: this.$t('Sponsor'),
-                dataIndex: 'prehomoInitiatorName',
-                align: 'center'
+                title: this.$t('ProcessStatus'),
+                dataIndex: 'designFlowStatusName',
+                align: 'left',
+                ellipsis: true,
+                width: 140,
+                scopedSlots: { customRender: 'designFlowStatusName' }
               },
               {
-                title: this.$t('personLiable'),
-                dataIndex: 'prehomoDutyName',
-                align: 'center'
-              },
-              {
-                title: this.$t('TaskCutOffTime'),
-                dataIndex: 'prehomoDueDate',
-                align: 'center'
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'designDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'designDeliverableTemplate' }
               }
             ]
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
             children: [
-              {
-                title: this.$t('Deliverables'),
-                dataIndex: 'verifyDeliverableTemplateName',
-                align: 'center',
-                scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
-              },
-              {
-                title: this.$t('Sponsor'),
-                dataIndex: 'verifyInitiatorName',
-                align: 'center'
-              },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'verifyDutyName',
-                align: 'center'
+                dataIndex: 'verifyDutyIdName',
+                align: 'left',
+                width: 180,
+                ellipsis: true
               },
               {
                 title: this.$t('TaskCutOffTime'),
                 dataIndex: 'verifyDueDate',
-                align: 'center'
+                align: 'left',
+                ellipsis: true,
+                width: 140
+              },
+              {
+                title: this.$t('ProcessStatus'),
+                dataIndex: 'verifyFlowStatusName',
+                align: 'left',
+                ellipsis: true,
+                width: 180,
+                scopedSlots: { customRender: 'verifyFlowStatusName' }
+              },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'verifyDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
               }
             ]
           }
+          // {
+          //   title: this.$t('operation'),
+          //   align: 'left',
+          //   fixed: 'right',
+          //   width: 260,
+          //   scopedSlots: { customRender: 'operation' }
+          // }
         ],
         columnsFile: [
           {
@@ -345,12 +327,6 @@
             width: 260,
             ellipsis: true
           },
-          {
-            title: this.$t('operation'),
-            align: 'center',
-            width: 130,
-            scopedSlots: { customRender: 'fileOperation' }
-          }
         ],
         visibleFile: false,
         dataSourceFile: [],
@@ -421,6 +397,73 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      //流程状态点击事件
+      designFlowStatusClick(row, name) {
+        let query = {}
+        let TaskKey = ''
+        if (name == this.$t('designComplianceReview')) {
+          if (row.designFlowStatus == 'Task to be confirmed') {
+            TaskKey = 'zrrqr'
+          } else if (row.designFlowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.designFlowStatus == 'Results to be reviewed' ||
+            row.designFlowStatus == 'Compliance' ||
+            row.designFlowStatus == 'Non-Compliance' ||
+            row.designFlowStatus == 'To be tracked' ||
+            row.designFlowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.designPId,
+            projectTaskInventoryId: row.id,
+            projectLibraryId: row.projectLibraryId,
+            TaskKey: TaskKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'designDutyIdName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId
+          }
+        } else {
+          if (row.verifyFlowStatus == 'Task to be confirmed') {
+            TaskKey = 'zrrqr'
+          } else if (row.verifyFlowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.verifyFlowStatus == 'Results to be reviewed' ||
+            row.verifyFlowStatus == 'Compliance' ||
+            row.verifyFlowStatus == 'Non-Compliance' ||
+            row.verifyFlowStatus == 'To be tracked' ||
+            row.verifyFlowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.verifyPId,
+            projectTaskInventoryId: row.id,
+            projectLibraryId: row.projectLibraryId,
+            TaskKey: TaskKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'verifyDutyIdName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId
+          }
+        }
+        this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
+      },
       searchQuery() {
         this.getList()
       },
@@ -502,6 +545,19 @@
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username})
       },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
+
       clickButtonToUpload(item) {
         this.loading = true
         this.visibleFile = true
@@ -521,8 +577,8 @@
             this.loading = false
           }
         })
-      }
-    }
+      },
+    },
   }
 </script>