修改禅道已知bug

2022-07-08 09:51:46 +08:00
parent cf304b6a5f
commit 1dd6af1a34
4 changed files with 147 additions and 98 deletions
@@ -1092,4 +1092,7 @@ module.exports = {
  pleaseSelectStandard:'Please select a standard',
  theResponsiblePersonEmpty:'The responsible person of cannot be empty',
  theDeadlineEmpty:'The deadline of cannot be empty',
+  theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty',
+  For:'For',
+  markedRejection:'Marked rejection',
 }
@@ -1096,4 +1096,7 @@ module.exports = {
  pleaseSelectStandard:'请选择标准',
  theResponsiblePersonEmpty:'的责任人不能为空',
  theDeadlineEmpty:'的截止时间不能为空',
+  theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空',
+  For:'针对于',
+  markedRejection:'标注的驳回意见',
 }
@@ -20,7 +20,7 @@
      </div>
      <div class="comment-box" v-if="dataList && dataList.length > 0">
        <div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
-          <div class="title-text">{{$t('record')+(index + 1)}}</div>
+<!--          <div class="title-text">{{$t('record')+(index + 1)}}</div>-->
          <div class="box-content">
            <div class="img-box">
              <img src="../../../assets/daiban.png" class="img" alt="">
@@ -30,9 +30,9 @@
                <span>{{ $t('areaOfResponsibility') }}</span>
              </div>
              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                          :type="'select'"
-                          :triggerChange="false" :dictCode="'duty_territory'"/>
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
            </div>
          </a-col>
          <a-col :md="6" :sm="8">
@@ -226,7 +226,7 @@
                 {{text}}
              </span>
        </span>
-<!--        @click="standardClick(record)"-->
+        <!--        @click="standardClick(record)"-->
        <span slot="standard" slot-scope="text,record" :title="text">
              <a class="textName">
                 {{text}}
@@ -435,7 +435,7 @@

  export default {
    name: 'listOfRegulations',
-    props:['areaOfResponsibilityList'],
+    props: ['areaOfResponsibilityList'],
    components: {
      ImportFile,
      listAddModel,
@@ -884,51 +884,51 @@
            value: 'engineeringInterfacePerson',
            valueName: 'engineeringInterfacePersonName',
            text: this.$t('engineeringInterfacePerson')
-          },
+          }
        ],
-        listOptions:[
+        listOptions: [
          {
-            value:'Not started',
-            key:'Not started',
-            label:this.$t('notLaunch'),
+            value: 'Not started',
+            key: 'Not started',
+            label: this.$t('notLaunch')
          },
          {
-            value:'List to confirm',
-            key:'List to confirm',
-            label:this.$t('toBeConfirmed'),
+            value: 'List to confirm',
+            key: 'List to confirm',
+            label: this.$t('toBeConfirmed')
          },
          {
-            value:'Accepted',
-            key:'Accepted',
-            label:this.$t('accept'),
+            value: 'Accepted',
+            key: 'Accepted',
+            label: this.$t('accept')
          },
          {
-            value:'Rejected',
-            key:'Rejected',
-            label:this.$t('refuse'),
-          },
+            value: 'Rejected',
+            key: 'Rejected',
+            label: this.$t('refuse')
+          }
        ],
-        taskOptions:[
+        taskOptions: [
          {
-            value:'Not started',
-            key:'Not started',
-            label:this.$t('notLaunch'),
+            value: 'Not started',
+            key: 'Not started',
+            label: this.$t('notLaunch')
          },
          {
-            value:'List to confirm',
-            key:'List to confirm',
-            label:this.$t('toBeConfirmed'),
+            value: 'List to confirm',
+            key: 'List to confirm',
+            label: this.$t('toBeConfirmed')
          },
          {
-            value:'Accepted',
-            key:'Accepted',
-            label:this.$t('accept'),
+            value: 'Accepted',
+            key: 'Accepted',
+            label: this.$t('accept')
          },
          {
-            value:'Rejected',
-            key:'Rejected',
-            label:this.$t('refuse'),
-          },
+            value: 'Rejected',
+            key: 'Rejected',
+            label: this.$t('refuse')
+          }
        ],
        visibleRoleSwitching: false,
        confirmLoadingRoleSwitching: false,
@@ -945,8 +945,8 @@
        },
        detailedSuccessList: [],
        detailedWarningList: [],
-        rowKeysSuccessList:[],
-        rowKeysWarningList:[],
+        rowKeysSuccessList: [],
+        rowKeysWarningList: []
      }
    },

@@ -1411,25 +1411,49 @@
          for (let i = 0; i < dataSource.length; i++) {
            if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
              if (dataSource[i].homologationEngineerId && 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].prehomoDeliverableType){
-                  if (!dataSource[i].prehomoInitiatorId){
-                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                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].verifyDeliverableType){
-                  if (!dataSource[i].verifyInitiatorId){
-                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                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
                  }
                }
-                 this.detailedSuccessList.push(dataSource[i])
+                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>)
@@ -1438,7 +1462,7 @@
                // return
              }
            } else {
-              this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
+              this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
              // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
              // isTrue = false
              // return
@@ -1658,7 +1682,7 @@
        })
      },

-      getRowKeys(value,num, callBack) {
+      getRowKeys(value, num, callBack) {
        let isTrue = true
        let dataSource = []
        for (let i = 0; i < this.dataSource.length; i++) {
@@ -1694,49 +1718,58 @@
              // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
              // return
            }
-            if(num == 1){
-              if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
+            if (num == 1) {
+              if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
                && dataSource[i].designInitiatorId == this.userInfo().id) ||
                (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].designInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].designDutyId && !dataSource[i].designDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  && dataSource[i].designInitiatorId == this.userInfo().id)) {
+                if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                  continue
-                }else if(!dataSource[i].designDutyId){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                } else if (!dataSource[i].designDutyId) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
                  continue
-                }else if(!dataSource[i].designDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
+                } else if (!dataSource[i].designDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].designDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                  continue
                }
              }
-              if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
+              if ((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
                && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
                (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].prehomoInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  && dataSource[i].prehomoInitiatorId == this.userInfo().id)) {
+                if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                  continue
-                }else if(!dataSource[i].prehomoDutyId){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                } else if (!dataSource[i].prehomoDutyId) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
                  continue
-                }else if(!dataSource[i].prehomoDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                } else if (!dataSource[i].prehomoDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].prehomoDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                  continue
                }
              }
-              if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
+              if ((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
                && dataSource[i].verifyInitiatorId == this.userInfo().id) ||
                (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].verifyInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  && dataSource[i].verifyInitiatorId == this.userInfo().id)) {
+                if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                  continue
-                }else if(!dataSource[i].verifyDutyId){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                } else if (!dataSource[i].verifyDutyId) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
                  continue
-                }else if(!dataSource[i].verifyDueDate){
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                } else if (!dataSource[i].verifyDueDate) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].verifyDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                  continue
                }
              }
@@ -1752,7 +1785,7 @@

        if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
          callBack && callBack()
-        }else{
+        } else {
          let that = this
          this.$warning({
            content: (
@@ -1768,19 +1801,19 @@
        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 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,
@@ -1799,7 +1832,7 @@
            _this.$message.warning(_this.$t('operationFailed'))
            _this.confirmLoading = false
          }
-          if(this.rowKeysWarningList && this.rowKeysWarningList.length > 0){
+          if (this.rowKeysWarningList && this.rowKeysWarningList.length > 0) {
            let that = this
            this.$warning({
              content: (
@@ -1822,13 +1855,17 @@
            onOk() {
              if (num == 0) {
                let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                _this.getRowKeys(selectedRowKeys, 1,function() {
+                _this.getRowKeys(selectedRowKeys, 1, function() {
                  _this.updateStatusBatch(num, selectedRowKeys)
                })
              } else {
                let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                _this.getRowKeys(selectedRowKeys, 2,function() {
+                _this.getRowKeys(selectedRowKeys, 2, function() {
                  _this.visibleComment = true
+                  _this.formInlineComment = {}
+                  _this.$nextTick(()=>{
+                    _this.$refs.ruleFormComment.clearValidate()
+                  })
                })
              }
            }
@@ -1841,8 +1878,14 @@
        this.$refs.ruleFormComment.validate(valid => {
          if (valid) {
            let url = '/project/projectCommentEO/add'
+            let content = []
+            if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
+              this.rowKeysSuccessList.forEach(res => {
+                content.push(res.serialNumber)
+              })
+            }
            let query = {
-              commentContent: this.formInlineComment.commentContent,
+              commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+'：' + this.formInlineComment.commentContent,
              projectLibraryId: this.$route.query.id
            }
            this.confirmLoadingComment = true
@@ -1967,15 +2010,15 @@
          }
        }
      },
-      standardClick(row){
+      standardClick(row) {
        let newUrl = this.$router.resolve({
          path: '/docManage/library/detail',
          query: {
-            id:row.id
+            id: row.id
          }
        })
        window.open(newUrl.href, '_blank')
-      },
+      }
    }
  }
 </script>