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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java

@@ -38,7 +38,7 @@ public class ComparisonUtil<T> {
             String newStr = parseDictText(ote, field, newClazz, sysDictService);
             String oldStr = parseDictText(ote, field, oldClazz, sysDictService);
             if (!newStr.equals(oldStr)) {
-                String content = "由" + title + "的" + oldStr + "改为" + newStr;
+                String content = "将" + title + "的'" + oldStr + "'改为'" + newStr + "'";
                 resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
             }
         }
@@ -56,7 +56,7 @@ public class ComparisonUtil<T> {
                     if (ObjectUtils.isEmpty(id)) {
                         Field tableField = newObj.getClass().getDeclaredField(tableTitle);
                         tableField.setAccessible(true);
-                        String content = "新增了一条" + tableField.get(newObj).toString();
+                        String content = "新增了一条'" + tableField.get(newObj).toString() + "'";
                         resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
                         Field[] fields = newObj.getClass().getDeclaredFields();
                         for (Field field : fields) {
@@ -68,12 +68,12 @@ public class ComparisonUtil<T> {
                             title = ote.getValue();
                             field.setAccessible(true);
                             Object newVal = field.get(newObj);
-                            String newStr = "空";
+                            String newStr = "";
                             if (ObjectUtils.isNotEmpty(newVal)) {
                                 newStr = newVal.toString();
+                                content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'";
+                                resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
                             }
-                            content = "增加" + tableField.get(newObj).toString() + "中" + title + "为" + newStr;
-                            resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
                         }
                     } else {
                         for (T oldObj : oldList) {
@@ -105,7 +105,7 @@ public class ComparisonUtil<T> {
                     if (ObjectUtils.isNotEmpty(tableTitleObj)) {
                         tableTitleObjStr = tableTitleObj.toString();
                     }
-                    String content = "删除了" + tableTitleObjStr;
+                    String content = "删除了'" + tableTitleObjStr + "'";
                     resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
                 }
             }
@@ -143,7 +143,7 @@ public class ComparisonUtil<T> {
                             newTitleStr = newTitleVal.toString();
                         }
                     }
-                    String content = newTitleStr + "的" + title + "由" + oldStr + "改为" + newStr;
+                    String content = newTitleStr + "-" + title + "由'" + oldStr + "'改为'" + newStr + "'";
                     resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
                 }
             } catch (IllegalAccessException | NoSuchFieldException e) {

jero-web/src/common/lang/en-us.js

@@ -594,7 +594,7 @@ module.exports = {
   labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted',
   searchInResults: 'Search In Results',
   searchContent: 'Search Content',
-  viewFile: 'View File',
+  viewFile: 'View',
   fileFormatIncorrect: 'The file format is incorrect',
   pleaseUploadFile: 'Please upload the file',
   documentSplitList: 'Document Split List Display',
@@ -1523,7 +1523,7 @@ module.exports = {
   VINcodeupload:'VIN code upload',
   Tasknode:'Task Node',
   Taskresponsibilityrecognition:'Task responsibility recognition',
-  uploadattachment:'Upload attachment',
+  uploadattachment:'Upload',
   Processhistory:'Process history',
   resultofhandling:'Result of handling',
   cause:'cause',
@@ -1715,4 +1715,5 @@ module.exports = {
   reasonForReturn:'Reason For Return',
   pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process',
   complianceReporting:'Compliance Reporting',
+  youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1815,4 +1815,5 @@ module.exports = {
   reasonForReturn:'退回原因',
   pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程',
   complianceReporting:'合规报告',
+  youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据',
 }

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

@@ -85,7 +85,7 @@
                       <span class="title-text-text" :title="$t('cause') + (index+1)">{{$t('cause') + (index+1)}}</span>
                     </div>
                     <a-form-model-item class="itemModel">
-                      <a-textarea class="box-input"
+                      <a-input class="box-input"
                                   v-model="item.cause"
                                   :placeholder="$t('PleaseEnter')+$t('cause')"/>
                     </a-form-model-item>
@@ -137,10 +137,8 @@
                   <span class="title-text-text" :title="$t('implementationrecords')">{{$t('implementationrecords')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="implementationrecords">
-                  <a-textarea
-                    :placeholder="$t('PleaseEnter')+$t('implementationrecords')"
-                    :disabled="disabled"
-                    v-model="formInline.implementationrecords"/>
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('implementationrecords')"
+                              :rows="2" v-model="formInline.remarks"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -362,7 +360,7 @@ export default {
   width: calc(100% - 130px);
   display: inline-block;
   margin-top: 2px;
-  height: 40px;
+  min-height: 40px;
   margin-bottom: 24px;
 }
 

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

@@ -210,7 +210,7 @@ export default {
       ],
       url: {
         exportData: '/ota/otaBaSjSjfzbh/exportData',
-        importZipUrl: '/ota/otaBaSjSjfzbh/importData',//导入
+        importZipUrl: '/ota/otaBaSjSjfzbh/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
     }
   },

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

@@ -113,7 +113,7 @@ export default {
       formInline:{},
       url: {
         exportData: '/ota/otaBaSjSjmbcl/exportData',
-        importZipUrl: '/ota/otaBaSjSjmbcl/importData',//导入
+        importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
     }
   },

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

@@ -246,7 +246,7 @@ export default {
       ],
       url: {
         exportData: '/ota/otaBaSjSjxtbh/exportData',
-        importZipUrl: '/ota/otaBaSjSjxtbh/importData',//导入
+        importZipUrl: '/ota/otaBaSjSjxtbh/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
     }
   },

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

@@ -167,7 +167,7 @@ export default {
       ],
       url: {
         exportData: '/ota/otaBaSjSjyxpg/exportData',
-        importZipUrl: '/ota/otaBaSjSjyxpg/importData',//导入
+        importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
       loading: false,
       disable:false,

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

@@ -167,7 +167,7 @@ import ImportFile from '@/components/ImportFileData/index'
         },
         url: {
           exportData: '/ota/otaBaSjSjmbcx/exportData',
-          importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入
+          importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入
         },
         projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
         projectNameList2:[],

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

@@ -192,7 +192,7 @@ export default {
       formInline:{},
       url: {
         exportData: '/ota/otaBaSjGgnrfs/exportData',
-        importZipUrl: '/ota/otaBaSjGgnrfs/importData',//导入
+        importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
     }
   },

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

@@ -53,7 +53,7 @@
         class="table"
         :columns="columnshistory"
         :pagination="false"
-        :scroll="{x: '100%', y: 400}"
+        :scroll="{x: '100%', y: 'calc(100vh - 330px)'}"
         :data-source="dataSourcehistory"
         :loading="loading"
       >

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

@@ -240,7 +240,7 @@ import { message } from 'ant-design-vue'
         formRules:[],
         url: {
           exportData: '/ota/otaBaCxJbxx/exportData',
-          importZipUrl: '/ota/otaBaCxJbxx/importData',//导入
+          importZipUrl: '/ota/otaBaCxJbxx/importData?otaId=' + localStorage.getItem('otaId'),//导入
         },
         form:{
           cxmb:undefined,

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

@@ -125,7 +125,7 @@ import ImportFile from '@/components/ImportFileData/index'
         fileList:'',
         url: {
           exportData: '/ota/otaBaCxKsjjsmccs/exportData',
-          importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入
+          importZipUrl: '/ota/otaBaCxKsjjsmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入
         },
         dataSource: [
           {

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

@@ -15,81 +15,81 @@
       <div style='width: 400px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('componentname')}}</span>
         <span class='radio-text' :title="$t('networksecurityrequirements')">
-          {{$t('networksecurityrequirements')}}
+          &nbsp;&nbsp;{{$t('networksecurityrequirements')}}
         </span>
         <span class='radio-text' :title="$t('millimeterwaveradar')">
-          {{$t('millimeterwaveradar')}}
+          &nbsp;&nbsp;{{$t('millimeterwaveradar')}}
         </span>
         <span class='radio-text' :title="$t('ultrasonicradar')">
-          {{$t('ultrasonicradar')}}
+          &nbsp;&nbsp;{{$t('ultrasonicradar')}}
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('camera')">
-            {{$t('camera')}}
+            &nbsp;&nbsp;{{$t('camera')}}
           </span>
           <span class='text-text-two' :title="$t('asternimage')">
-            {{$t('asternimage')}}
+            &nbsp;&nbsp;{{$t('asternimage')}}
           </span>
           <span class='text-text-two' :title="$t('Monocularbinocularmultiocular')">
-            {{$t('Monocularbinocularmultiocular')}}
+            &nbsp;&nbsp;{{$t('Monocularbinocularmultiocular')}}
           </span>
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('driverattentionmonitoringsystem')">
-            {{$t('driverattentionmonitoringsystem')}}
+            &nbsp;&nbsp;{{$t('driverattentionmonitoringsystem')}}
           </span>
           <span class='text-text-two' :title="$t('driversurveillancecamera')">
-            {{$t('driversurveillancecamera')}}
+            &nbsp;&nbsp;{{$t('driversurveillancecamera')}}
           </span>
           <span class='text-text-two' :title="$t('drivermonitoringinfraredsensor')">
-            {{$t('drivermonitoringinfraredsensor')}}
+            &nbsp;&nbsp;{{$t('drivermonitoringinfraredsensor')}}
           </span>
         </span>
         <span class='text-box-two' >
           <span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
-            {{$t('positioningandnavigationsystem')}}
+            &nbsp;&nbsp;{{$t('positioningandnavigationsystem')}}
           </span>
           <span class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
-            {{$t('vehiclesatellitepositioningequipment')}}
+            &nbsp;&nbsp;{{$t('vehiclesatellitepositioningequipment')}}
           </span>
           <span class='text-text-three' :title="$t('inertialnavigationsystem')">
-            {{$t('inertialnavigationsystem')}}
+            &nbsp;&nbsp;{{$t('inertialnavigationsystem')}}
           </span>
           <span class='text-text-three' :title="$t('wheelspeedmeter')">
-            {{$t('wheelspeedmeter')}}
+            &nbsp;&nbsp;{{$t('wheelspeedmeter')}}
           </span>
           <span class='text-text-three' :title="$t('highprecisionmap')">
-            {{$t('highprecisionmap')}}
+            &nbsp;&nbsp;{{$t('highprecisionmap')}}
           </span>
           <span class='text-text-five' :title="$t('electronicfence')">
-            {{$t('electronicfence')}}
+            &nbsp;&nbsp;{{$t('electronicfence')}}
           </span>
         </span>
         <span class='text-box-three' :title="$t('vehiclecommunicationsystem')">
-          {{$t('vehiclecommunicationsystem')}}
+          &nbsp;&nbsp;{{$t('vehiclecommunicationsystem')}}
         </span>
         <span class='text-box-four'>
           <span class='four-text-text' :title="$t('signalingdevices')">
-            {{$t('signalingdevices')}}
+            &nbsp;&nbsp;{{$t('signalingdevices')}}
           </span>
           <span class='four-text' :title="$t('driverassistancefunctioncontrols')">
-            {{$t('driverassistancefunctioncontrols')}}
+            &nbsp;&nbsp;{{$t('driverassistancefunctioncontrols')}}
           </span>
           <span class='four-text' :title="$t('drivingassistancefunctionindicatorsignaldevice')">
-            {{$t('drivingassistancefunctionindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('drivingassistancefunctionindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('steerinwheelreleaseindicatorsignaldevice')">
-            {{$t('steerinwheelreleaseindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('steerinwheelreleaseindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('driverattentionindicatorsignaldevice')">
-            {{$t('driverattentionindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('driverattentionindicatorsignaldevice')}}
           </span>
         </span>
         <span class='text-box-five' :title="$t('automaticDrivingDataRecordingSystem')">
-          {{$t('automaticDrivingDataRecordingSystem')}}
+          &nbsp;&nbsp;{{$t('automaticDrivingDataRecordingSystem')}}
         </span>
         <span class='text-box-five' :title="$t('eventdatarecordingsystem')">
-          {{$t('eventdatarecordingsystem')}}
+          &nbsp;&nbsp;{{$t('eventdatarecordingsystem')}}
         </span>
       </div>
       <div style='width: 300px'>
@@ -212,7 +212,7 @@
       <div style='width: 300px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('ParameterName')}}</span>
         <span v-for='(item,index) in dataSource' class='content-text'>
-          {{item.ParameterName}}
+          &nbsp;&nbsp;{{item.ParameterName}}
         </span><br>
       </div>
       <div style='width: 700px'>
@@ -295,7 +295,7 @@ export default {
       radioList:9,
       url: {
         exportData: '/ota/otaBaCxJsfzbacs/exportData',
-        importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入
+        importZipUrl: '/ota/otaBaCxJsfzbacs/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
       dataSource: [
         {

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

@@ -63,7 +63,7 @@ import ImportFile from '@/components/ImportFileData/index'
       return {
         url: {
           exportData: '/ota/otaBaCxAqcs/exportData',
-          importZipUrl: '/ota/otaBaCxAqcs/importData',//导入
+          importZipUrl: '/ota/otaBaCxAqcs/importData?otaId=' + localStorage.getItem('otaId'),//导入
         },
         dataSource: [
           {
@@ -202,8 +202,10 @@ import ImportFile from '@/components/ImportFileData/index'
           // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs)
           this.dataSource[2].info= res.result.sjsbcs
           this.dataSource[3].info= res.result.xxaqjz
+           if(res.result.zmclList){
+             console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile'))
+           }
            this.fileList.uploadName = res.result.zmclList
-           this.fileList.certifyingmaterials = this.$t('viewFile')
            this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
            this.$forceUpdate()
            this.loading = false

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

@@ -46,7 +46,7 @@ export default {
     return {
       url: {
         exportData: '/ota/otaBaCxZxsjyq/exportData',
-        importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入
+        importZipUrl: '/ota/otaBaCxZxsjyq/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
       dataSource: [
         {
@@ -221,12 +221,10 @@ export default {
           this.dataSource[7].relevantverification=Number(res.result.sjsbaq)
           this.dataSource[8].relevantverification=Number(res.result.sjgg)
           this.dataSource[9].relevantverification=Number(res.result.sjzt)
+          if(res.result.zmclList){
+            console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile'))
+          }
           this.fileList.uploadName = res.result.zmclList
-          this.$nextTick(() => {
-            this.fileList.certifyingmaterials = this.$t('viewFile')
-          })
-          this.fileList.certifyingmaterials = this.$t('viewFile')
-          console.log(this.fileList)
           this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
           this.$forceUpdate()
         })

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

@@ -120,7 +120,7 @@ import uploadFileOta from '@/components/uploadFileOta/file'
       return {
         url: {
           exportData: '/ota/otaBaCxKsjxtmccs/exportData',
-          importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入
+          importZipUrl: '/ota/otaBaCxKsjxtmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入
         },
         fileList:'',
         dataSource: [

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

@@ -53,7 +53,7 @@
         class="table"
         :columns="columnshistory"
         :pagination="false"
-        :scroll="{x: '100%', y: 400}"
+        :scroll="{x: '100%', y: 'calc(100vh - 330px)'}"
         :data-source="dataSourcehistory"
         :loading="loading"
       >

jero-web/src/views/processCenter/components/circulationHistory.vue

@@ -11,7 +11,7 @@
         ref="table"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -47,18 +47,21 @@
             title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
             title: this.$t('result'),
             dataIndex: 'approvalResult',
             align: 'left',
+            ellipsis: true,
             width:200,
             scopedSlots: { customRender: 'approvalResult' }
           },
@@ -66,6 +69,7 @@
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
@@ -73,6 +77,7 @@
             dataIndex: 'createTime',
             align: 'left',
             width:200,
+            ellipsis: true,
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -11,11 +11,11 @@
         :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="reviewResult" slot-scope="text,result">
+        <span slot="reviewResult" :title="text" slot-scope="text,result">
             {{text}}
         </span>
       </a-table>
@@ -49,18 +49,21 @@
             title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'left',
+            ellipsis: true,
             width: 470
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
+            ellipsis: true,
             width: 270
           },
           {
             title: this.$t('result'),
             dataIndex: 'reviewResult',
             align: 'left',
+            ellipsis: true,
             scopedSlots: { customRender: 'reviewResult' },
             width: 270
           },
@@ -68,14 +71,15 @@
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'left',
+            ellipsis: true,
             width: 270
           },
           {
             title: this.$t('operationTime'),
             dataIndex: 'createTime',
             align: 'left',
+            ellipsis: true,
             width: 200,
-            fixed: 'right'
           }
         ],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'

jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue

@@ -88,7 +88,7 @@
             align: 'left',
             ellipsis: true,
             width: 223
-          },
+          }
         ],
         dataList: [],
         content: [],
@@ -96,7 +96,7 @@
         pageNo: 1,
         pageSize: 10,
         total: 0,
-        ids:'',
+        ids: ''
       }
     },
     mounted() {
@@ -165,19 +165,27 @@
           }).then((res) => {
             if (res.success) {
               this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.success(this.$t('OperationSuccessful'))
+              }
               this.visible = false
               this.selectedRowKeys = []
               this.$emit('referenceDeliverablesListForm')
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
               this.confirmLoading = false
             }
           })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
-      },
+      }
     }
   }
 </script>

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -1379,7 +1379,19 @@
       //引用交付物
       referenceDeliverablesClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+          let isTrue
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
+              isTrue = true
+            }else{
+              isTrue = false
+              this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit'))
+              return
+            }
+          }
+          if (isTrue){
+            this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }

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

@@ -1279,7 +1279,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -1309,7 +1309,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',
@@ -1685,13 +1685,23 @@
           let _this = this
           let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
           let isTrue
+          let content = []
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                isTrue = true
+                content.push(this.dataSource[i])
               }
             }
           }
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].designFlowStatus == 'List to be released' &&
+              content[i].verifyFlowStatus == 'List to be released') {
+              isTrue = false
+
+            } else {
+              isTrue = true
+            }
+          }
           if (isTrue) {
             this.changeInterface(selectedRowKeys)
           }
@@ -2559,7 +2569,7 @@
       },
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
-      },
+      }
     }
   }
 </script>

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

@@ -242,7 +242,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -310,7 +310,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',

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

@@ -30,9 +30,10 @@
     <div style="width: 100%">
       <a-table
         ref="table"
+        size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -104,7 +105,7 @@
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
-            width: 200,
+            width: 120,
             ellipsis: true
           },
           {
@@ -128,7 +129,7 @@
             title: this.$t('resultofhandling'),
             dataIndex: 'operatorResultName',
             align: 'left',
-            width: 200,
+            width: 160,
             ellipsis: true,
           },
           {
@@ -246,6 +247,7 @@
 </script>
 
 <style scoped lang="less">
+  @import '~@assets/less/common.less';
   .box {
     padding: 0 0 24px 0;
     box-sizing: border-box;

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

@@ -78,7 +78,7 @@
             dataIndex: 'projectName',
             ellipsis: true,
             scopedSlots: { customRender: 'RelatedItems' },
-            width: 110
+            width: 150
           },
           {
             title: this.$t('standardInformation'),
@@ -121,7 +121,7 @@
             align: 'left',
             dataIndex: 'endTime',
             ellipsis: true,
-            width: 110,
+            width: 160,
             scopedSlots: { customRender: 'endTime' }
           },
           // {
@@ -136,7 +136,7 @@
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 80,
+            width: 120,
             scopedSlots: { customRender: 'operation' }
           }
         ],
@@ -297,7 +297,7 @@
             isDisplay: true,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -367,7 +367,7 @@
             flowType: 4,
             isDisplay: true,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',

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

@@ -35,7 +35,9 @@
       </div>
 
 
-      <div class="drawer-review" v-if="this.queryData.isDisplay">
+      <div :class="{'drawer-review':isDrawerClass,
+                    'drawer-review-One':!isDrawerClass}"
+           v-if="this.queryData.isDisplay">
         <reviewedByThePersonInCharge
           v-if="isDisplay"
           ref="reviewedByThePersonInChargeRef"
@@ -135,6 +137,12 @@
           return false
         }
         return true
+      },
+      isDrawerClass() {
+        if (this.queryData.TaskKey == 'dezrrtjjfw' || this.queryData.TaskKey == 'zrrtjjfw') {
+          return true
+        }
+        return false
       }
     },
     mounted() {
@@ -178,7 +186,6 @@
         })
       },
       getList(row, title) {
-        console.log(row)
         this.queryData = row
         this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay)
         this.loading = true
@@ -298,7 +305,17 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
-
+  .drawer-review-One{
+    position: absolute;
+    bottom: 40px;
+    z-index: 1001;
+    height: 334px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
   .circulationHistory {
     margin-bottom: 436px;
   }

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

@@ -237,7 +237,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -304,7 +304,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',

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

@@ -27,7 +27,7 @@
               <a-radio value="Rejected" v-if="query.TaskKey == 'zrrqr'">
                 {{$t('refuse')}}
               </a-radio>
-              <a-radio value="Adopt" v-if="query.TaskKey == 'fggcssh'">
+              <a-radio value="Adopt" :disabled="isAdopt" v-if="query.TaskKey == 'fggcssh'">
                 {{$t('adopt')}}
               </a-radio>
               <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr' || query.TaskKey == 'dezrrtjjfw' ||
@@ -116,6 +116,7 @@
           'NA': this.$t('notInvolved'),
           'No rating': this.$t('toBeConfirmed')
         },
+        isAdopt: false,
         isTrue: false,
         rules: {
           disposeResult: [
@@ -162,26 +163,12 @@
     mounted() {
       this.formInline.approvalOpinion = ''
       this.formInline = { ...this.formInline }
-      // this.query.isDisplay = JSON.parse(this.query.isDisplay)
       this.query.isDisplay = true
-      if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
-        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.PersonChargeFeedback = this.$route.query.PersonChargeFeedback
-        this.formInline = { ...this.formInline }
-      }
-      if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') {
-        this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
-        this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
-        this.formInline.fileId = this.queryPersonInCharge.fileId
-        this.formInline = { ...this.formInline }
-      }
-      if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') {
-        if (!this.$route.query.isDisplay) {
-          this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-          this.formInline.approvalOpinion = this.$route.query.PersonChargeFeedback
-          this.formInline = { ...this.formInline }
-        }
+      this.isAdopt = false
+      if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') {
+        this.isAdopt = true
       }
+      console.log(this.isAdopt)
     },
     methods: {
       submit(callBack) {
@@ -201,9 +188,9 @@
       },
       //转办接口
       SelectedByForm(userIds) {
-        if (this.query.TaskKey == 'zrrtjjfw'){
+        if (this.query.TaskKey == 'zrrtjjfw') {
           this.formInline.dezrrSubmitUserId = userIds
-        }else{
+        } else {
           this.formInline.secondChargePersonUserId = userIds
         }
         this.$refs.SelectedByRef.visible = false