修改法规清单

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

@@ -1108,8 +1108,9 @@ module.exports = {
   requiredParametersEmpty: 'Required parameters cannot be empty',
   PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
   theProjectContactEmpty: 'The project contact person of cannot be empty',
-  pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected',
+  pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published',
   TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
+  pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List to Be Checked or whose verification compliance confirmation process status is List to Be Checked',
   theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface: 'Assign to Owner',
   theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',

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

@@ -703,7 +703,8 @@ module.exports = {
   listConfirmation: '清单确认',
   ListConfirmationDeadline: '清单确认截止时间',
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
-  pleaseSelectinitiatedOrRejected: '请选择清单确认状态为未发起或拒绝的数据',
+  pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据',
+  pleaseSelectTheDataverificationVerified:'请选择设计符合性确认流程状态为清单待校核或验证符合性确认流程状态为清单待校核的数据',
   TheEngineerAndCertification: '的法规工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
   theProjectContactEmpty: '的工程接口人不能为空',

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

@@ -94,7 +94,6 @@
         </a-row>
       </a-form>
     </div>
-    <!--    v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"-->
     <div class="table-operator"
          style="overflow:hidden;margin-bottom: 20px">
       <div style="float: left;margin-bottom: 0px;margin-left: 20px">
@@ -109,7 +108,8 @@
           {{ $t('bringInRelevantPersonnel') }}
         </div>
         <!--        批量设置-->
-        <div class="operator-text" @click="batSettingClick" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
+        <div class="operator-text" @click="batSettingClick"
+             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
           <a-icon type="setting"/>
           {{ $t('BatchSetting') }}
         </div>
@@ -206,10 +206,6 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
-<!--        <div class="operator-text" @click="initiateTaskConfirmationClick('任务')">-->
-<!--          <a-icon type="file-protect" />-->
-<!--          {{ $t('initiateTaskConfirmation') }}-->
-<!--        </div>-->
       </div>
       <div style="float: right;margin-top: 1px;;margin-right: 20px">
 
@@ -224,7 +220,8 @@
           {{ $t('export') }}
         </div>
         <!--        发布-->
-        <div class="operator-text" @click="initiateListConfirmationcClick('清单')" v-if="this.roleSwitchingCode == '0'">
+        <div class="operator-text" @click="initiateListConfirmationcClick('清单')"
+             v-if="this.roleSwitchingCode == '0'">
           <a-icon type="solution"/>
           {{ $t('release') }}
         </div>
@@ -239,21 +236,16 @@
           {{ $t('initiateTask') }}
         </div>
         <!--        退回-->
-        <div class="operator-text" @click="submitClick(1)" v-if="this.roleSwitchingCode == '1'">
+        <div class="operator-text" @click="sendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
           <a-icon type="close-circle"/>
           {{ $t('sendBack') }}
         </div>
         <!--        催办-->
-        <div class="operator-text" @click="questionClick" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
+        <div class="operator-text" @click="questionClick"
+             v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
           <a-icon type="sound"/>
           {{ $t('question') }}
         </div>
-<!--        <div class="operator-text"-->
-<!--             v-if="roleSwitchingList.length > 1"-->
-<!--             @click="roleSwitchingClick">-->
-<!--          <a-icon type="select" />-->
-<!--          {{ $t('roleSwitching') }}-->
-<!--        </div>-->
       </div>
     </div>
     <div style="width: 100%">
@@ -313,44 +305,6 @@
                  {{ text }}
               </a>
         </span>
-        <span slot="designDeliverableTemplateName" slot-scope="text,record">
-          <span :title="record.designDeliverableTypeName">{{ record.designDeliverableTypeName }}</span><br
-          v-if="record.designDeliverableTypeName">
-          <!--           <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"-->
-          <!--              :title="record.designDeliverableTemplateName"-->
-          <!--              @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">-->
-          <!--             {{ record.designDeliverableTemplateName.length > 10 ? record.designDeliverableTemplateName.slice(0, 9) + '...' :record.designDeliverableTemplateName}}-->
-          <!--           </a>-->
-          <!--           <a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length > 1"-->
-          <!--              @click="clickButtonToUpload(record.designDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
-           <span v-else>--</span>
-        </span>
-
-        <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
-           <span :title="record.prehomoDeliverableTypeName">{{ record.prehomoDeliverableTypeName }}</span><br
-          v-if="record.prehomoDeliverableTypeName">
-          <!--             <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"-->
-          <!--                :title="record.prehomoDeliverableTemplateName"-->
-          <!--                @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">-->
-          <!--           {{ record.prehomoDeliverableTemplateName.length > 10 ? record.prehomoDeliverableTemplateName.slice(0, 9) + '...' :record.prehomoDeliverableTemplateName}}-->
-          <!--             </a>-->
-          <!--             <a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length > 1"-->
-          <!--                @click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
-           <span v-else>--</span>
-        </span>
-
-        <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
-          <span :title="record.verifyDeliverableTypeName">{{ record.verifyDeliverableTypeName }}</span><br
-          v-if="record.verifyDeliverableTypeName">
-          <!--           <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"-->
-          <!--              :title="record.verifyDeliverableTemplateName"-->
-          <!--              @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">-->
-          <!--           {{ record.verifyDeliverableTemplateName.length > 10 ? record.verifyDeliverableTemplateName.slice(0, 9) + '...' :record.verifyDeliverableTemplateName}}-->
-          <!--           </a>-->
-          <!--           <a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length > 1"-->
-          <!--              @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
-           <span v-else>--</span>
-        </span>
       </a-table>
       <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
         {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
@@ -743,7 +697,7 @@ export default {
                 align: 'left',
                 ellipsis: true,
                 width: 140
-            },
+              }
               // {
               //   title: this.$t('descriptionDeliverables'),
               //   dataIndex: 'designRemark',
@@ -832,7 +786,7 @@ export default {
                 align: 'left',
                 ellipsis: true,
                 width: 180
-            },
+              }
               // {
               //   title: this.$t('descriptionDeliverables'),
               //   dataIndex: 'verifyRemark',
@@ -960,105 +914,6 @@ export default {
             key: 3,
             moduleFlag: '法规清单'
           },
-        // {
-        //   sort: '',
-        //   name: this.$t('listConfirmationStatus'),
-        //   headFieldCn: '清单确认状态',
-        //   headFieldEn: 'List Confirmation Status',
-        //   field: 'inventoryAffirmStatusName',
-        //   key: 4,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('taskAffirmStatus'),
-        //   headFieldCn: '任务确认状态',
-        //   headFieldEn: 'Task Confirmation Status',
-        //   field: 'taskAffirmStatusName',
-        //   key: 5,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('zoneOfApplication'),
-        //   headFieldCn: '适用地区',
-        //   headFieldEn: 'Area',
-        //   field: 'region_dictText',
-        //   key: 6,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('correspondingStandard'),
-        //   headFieldCn: '对应标准',
-        //   headFieldEn: 'Compare EU/CN',
-        //   field: 'correspondingStandard',
-        //   key: 7,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('implementationCategory'),
-        //   headFieldCn: '实施类别',
-        //   headFieldEn: 'Usage',
-        //   field: 'implementType_dictText',
-        //   key: 8,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('ImplementationDate'),
-        //   headFieldCn: '标准实施日期',
-        //   headFieldEn: 'New Type Execution Date',
-        //   field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
-        //   key: 9,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('vehicleInProductionDate'),
-        //   headFieldCn: '在产车实施日期',
-        //   headFieldEn: 'New Vehicle Execution Date',
-        //   field: 'implementTime',
-        //   key: 10,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('certificationType'),
-        //   headFieldCn: '认证类型',
-        //   headFieldEn: 'Certification Type',
-        //   field: 'attestationType_dictText',
-        //   key: 11,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('certificationLevel'),
-        //   headFieldCn: '认证级别',
-        //   headFieldEn: 'Certification Level',
-        //   field: 'attestationRank_dictText',
-        //   key: 12,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('applicableSupplement'),
-        //   headFieldCn: '适用增补件',
-        //   headFieldEn: 'Applicable Supplement',
-        //   field: 'applicableSupplement',
-        //   key: 13,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: 'WVTA ID',
-        //   headFieldCn: 'WVTA ID',
-        //   headFieldEn: 'WVTA ID',
-        //   field: 'wvtaId',
-        //   key: 14,
-        //   moduleFlag: '法规清单'
-        // },
           {
             sort: '',
             name: this.$t('areaOfResponsibility'),
@@ -1077,15 +932,6 @@ export default {
             key: 16,
             moduleFlag: '法规清单'
           },
-        // {
-        //   sort: '',
-        //   name: this.$t('certifiedEngineer'),
-        //   headFieldCn: '认证工程师',
-        //   headFieldEn: 'Homo Engineer',
-        //   field: 'homologationEngineerName',
-        //   key: 17,
-        //   moduleFlag: '法规清单'
-        // },
           {
             sort: '',
             name: this.$t('engineeringInterfacePerson'),
@@ -1095,35 +941,6 @@ export default {
             key: 18,
             moduleFlag: '法规清单'
           },
-        // {
-        //   sort: '',
-        //   name: this.$t('remarks'),
-        //   headFieldCn: '备注',
-        //   headFieldEn: 'Comments',
-        //   field: 'remark',
-        //   key: 19,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Deliverables'),
-        //   headFieldCn: '交付物',
-        //   headFieldEn: 'Deliverables',
-        //   field: 'designDeliverableTemplateName',
-        //   affirmFlag: '1',
-        //   key: 20,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Sponsor'),
-        //   headFieldCn: '发起人',
-        //   headFieldEn: 'Creator',
-        //   field: 'designInitiatorName',
-        //   affirmFlag: '1',
-        //   key: 21,
-        //   moduleFlag: '法规清单'
-        // },
           {
             sort: '',
             name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
@@ -1154,86 +971,6 @@ export default {
             key: 23,
             moduleFlag: '法规清单'
           },
-        // {
-        //   sort: '',
-        //   name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('descriptionDeliverables'),
-        //   headFieldCn: '交付物说明',
-        //   headFieldEn: 'Instruction',
-        //   field: 'designRemark',
-        //   affirmFlag: '1',
-        //   key: 24,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('PrehomoConfirmation') + '/' + this.$t('Deliverables'),
-        //   headFieldCn: '交付物',
-        //   headFieldEn: 'Deliverables',
-        //   field: 'prehomoDeliverableTemplateName',
-        //   affirmFlag: '2',
-        //   key: 25,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('PrehomoConfirmation') + '/' + this.$t('Sponsor'),
-        //   headFieldCn: '发起人',
-        //   headFieldEn: 'Creator',
-        //   field: 'prehomoInitiatorName',
-        //   affirmFlag: '2',
-        //   key: 26,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('PrehomoConfirmation') + '/' + this.$t('personLiable'),
-        //   headFieldCn: '责任人',
-        //   headFieldEn: 'Assignee',
-        //   field: 'prehomoDutyName',
-        //   affirmFlag: '2',
-        //   key: 27,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('PrehomoConfirmation') + '/' + this.$t('TaskCutOffTime'),
-        //   headFieldCn: '截止时间',
-        //   headFieldEn: 'Due Date',
-        //   field: 'prehomoDueDate',
-        //   affirmFlag: '2',
-        //   key: 28,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('PrehomoConfirmation') + '/' + this.$t('descriptionDeliverables'),
-        //   headFieldCn: '交付物说明',
-        //   headFieldEn: 'Instruction',
-        //   field: 'prehomoRemark',
-        //   affirmFlag: '2',
-        //   key: 29,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Deliverables'),
-        //   headFieldCn: '交付物',
-        //   headFieldEn: 'Deliverables',
-        //   field: 'verifyDeliverableTemplateName',
-        //   affirmFlag: '3',
-        //   key: 30,
-        //   moduleFlag: '法规清单'
-        // },
-        // {
-        //   sort: '',
-        //   name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Sponsor'),
-        //   headFieldCn: '发起人',
-        //   headFieldEn: 'Creator',
-        //   field: 'verifyInitiatorName',
-        //   affirmFlag: '3',
-        //   key: 31,
-        //   moduleFlag: '法规清单'
-        // },
           {
             sort: '',
             name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
@@ -1264,16 +1001,6 @@ export default {
             key: 34,
             moduleFlag: '法规清单'
           },
-        // {
-        //   sort: '',
-        //   name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('descriptionDeliverables'),
-        //   headFieldCn: '交付物说明',
-        //   headFieldEn: 'Instruction',
-        //   field: 'verifyRemark',
-        //   affirmFlag: '3',
-        //   key: 34,
-        //   moduleFlag: '法规清单'
-        // },
           {
             sort: '',
             disabled: true,
@@ -1456,10 +1183,8 @@ export default {
     },
 
     mounted() {
-    // if (this.$route.query.studioEngineer == this.userInfo().id) {
       this.JLoading = true
       this.getHeader()
-    // this.getAndUserId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1467,10 +1192,6 @@ export default {
         this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
         this.queryParam = { ...this.queryParam }
       }
-    // } else {
-    //   this.isDisplay = false
-    // }
-
     },
     computed: {
       columnsFile() {
@@ -1520,17 +1241,6 @@ export default {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
       viewClick(row) {
-      // let roleCodeIndex
-      // if (this.isDisplay) {
-      //   roleCodeIndex = 0
-      // } else {
-      //   roleCodeIndex = 4
-      // }
-      // if (this.roleSwitchingCode == '11' ||
-      //   this.roleSwitchingCode == '12' ||
-      //   this.roleSwitchingCode == '13') {
-      //   roleCodeIndex = 0
-      // }
         row.roleCodeIndex = this.roleSwitchingCode
         this.$refs.listOfRegulationsViewRef.editModel(JSON.parse(JSON.stringify(row)))
       },
@@ -1554,7 +1264,7 @@ export default {
         let query = {
           projectLibraryId: this.$route.query.id,
           userId: this.userInfo().id,
-        modelType:"Laws inventory"
+          modelType: 'Laws inventory'
         }
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
@@ -1568,16 +1278,6 @@ export default {
             } else {
               this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
             }
-          // this.isRoleSwitching = true
-          // if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
-          //   this.isDisplay = true
-          // } else {
-          //   this.isDisplay = false
-          //   if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
-          //     this.formInlineRoleSwitching.roleSwitchingCode == '' || this.formInlineRoleSwitching.roleSwitchingCode == '13') {
-          //     this.isRoleSwitching = false
-          //   }
-          // }
             this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
             this.$emit('getRoleSwitch', this.formInlineRoleSwitching.roleSwitchingCode)
             this.getList()
@@ -1600,16 +1300,6 @@ export default {
       },
       handleExport() {
         let roleCodeIndex = this.roleSwitchingCode
-      // if (this.isDisplay) {
-      //   roleCodeIndex = 0
-      // } else {
-      //   roleCodeIndex = 4
-      // }
-      // if (this.roleSwitchingCode == '11' ||
-      //   this.roleSwitchingCode == '12' ||
-      //   this.roleSwitchingCode == '13') {
-      //   roleCodeIndex = 0
-      // }
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
           ...this.queryParam,
@@ -1702,45 +1392,66 @@ export default {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           let isTrue
+          let contentList = []
+          let detailedWarningList = []
+          let idList = []
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-              if (this.dataSource[i].taskAffirmStatus == 'List to confirm' ||
+                contentList.push(this.dataSource[i])
-                this.dataSource[i].inventoryAffirmStatus == 'List to confirm') {
+              }
-                isTrue = true
+            }
+          }
+          for (let i = 0; i < contentList.length; i++) {
+            if (contentList[i].verifyFlowStatus == 'List to be checked' ||
+              contentList[i].designFlowStatus == 'List to be checked') {
+              idList.push(contentList[i].id)
             } else {
-                isTrue = false
+              detailedWarningList.push(
-                this.$message.warning(this.$t('statusthetasistobeconfirmed'))
+              < div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
-                return
             }
           }
-          }
+
-        }
+          if (idList && idList.length > 0) {
-        if (isTrue) {
             let _this = this
             this.$confirm({
               content: _this.$t('confirmWithdraw'),
               onOk() {
                 let query = {
-                ids: selectedRowKeys.join(','),
+                  ids: idList.join(','),
                   projectLibraryId: _this.$route.query.id
                 }
-              postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {
+                postAction('/project/projectLawsInventoryEO/studioWithdrew', query).then((res) => {
                   if (res.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
                     _this.getList()
+                    if (detailedWarningList && detailedWarningList.length > 0) {
+                      this.promptInformation(detailedWarningList)
+                    }
                   } else {
                     _this.$message.warning(_this.$t('operationFailed'))
                   }
                 })
               }
             })
+          } else {
+            this.promptInformation(detailedWarningList)
           }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      promptInformation(detailedWarningList) {
+        let that = this
+        this.$warning({
+          content: (
+            < div >
+            { detailedWarningList }
+            < /div>
+        )
+      })
+      },
       questionClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -1864,22 +1575,11 @@ export default {
               roleCode: this.formInlineRoleSwitching.roleSwitchingCode,
               id: this.AndUserId,
               projectLibraryId: this.$route.query.id,
-            modelType:"Laws inventory",
+              modelType: 'Laws inventory'
             }
             this.confirmLoadingRoleSwitching = true
             postAction(this.url.AndUserIdEdit, query).then((res) => {
               if (res.success) {
-              // this.isRoleSwitching = true
-              // if (this.formInlineRoleSwitching.roleSwitchingCode == '0') {
-              //   this.isDisplay = true
-              // } else {
-              //   this.isDisplay = false
-              //   if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
-              //     this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
-              //     this.formInlineRoleSwitching.roleSwitchingCode == '13') {
-              //     this.isRoleSwitching = false
-              //   }
-              // }
                 this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.visibleRoleSwitching = false
@@ -1954,17 +1654,6 @@ export default {
         }
       },
       edit(item) {
-      // let roleCodeIndex
-      // if (this.isDisplay) {
-      //   roleCodeIndex = 0
-      // } else {
-      //   roleCodeIndex = 4
-      // }
-      // if (this.roleSwitchingCode == '11' ||
-      //   this.roleSwitchingCode == '12' ||
-      //   this.roleSwitchingCode == '13') {
-      //   roleCodeIndex = 0
-      // }
         item.roleCodeIndex = this.roleSwitchingCode
         this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
@@ -2111,16 +1800,6 @@ export default {
       },
       getList() {
         let roleCode = this.roleSwitchingCode
-      // if (this.isDisplay) {
-      //   roleCode = 0
-      // } else {
-      //   roleCode = 4
-      // }
-      // if (this.roleSwitchingCode == '11' || this.roleSwitchingCode == '12') {
-      //   roleCode = 0
-      // } else if (this.roleSwitchingCode == '13') {
-      //   roleCode = 13
-      // }
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -2227,7 +1906,6 @@ export default {
         this.timeName = name
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        let isTrue = true
           this.detailedSuccessList = []
           this.detailedWarningList = []
           let dataSource = []
@@ -2239,74 +1917,16 @@ export default {
             }
           }
           for (let i = 0; i < dataSource.length; i++) {
-          if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
+            if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') {
               if (dataSource[i].regulationOwnerId) {
-              if (dataSource[i].designDeliverableType) {
-                // if (!dataSource[i].designInitiatorId) {
-                //   this.detailedWarningList.push(
-                //     < div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
-                //   continue
-                // }
-                if (!dataSource[i].designDutyId) {
-                  this.detailedWarningList.push(
-                    < div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
-                  continue
-                }
-                if (!dataSource[i].designDueDate) {
-                  this.detailedWarningList.push(
-                    < div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
-                  continue
-                }
-              }
-              // if (dataSource[i].prehomoDeliverableType) {
-              //   if (!dataSource[i].prehomoInitiatorId) {
-              //     this.detailedWarningList.push(
-              //       < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
-              //     continue
-              //   }
-              //   if (!dataSource[i].prehomoDutyId) {
-              //     this.detailedWarningList.push(
-              //       < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
-              //     continue
-              //   }
-              //   if (!dataSource[i].prehomoDueDate) {
-              //     this.detailedWarningList.push(
-              //       < div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
-              //     continue
-              //   }
-              // }
-              if (dataSource[i].verifyDeliverableType) {
-                // if (!dataSource[i].verifyInitiatorId) {
-                //   this.detailedWarningList.push(
-                //     < div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
-                //   continue
-                // }
-                if (!dataSource[i].verifyDutyId) {
-                  this.detailedWarningList.push(
-                    < div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
-                  continue
-                }
-                if (!dataSource[i].verifyDueDate) {
-                  this.detailedWarningList.push(
-                    < div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
-                  continue
-                }
-              }
                 this.detailedSuccessList.push(dataSource[i])
-
               } else {
                 this.detailedWarningList.push(
                 < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
-              // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
-              // isTrue = false
-              // return
               }
             } else {
               this.detailedWarningList.push(
               < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
-            // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
-            // isTrue = false
-            // return
             }
           }
           if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
@@ -2457,21 +2077,6 @@ export default {
                 this.detailedWarningList = []
               })
             } else {
-            // for (let i = 0; i < this.TaskSuccessList.length; i++) {
-            //   ((i) => {
-            //     this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
-            //     Object.keys(this.TaskSuccessList[i]).forEach(res => {
-            //       if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
-            //         this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
-            //         this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
-            //       }
-            //     })
-            //     setTimeout(() => {
-            //       this.confirmLoading = true
-            //       this.startProcess(this.TaskSuccessList[i], (i + 1))
-            //     }, 500)
-            //   })(i)
-            // }
               let TaskSuccessList = JSON.parse(JSON.stringify(this.TaskSuccessList))
               for (let i = 0; i < TaskSuccessList.length; i++) {
                 TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
@@ -2579,23 +2184,14 @@ export default {
 
               this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
               continue
-            // isTrue = false
-            // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
-            // return
             } else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) {
 
               this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
               continue
-            // isTrue = false
-            // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
-            // return
             } else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) {
 
               this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
               continue
-            // isTrue = false
-            // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
-            // return
             }
             if (num == 1) {
               if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
@@ -2668,9 +2264,6 @@ export default {
             this.rowKeysSuccessList.push(dataSource[i])
           } else {
             this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>)
-          // isTrue = false
-          // this.$message.warning(dataSource[i].serialNumber+ this.$t('incorrectsubmitted'))
-          // return
           }
         }
 
@@ -2688,79 +2281,38 @@ export default {
         }
       },
 
-    updateStatusBatch(num, selectedRowKeys) {
+      sendBackClick() {
-      let _this = this
-      let lawsInventoryList = []
-      for (let i = 0; i < this.rowKeysSuccessList.length; i++) {
-        let roleCode
-        if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id &&
-          this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
-          roleCode = 4
-        } else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) {
-          roleCode = 1
-        } else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
-          roleCode = 2
-        }
-        lawsInventoryList.push({
-          id: this.rowKeysSuccessList[i].id,
-          roleCode: roleCode
-        })
-      }
-      let query = {
-        operatorType: 1,
-        lawsInventoryList: lawsInventoryList,
-        projectLibraryId: _this.$route.query.id,
-        operatorResult: num
-      }
-      postAction(_this.url.updateStatusBatch, query).then((res) => {
-        if (res.success) {
-          _this.$message.success(_this.$t('OperationSuccessful'))
-          _this.visible = false
-          this.selectedRowKeys = []
-          _this.confirmLoading = false
-          _this.getList()
-        } else {
-          _this.$message.warning(_this.$t('operationFailed'))
-          _this.confirmLoading = false
-        }
-        if (this.rowKeysWarningList && this.rowKeysWarningList.length > 0) {
-          let that = this
-          this.$warning({
-            content: (
-              < div>
-                {that.rowKeysWarningList}
-              < /div>
-            )
-          })
-        }
-        this.rowKeysWarningList = []
-        this.rowKeysSuccessList = []
-      })
-    },
-
-    submitClick(num) {
-      let _this = this
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        this.$confirm({
+          this.detailedWarningList = []
-          content: num == 0 ? _this.$t('confirmLaunchTask') : _this.$t('confirmreturn'),
+          let dataSource = []
-          onOk() {
+          let idList = []
-            if (num == 0) {
+          this.rowKeysSuccessList = []
-              let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+          for (let i = 0; i < this.dataSource.length; i++) {
-              _this.getRowKeys(selectedRowKeys, 1, function() {
+            for (let j = 0; j < this.selectedRowKeys.length; j++) {
-                _this.updateStatusBatch(num, selectedRowKeys)
+              if (this.dataSource[i].id == this.selectedRowKeys[j]) {
+                dataSource.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].verifyFlowStatus == 'List to be checked' ||
+              dataSource[i].designFlowStatus == 'List to be checked') {
+              idList.push(dataSource[i].id)
+              this.rowKeysSuccessList.push(dataSource[i])
+            } else {
+              this.detailedWarningList.push(
+              < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
+            }
+          }
+          if (idList && idList.length > 0) {
+            this.visibleComment = true
+            this.formInlineComment = {}
+            this.$nextTick(() => {
+              this.$refs.ruleFormComment.clearValidate()
             })
           } else {
-              let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+            this.promptInformation(this.detailedWarningList)
-              _this.getRowKeys(selectedRowKeys, 2, function() {
-                _this.visibleComment = true
-                _this.formInlineComment = {}
-                _this.$nextTick(() => {
-                  _this.$refs.ruleFormComment.clearValidate()
-                })
-              })
           }
-          }
-        })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -2768,7 +2320,6 @@ export default {
       handleOkComment() {
         this.$refs.ruleFormComment.validate(valid => {
           if (valid) {
-          let url = '/project/projectCommentEO/add'
             let content = []
             let ids = []
             if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
@@ -2777,25 +2328,43 @@ export default {
                 ids.push(res.id)
               })
             }
-          let query = {
-            commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
-            projectLibraryId: this.$route.query.id
-          }
             this.rejectCauseAdd(this.formInlineComment.commentContent, ids)
             this.confirmLoadingComment = true
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+            this.projectCommentAdd(content, this.formInlineComment.commentContent)
-          this.updateStatusBatch(1, selectedRowKeys)
+            let query = {
-          postAction(url, query).then((res) => {
+              projectLibraryId: this.$route.query.id,
+              ids: ids.join(',')
+            }
+            postAction('/project/projectLawsInventoryEO/regulationOwnerReturned', query).then((res) => {
               if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.selectedRowKeys = []
+                this.confirmLoading = false
                 this.visibleComment = false
                 this.confirmLoadingComment = false
+                this.rowKeysSuccessList = []
+                this.getList()
+                if (this.detailedWarningList && this.detailedWarningList.length > 0) {
+                  this.promptInformation(this.detailedWarningList)
+                  this.detailedWarningList = []
+                }
               } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
                 this.confirmLoadingComment = false
               }
             })
           }
         })
       },
+      projectCommentAdd(content, commentContent) {
+        let query = {
+          commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + commentContent,
+          projectLibraryId: this.$route.query.id
+        }
+        postAction('/project/projectCommentEO/add', query).then((res) => {
+        })
+      },
       rejectCauseAdd(rejectCause, ids) {
         let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let query = {
@@ -3297,6 +2866,7 @@ popconfirmmize {
   .second {
     padding: 0 !important;
   }
+
   //.tableList .ant-table-tbody > tr > td{
   //  color: #040B29 ;
   //}