diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index dfa4f1a73..6328fd9e6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1948,4 +1948,5 @@ module.exports = {
   tobematched:'To be matched',
   Pendingapproval:'To be approved',
   lock:'lock',
+  datacannotbeedited:'This data cannot be edited',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 32bd5a8e0..bcff0bd3a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3904,4 +3904,5 @@ module.exports = {
   tobematched:'待匹配',
   Pendingapproval:'待审批',
   lock:'锁定',
+  datacannotbeedited:'该数据不能进行编辑',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
index 1d3d09d70..f39ada6ee 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
@@ -31,12 +31,12 @@
                 :placeholder="$t('PleaseSelect')+$t('projectVersion')">
                 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
                 <a-select-option v-for="(item, key) in projectVersionList"
+                                 :label='item.versionName'
                                  :key="key"
-                                 :label="item"
-                                 :value="item">
-                        <span class="itemOption" :title=" item ">
-                             {{ item }}
-                        </span>
+                                 :value="item.projectId">
+                  <span style="display: inline-block;width: 100%" :title=" item.versionName">
+                    {{ item.versionName }}
+                  </span>
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -100,14 +100,24 @@ export default {
   mounted() {
   },
   methods: {
-    edit(row) {
+    edit(row,vehicleTypeCode) {
       this.ids = row
+      this.vehicleTypeCode = vehicleTypeCode
+      this.getprojectList()
       this.visible = true
       this.$nextTick(() => {
         this.formInline = {}
         this.$refs.ruleForm.clearValidate()
       })
     },
+    getprojectList(){
+      getAction('/ota/otaManageApplyEO/getProjectVersionList', {carMarket:this.vehicleTypeCode}).then((res) => {
+        if (res.success) {
+          this.projectVersionList = res.result
+        } else {
+        }
+      })
+    },
     handleOk() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
@@ -116,17 +126,17 @@ export default {
             ids:this.ids
           }
           this.confirmLoading = true
-          // postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
-          //   if (res.success) {
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.confirmLoading = false
-          //     this.$emit('getList')
-          //   } else {
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
+          getAction('/ota/otaManageApplyEO/applyRematch', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.confirmLoading = false
+              this.$emit('getList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
         }
       })
     },
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
index 53fcf82d5..c9e19f0e2 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
@@ -31,12 +31,12 @@
                 :placeholder="$t('PleaseSelect')+$t('projectVersion')">
                 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
                 <a-select-option v-for="(item, key) in projectVersionList"
+                                 :label='item.versionName'
                                  :key="key"
-                                 :label="item"
-                                 :value="item">
-                        <span class="itemOption" :title=" item ">
-                             {{ item }}
-                        </span>
+                                 :value="item.projectId">
+                  <span style="display: inline-block;width: 100%" :title=" item.versionName">
+                    {{ item.versionName }}
+                  </span>
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -52,7 +52,7 @@
                 {{$t('CertificationProgress')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="bazt">
-              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+              <j-dict-select-tag class="box-input" v-model="formInline.attestationSchedule"
                                  :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
                                  :type="'select'"
                                  style="width: 90%"
@@ -69,8 +69,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>
@@ -127,20 +128,31 @@ export default {
         //   }
         // ],
       },
-      ids: ''
+      ids: '',
+      vehicleTypeCode:'',
     }
   },
   mounted() {
   },
   methods: {
-    edit(row) {
+    edit(row,vehicleTypeCode) {
       this.ids = row
+      this.vehicleTypeCode = vehicleTypeCode
+      this.getprojectList()
       this.visible = true
       this.$nextTick(() => {
         this.formInline = {}
         this.$refs.ruleForm.clearValidate()
       })
     },
+    getprojectList(){
+      getAction('/ota/otaManageApplyEO/getProjectVersionList', {carMarket:this.vehicleTypeCode}).then((res) => {
+        if (res.success) {
+          this.projectVersionList = res.result
+        } else {
+        }
+      })
+    },
     handleOk() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
@@ -149,17 +161,17 @@ export default {
             ids:this.ids
           }
           this.confirmLoading = true
-          // postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
-          //   if (res.success) {
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.confirmLoading = false
-          //     this.$emit('getList')
-          //   } else {
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
+          postAction('/ota/otaManageApplyEO/updateVdrBatch', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.confirmLoading = false
+              this.$emit('getList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
         }
       })
     },
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 8e85a70ec..673724913 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -1039,8 +1039,19 @@ export default {
     // 批量设置
     BatchSetting(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        let content = []
-        this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        let disabledList = []
+        this.selectedRowKeysRecord.forEach(item => {
+          if(item.disabled){
+            disabledList.push(item.disabled)
+          }
+        })
+        const index = disabledList.indexOf(true);
+        console.log(index)
+        if (index !== -1) {
+          this.$message.warning(this.$t('datacannotbeedited'))
+        } else {
+          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),this.vehicleTypeCode)
+        }
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
       }
@@ -1056,10 +1067,10 @@ export default {
         })
         const index = statusList.indexOf('locked');
         console.log(index)
-        if (index !== -1) {
+        if (index == -1) {
           this.$message.warning(this.$t('selectlocked'))
         } else {
-          this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+          this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),this.vehicleTypeCode)
         }
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
@@ -1155,7 +1166,17 @@ export default {
     // 确认
     confirm(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+        let query = {
+          ids:this.selectedRowKeys
+        }
+        getAction('/ota/otaManageApplyEO/confirm', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
       }
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
index c28ae29c5..21b45cde9 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
@@ -22,6 +22,7 @@
               <a-textarea :placeholder="$t('pleaseEnter')+$t('rejectReason')"
                           v-model="formInline.rejectReason"
                           style="width: 90%"
+                          :maxLength="200"
                           :rows="4"/>
             </a-form-model-item>
           </div>
@@ -84,9 +85,7 @@ export default {
   },
   methods: {
     edit(row) {
-      if(row){
-        this.ids = row
-      }
+      this.ids = row
       this.visible = true
       this.$nextTick(() => {
         this.formInline = {}
@@ -101,17 +100,17 @@ export default {
             ids:this.ids
           }
           this.confirmLoading = true
-          // postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
-          //   if (res.success) {
-          //     this.$message.success(this.$t('OperationSuccessful'))
-          //     this.visible = false
-          //     this.confirmLoading = false
-          //     this.$emit('getList')
-          //   } else {
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
+          getAction('/ota/otaManageApplyEO/reject', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.confirmLoading = false
+              this.$emit('getList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
         }
       })
     },