OTA对接列表数据

jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue

@@ -203,11 +203,11 @@
         </template>
         <!--        备注编辑-->
         <template slot="remarks" slot-scope="text, record">
-          <span @click="getremark(record)">{{text}}</span>
+          <span @click="getremark(record)" :title='text'>{{text}}</span>
         </template>
         <!--        Vdr详情-->
         <template slot="vdr" slot-scope="text, record">
-          <a @click="getcdr(record)">{{text}}</a>
+          <a @click="getcdr(record)" :title='text'>{{text}}</a>
         </template>
         <!--        项目版本编辑-->
         <template slot="projectVersionName" slot-scope="text, record">
@@ -220,7 +220,7 @@
                     showSearch
                     optionFilterProp="label"
                     :autoClearSearchValue="false"
-                    v-model="record.projectVersionName">
+                    v-model="record.projectVersion">
             <a-select-option v-for="(item, key) in projectVersionList"
                              :label='item.versionName'
                              :key="key"
@@ -585,7 +585,7 @@ export default {
           name: 'R&H Studio',
           headFieldCn: 'R&H Studio',
           headFieldEn: 'R&H Studio',
-          field: 'studio',
+          field: 'studioText',
           key: 9,
           moduleFlag: '分车型'
         },
@@ -639,7 +639,7 @@ export default {
           name: this.$t('matchingstate'),
           headFieldCn: '匹配状态',
           headFieldEn: 'Matching state',
-          field: 'matchStatus',
+          field: 'matchStatusText',
           key: 15,
           moduleFlag: '分车型'
         },
@@ -668,6 +668,7 @@ export default {
           align: 'left',
           dataIndex: 'vdr',
           ellipsis: true,
+          sorter:true,
           width: 170,
           scopedSlots: { customRender: 'vdr' }
         },
@@ -676,6 +677,7 @@ export default {
           align: 'left',
           dataIndex: 'summary',
           ellipsis: true,
+          sorter:true,
           width: 170
         },
         {
@@ -683,6 +685,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'status'
         },
         {
@@ -690,6 +693,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'homologationImpact'
         },
         {
@@ -697,6 +701,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'homologation'
         },
         {
@@ -704,6 +709,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'impactCnHomo'
         },
         {
@@ -711,6 +717,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'impactEuHomo'
         },
         {
@@ -718,6 +725,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'masterDomain'
         },
         {
@@ -725,6 +733,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'appliedVehicleProject',
           scopedSlots: { customRender: 'vdr' }
         },
@@ -735,6 +744,7 @@ export default {
           align: 'left',
           dataIndex: 'vdr',
           ellipsis: true,
+          sorter:true,
           width: 170,
           scopedSlots: { customRender: 'vdr' }
         },
@@ -743,6 +753,7 @@ export default {
           align: 'left',
           dataIndex: 'summary',
           ellipsis: true,
+          sorter:true,
           width: 170
         },
         {
@@ -750,6 +761,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'status'
         },
         {
@@ -757,6 +769,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'homologationImpact'
         },
         {
@@ -764,6 +777,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'homologation'
         },
         {
@@ -771,6 +785,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'impactCnHomo'
         },
         {
@@ -778,6 +793,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'impactEuHomo'
         },
         {
@@ -785,6 +801,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'masterDomain'
         },
         {
@@ -792,13 +809,15 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'studio'
+          sorter:true,
+          dataIndex: 'studioText'
         },
         {
           title: this.$t('projectVersion'),
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'projectVersionName',
           scopedSlots: { customRender: 'projectVersionName' }
         },
@@ -807,6 +826,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'attestationStartTime'
         },
         {
@@ -814,6 +834,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'certificationSubmission'
         },
         {
@@ -821,6 +842,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'attestationEndTime'
         },
         {
@@ -828,6 +850,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'attestationSchedule',
           scopedSlots: { customRender: 'attestationSchedule' }
         },
@@ -836,13 +859,15 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'matchStatus'
+          sorter:true,
+          dataIndex: 'matchStatusText'
         },
         {
           title: this.$t('remarks'),
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex: 'remark',
           scopedSlots: { customRender: 'remarks' }
         },
@@ -851,6 +876,7 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
+          sorter:true,
           dataIndex:'operation',
           scopedSlots: { customRender: 'operation' }
         },
@@ -1077,12 +1103,40 @@ export default {
     },
     // 保存
     preservation(){
-
+      let OtaManageApplyEO = JSON.parse(JSON.stringify(this.dataSource))
+      let query = {
+        list: OtaManageApplyEO
+      }
+      postAction('/ota/otaManageApplyEO/temporarySave', query).then((res) => {
+        if (res.success) {
+          this.$message.success(this.$t('OperationSuccessful'))
+          this.getList()
+        } else {
+          this.$message.warning(this.$t('operationFailed'))
+        }
+      })
     },
     // 提交
     submit(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        let OtaManageApplyEO = JSON.parse(JSON.stringify(this.selectedRowKeysRecord))
+        let query = {
+          list: OtaManageApplyEO
+        }
+        postAction('/ota/otaManageApplyEO/submit', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            if(res.msgList && res.msgList.length == 0){
+              this.getList()
+            }else{
+              this.selectedRowKeysValue = res.msgList
+              this.visibleoperationFailed = true
+            }
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
       }
@@ -1115,13 +1169,29 @@ export default {
     },
     remarkForm(data,val){
       console.log(data,val)
-      return
       // 根据id匹配
+      let remarkList = []
       this.dataSource.forEach(item => {
         if(item.id == val){
           item.remark = data
+          remarkList.push(item)
         }
       })
+      this.dataSource = this.dataSource
+      console.log(remarkList)
+      let OtaManageApplyEO = JSON.parse(JSON.stringify(remarkList))
+      let query = {
+        list: OtaManageApplyEO
+      }
+      postAction('/ota/otaManageApplyEO/temporarySave', query).then((res) => {
+        if (res.success) {
+          this.$message.success(this.$t('OperationSuccessful'))
+        } else {
+          this.$message.warning(this.$t('operationFailed'))
+        }
+      })
+      this.$refs.remarkRef.confirmLoading = false
+      this.$refs.remarkRef.visible = false
     },
     getcustomize() {
       this.customizevisible = true

jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue

@@ -20,8 +20,9 @@
             </div>
             <a-form-model-item class="itemModel" prop="bz">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
-                          v-model="formInline.bz"
+                          v-model="formInline.remark"
                           style="width: 90%"
+                          :maxLength="200"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -46,10 +47,7 @@ export default {
       returntime:false,
       propflag: false,
       formInline: {
-        bazt:undefined,
+
-        batjsj:'',
-        tgthsj:'',
-        bz:'',
       },
       projectVersionList:[],
       rules: {
@@ -86,18 +84,18 @@ export default {
   methods: {
     edit(row) {
       this.row = row
+      this.formInline.remark = row.remark == '-'?'':row.remark
       this.visible = true
       this.$nextTick(() => {
-        this.formInline = {}
         this.$refs.ruleForm.clearValidate()
       })
     },
     handleOk() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          let query = {
+          // let query = {
-            ...this.formInline,
+          //   ...this.formInline,
-          }
+          // }
           this.confirmLoading = true
           // postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
           //   if (res.success) {

jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue

@@ -141,22 +141,7 @@ export default {
         influencestatuteCn:'',
         influencestatuteEu:'',
       },
-      vdrList:[
+      vdrList:[],
-        {
-          title:'CN-1',
-          certificationStartOne:'2022-06-14',
-          certificationdeclaration:'2022-06-14',
-          certificationEnd:'2022-06-14',
-          CertificationProgress:'2022-06-14',
-        },
-        {
-          title:'CN-2',
-          certificationStartOne:'2022-06-14',
-          certificationdeclaration:'2022-06-14',
-          certificationEnd:'2022-06-14',
-          CertificationProgress:'2022-06-14',
-        },
-      ],
       url:{
         addModel:''
       },