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

jero-web/src/components/CollectionType/index.vue

@@ -1106,7 +1106,7 @@
   }
 
   .selectWid {
-    min-width: 150px;
+    /*min-width: 150px;*/
     width: 100%;
   }
 

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -980,7 +980,7 @@
   }
 
   .selectWid {
-    min-width: 150px;
+    /*min-width: 150px;*/
     width: 100%;
   }
 

jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue

@@ -227,7 +227,8 @@ export default {
       },
       url:{
         addModel:''
-      }
+      },
+      record:{}
     }
   },
   mounted() {
@@ -235,10 +236,12 @@ export default {
   },
   methods: {
     ...mapGetters(['userInfo']),
-    addModel(flag) {
-      if(flag=='1')
-      this.disabled=true
-      this.showButton=true
+    addModel(record,flag) {
+      if(flag=='1'){
+        this.disabled=true
+        this.showButton=true
+      }
+      this.record=record
       this.visible = true
       this.formInline = {}
       this.formInline.dataList = [{}]
@@ -274,7 +277,7 @@ export default {
           //   }
           // })
               this.visible = false
-              this.$emit('addModelList')
+              this.$emit('addModelList',this.record)
         }
       })
     },

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -143,9 +143,9 @@
              @click="maintenanceClick(record)">{{$t('maintenance')}}</a>
  
           <a class="text-operation"
-             @click="endUpgrade(record , '0')" v-if="!onShow">{{$t('endUpgrade')}}</a>
+             @click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}}</a>
              <a class="text-operation"
-             @click="endUpgrade(record , '1')" v-if="onShow">{{$t('upgradecompletion')}}</a>
+             @click="endUpgrade(record , '1')" v-if="record.onShow">{{$t('upgradecompletion')}}</a>
           <a class="text-operation"
              @click="handleExport(record)">{{$t('export')}}</a>
           <a class="text-operation"
@@ -310,7 +310,6 @@ export default {
       ],
       userInfoQuery: {},
       administrators: false,
-      onShow:false
     }
   },
   mounted() {
@@ -445,7 +444,7 @@ export default {
     },
     // 结束升级
     endUpgrade(record,flag){
-      this.$refs.upgradecompletionRef.addModel(flag)
+      this.$refs.upgradecompletionRef.addModel(record,flag)
     },
     // 查看
     detailclick(){
@@ -468,8 +467,9 @@ export default {
     handleModule(){
       downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
     },
-    addModelList(){
-      this.onShow=true
+    addModelList(record){
+      record.onShow=true
+      this.$forceUpdate()
     }
   }
 }

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

@@ -198,6 +198,7 @@ import ImportFile from '@/components/ImportFileData/index'
         getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
          if(res.code == 200){
           this.form=res.result ==null?{}:res.result
+         
          }
         })
     },

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

@@ -320,7 +320,8 @@ import { message } from 'ant-design-vue'
             this.form.cpmc=res.result.cpmc
             this.form.cpxh=res.result.cpxh
             this.form.txzd=res.result.txzd
-            this.form.cdotasj=res.result.cdotasj
+            this.form.txzd=res.result.txzd
+            this.form.id=res.result.id
            if(this.$route.query.type == 1 && res.result.cxmb == null){
              this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
            }else {

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -40,6 +40,11 @@
         <span slot="approvalResult" slot-scope="text,result">
             {{approvalResult[text]}}
         </span>
+        <span slot="resultofhandling" slot-scope="text,result">
+            <span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
+                 {{result.operatorResultName}}
+            </span>
+        </span>
         <span slot="approvalFile" slot-scope="text,result">
               <span class="viewFile"
                     @click="viewFileClick(result.approvalFile)"
@@ -78,6 +83,17 @@
       return {
         loading: false,
         dataSource: [],
+        statusClass: {
+          'Accepted': 'AcceptedClass',
+          'Rejected': 'RejectedClass',
+          'Transfer': 'TransferClass',
+          'Returned': 'ReturnedClass',
+          'Adopt': 'AdoptClass',
+          'Compliance': 'ComplianceClass',
+          'Non-Compliance': 'NonComplianceClass',
+          'To be tracked': 'trackedClass',
+          'NA': 'NAClass'
+        },
         regulatoryCertificationTaskPlanList: [
           {
             status: '1',
@@ -131,6 +147,7 @@
             align: 'left',
             width: 160,
             ellipsis: true,
+            scopedSlots: { customRender: 'resultofhandling' }
           },
           {
             title: this.$t('feedback'),
@@ -164,7 +181,7 @@
             this.dataSource = res.result || []
             if (this.dataSource.length > 0) {
               let taskData = this.dataSource[this.dataSource.length - 1]
-              if (this.queryProject.TaskKey == 'fqlc'){
+              if (this.queryProject.TaskKey == 'fqlc') {
                 this.regulatoryCertificationTaskPlanList.forEach(val => {
                   if (val.name == this.$t('initiatingProcess')) {
                     val.status = '2'
@@ -200,7 +217,7 @@
                 })
               }
               if (this.queryProject.TaskKey == 'fggcssh') {
-                if (taskData.operatorResult == 'Adopt'){
+                if (taskData.operatorResult == 'Adopt') {
                   this.regulatoryCertificationTaskPlanList.forEach(val => {
                     if (val.name == this.$t('initiatingProcess')) {
                       val.status = '1'
@@ -214,7 +231,7 @@
                       val.status = '1'
                     }
                   })
-                }else{
+                } else {
                   this.regulatoryCertificationTaskPlanList.forEach(val => {
                     if (val.name == this.$t('initiatingProcess')) {
                       val.status = '1'
@@ -248,6 +265,7 @@
 
 <style scoped lang="less">
   @import '~@assets/less/common.less';
+
   .box {
     padding: 0 0 24px 0;
     box-sizing: border-box;
@@ -331,6 +349,7 @@
         }
       }
     }
+
     .process-content-content:first-child {
       padding: 0 10px 0 0;
     }
@@ -338,6 +357,7 @@
     .process-content-content:last-child {
       padding: 0 0 0 10px;
     }
+
     .process-content-right-xian {
       height: 2px;
       width: calc(100% - 27px);
@@ -346,4 +366,94 @@
       top: 16px;
     }
   }
+
+  .AcceptedClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .RejectedClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .TransferClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ReturnedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .AdoptClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .ComplianceClass {
+    background: #e9f8ed;
+    color: #26BD4B;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NonComplianceClass {
+    background: #fdeaea;
+    color: #E83030;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .trackedClass {
+    background: #fff6e8;
+    color: #FDA71C;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
+
+  .NAClass {
+    background: #f1f1f3;
+    color: #707486;
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 2px;
+    font-weight: 400;
+    font-size: 12px;
+  }
 </style>