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

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

@@ -94,7 +94,7 @@ export default {
         //   }
         // ],
       },
-      ids: ''
+      ids: []
     }
   },
   mounted() {
@@ -123,7 +123,7 @@ export default {
         if (valid) {
           let query = {
             ...this.formInline,
-            ids:this.ids
+            ids:this.ids.join(',')
           }
           this.confirmLoading = true
           getAction('/ota/otaManageApplyEO/applyRematch', query).then((res) => {
@@ -131,6 +131,7 @@ export default {
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.confirmLoading = false
+              this.ids = []
               this.$emit('getList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
@@ -142,7 +143,7 @@ export default {
     },
     handleCancel() {
       this.formInline = {}
-      this.ids = ''
+      this.ids = []
       this.visible = false
     },
     // dateChange(item) {

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

@@ -156,9 +156,10 @@ export default {
     handleOk() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          let OtaManageApplyEO = JSON.parse(JSON.stringify(this.ids))
           let query = {
+            list: OtaManageApplyEO,
             ...this.formInline,
-            ids:this.ids
           }
           this.confirmLoading = true
           postAction('/ota/otaManageApplyEO/updateVdrBatch', query).then((res) => {
@@ -166,6 +167,7 @@ export default {
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.confirmLoading = false
+              this.ids = []
               this.$emit('getList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
@@ -177,7 +179,7 @@ export default {
     },
     handleCancel() {
       this.formInline = {}
-      this.ids = ''
+      this.ids = []
       this.visible = false
     },
     // dateChange(item) {

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

@@ -249,7 +249,7 @@
     </div>
     <batSetting :url="url" @getList="getList" ref="batSettingRef"/>
     <applyforrematch :url="url" @getList="getList" ref="applyforrematchRef"/>
-    <rejectReason :url="url" @getList="getList" ref="rejectReasonRef"/>
+    <rejectReason :url="url" @getList="getList" @msgForm='msgForm' ref="rejectReasonRef"/>
     <remark @remarkForm='remarkForm' ref="remarkRef"/>
     <vdrDetial @vdrDetial='vdrDetial' ref="vdrDetialRef"/>
     <!--    历史记录-->
@@ -291,7 +291,7 @@
           show-quick-jumper
           show-size-changer
           :page-size.sync="pageSizehistory"
-          :total="total"
+          :total="historytotal"
           :current="pageNohistory"
           @change="onChangehistory"
           @showSizeChange="SizeChangehistory"
@@ -312,7 +312,7 @@
           <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
                class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
             <div>
-              <span>{{ item.nioNumber }}</span>
+              <span>{{ item }}</span>
             </div>
           </div>
         </a-col>
@@ -378,6 +378,7 @@ export default {
       checkedList: [],
       serialNumber: '',
       total: 0,
+      historytotal: 0,
       pageSize: 10,
       pageNo: 1,
       pageNohistory: 1,
@@ -397,7 +398,7 @@ export default {
       columnshistory: [
         {
           title: this.$t('OperationDetails'),
-          dataIndex: 'logContent',
+          dataIndex: 'content',
           align: 'left',
           width: 320,
           ellipsis: true,
@@ -942,6 +943,7 @@ export default {
     },
     searchReset() {
       this.queryParam = {}
+      this.selectedRowKeys = []
       this.pageNo = 1
       this.getList()
     },
@@ -961,6 +963,7 @@ export default {
           queryParam[val] = queryParam[val].join(',')
         }
       })
+      this.selectedRowKeys = []
       queryParam.appliedVehicleProject = this.vehicleTypeCode == '全部'?queryParam.appliedVehicleProject:this.vehicleTypeCode
       queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
       let query = {
@@ -1040,18 +1043,18 @@ export default {
     // 批量设置
     BatchSetting(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        let disabledList = []
+        let flag = 1
         this.selectedRowKeysRecord.forEach(item => {
-          if(item.disabled){
-            disabledList.push(item.disabled)
+          if(item.disabled == true){
+            flag = 2
+            return
           }
         })
-        const index = disabledList.indexOf(true);
-        console.log(index)
-        if (index !== -1) {
+        console.log(flag)
+        if (flag == 2) {
           this.$message.warning(this.$t('datacannotbeedited'))
         } else {
-          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),this.vehicleTypeCode)
+          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeysRecord)),this.vehicleTypeCode)
         }
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
@@ -1060,18 +1063,18 @@ export default {
     // 申请重新匹配
     applyforrematch(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        let statusList = []
+        let flag = 1
         this.selectedRowKeysRecord.forEach(item => {
-          if(item.status){
-            statusList.push(item.status)
+          if(item.matchStatus !== 'locked'){
+            flag = 2
+            return
           }
         })
-        const index = statusList.indexOf('locked');
-        console.log(index)
-        if (index == -1) {
-          this.$message.warning(this.$t('selectlocked'))
-        } else {
+        console.log(flag)
+        if (flag !== 2) {
           this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),this.vehicleTypeCode)
+        } else {
+          this.$message.warning(this.$t('selectlocked'))
         }
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
@@ -1096,22 +1099,21 @@ export default {
       let query = {
         pageNo: this.pageNohistory,
         pageSize: this.pageSizehistory,
-        paramsManifestId: this.$route.query.id,
-        paramsCollectManifestId: this.paramsReportDetailId
+        applyId: this.paramsReportDetailId
       }
-      this.loading = true
-      getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
+      // this.loading = true
+      getAction('/ota/otaManageHistory/page', query).then((res) => {
         if (res.success) {
           this.dataSourcehistory = res.result.records
           if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
             this.dataSourcehistory.forEach(val => {
-              val.logContent = val.logContent.replace(/\"/g, '<span class=\'textData\'>"</span>')
+              val.content = val.content.replace(/\"/g, '<span class=\'textData\'>"</span>')
             })
           }
-          this.total = res.result.total
-          this.loading = false
+          this.historytotal = res.result.total
+          // this.loading = false
         } else {
-          this.loading = false
+          // this.loading = false
         }
       })
     },
@@ -1150,10 +1152,11 @@ export default {
         postAction('/ota/otaManageApplyEO/submit', query).then((res) => {
           if (res.success) {
             if(res.result.msgList && res.result.msgList.length == 0){
+              this.selectedRowKeys = []
               this.getList()
               this.$message.success(this.$t('OperationSuccessful'))
             }else{
-              this.selectedRowKeysValue = res.result.msgList
+              this.NotSelectedRowKeysValue = res.result.msgList
               this.visibleoperationFailed = true
             }
           } else {
@@ -1167,13 +1170,20 @@ export default {
     // 确认
     confirm(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        console.log(this.selectedRowKeys)
         let query = {
-          ids:this.selectedRowKeys
+          ids:this.selectedRowKeys.join(',')
         }
         getAction('/ota/otaManageApplyEO/confirm', query).then((res) => {
           if (res.success) {
-            this.$message.success(this.$t('OperationSuccessful'))
-            this.getList()
+            if(res.result.msgList && res.result.msgList.length == 0){
+              this.selectedRowKeys = []
+              this.getList()
+              this.$message.success(this.$t('OperationSuccessful'))
+            }else{
+              this.NotSelectedRowKeysValue = res.result.msgList
+              this.visibleoperationFailed = true
+            }
           } else {
             this.$message.warning(this.$t('operationFailed'))
           }
@@ -1190,6 +1200,15 @@ export default {
         this.$message.warning(this.$t('selectLeastOne'))
       }
     },
+    msgForm(data){
+      if(data && data.length !== 0){
+        this.NotSelectedRowKeysValue = data
+        this.visibleoperationFailed = true
+      }else{
+        this.selectedRowKeys = []
+        this.getList()
+      }
+    },
     // 备注编辑
     getremark(item){
       this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item)))
@@ -1334,7 +1353,7 @@ export default {
     },
     // 错误数据的弹框
     cancleoperationFailed() {
-      this.selectedRowKeysValue = []
+      this.NotSelectedRowKeysValue = []
       this.visibleoperationFailed = false
       this.getList()
       // this.GetgetTableList()
@@ -1479,4 +1498,14 @@ popconfirmmize {
   background: #fff;
   border-radius: 0 0 2px 2px;
 }
+.imports-footer {
+  .imports-footer-wrap {
+    margin: 20px 0;
+    text-align: center;
+
+    .imports-sub {
+      margin-right: 20px;
+    }
+  }
+}
 </style>

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

@@ -78,7 +78,7 @@ export default {
         //   }
         // ],
       },
-      ids: ''
+      ids: []
     }
   },
   mounted() {
@@ -97,7 +97,7 @@ export default {
         if (valid) {
           let query = {
             ...this.formInline,
-            ids:this.ids
+            ids:this.ids.join(',')
           }
           this.confirmLoading = true
           getAction('/ota/otaManageApplyEO/reject', query).then((res) => {
@@ -105,7 +105,9 @@ export default {
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.confirmLoading = false
-              this.$emit('getList')
+              this.ids = []
+              this.$emit('msgForm',res.result.msgList)
+              // this.$emit('getList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
@@ -116,7 +118,7 @@ export default {
     },
     handleCancel() {
       this.formInline = {}
-      this.ids = ''
+      this.ids = []
       this.visible = false
     },
     // dateChange(item) {