修改禅道已知bug

2022-06-30 14:23:52 +08:00
parent db79b808f1
commit eb8f25832b
7 changed files with 162 additions and 56 deletions
@@ -5,7 +5,8 @@
        {{$t('basicInformationOfParameters')}}
      </div>
      <div class="header-tight">
-        <a-button v-has="'projectLibraryBase:edit'" class="box-button" style="line-height: 32px" @click="edit">
+        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id" class="box-button"
+                  style="line-height: 32px" @click="edit">
          {{$t('edit')}}
        </a-button>
      </div>
@@ -92,7 +93,8 @@
        {{$t('regulatoryCertificationTaskPlan')}}
      </div>
      <div class="header-tight">
-        <a-button class="box-button" v-has="'projectTaskPlanning:queryByProjectId'" style="line-height: 32px"
+        <a-button class="box-button" v-if="this.$route.query.studioEngineer == this.userInfo().id"
+                  style="line-height: 32px"
                  @click="settingClick">{{$t('setting')}}
        </a-button>
      </div>
@@ -139,6 +141,7 @@
  import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts'
  import deliverableStatusEchart from './deliverableStatusEchart'
  import certificationProgressEchart from './certificationProgressEchart'
+  import { mapGetters } from 'vuex'

  export default {
    name: 'ProjectDetails',
@@ -171,6 +174,7 @@
      this.getSetting()
    },
    methods: {
+      ...mapGetters(['userInfo']),
      getForm() {
        getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => {
          if (res.success) {
@@ -46,7 +46,9 @@
        </a-row>
      </a-form>
    </div>
-    <div class="table-operator" style="overflow:hidden;">
+    <div class="table-operator"
+         v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"
+         style="overflow:hidden;margin-bottom: 20px">
      <div style="float: left;margin-bottom: 0px;margin-left: 20px" v-if="isDisplay">
        <div class="operator-text" @click="initiateListConfirmationcClick('清单')">
          <a-icon type="solution"/>
@@ -151,7 +153,7 @@
        class="tableList"
        :loading="loading"
        :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 360px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
        rowKey="id"
        :data-source="dataSource"
        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -229,6 +231,7 @@
      @ok="handleOk"
      @cancel="handleCancel"
    >
+      <a-spin :spinning="confirmLoading">
      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
        <a-row :gutter="24">
          <a-col :span="24">
@@ -262,6 +265,7 @@
          </a-col>
        </a-row>
      </a-form-model>
+      </a-spin>
    </a-modal>
    <a-modal
      :title="fileTitle"
@@ -414,9 +418,8 @@
            title: this.$t('subtitle'),
            align: 'center',
            dataIndex: 'subtitle',
-            width: 180,
-            fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
+            ellipsis: true,
+            width: 180
          },
          {
            title: this.$t('listConfirmationStatus'),
@@ -1279,11 +1282,16 @@
          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].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') &&
-                  this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
-                  isTrue = true
+                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
+                  if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
+                    isTrue = true
+                  } else {
+                    this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
+                    isTrue = false
+                    return
+                  }
                } else {
-                  this.$message.warning(this.$t('The') + (i + 1) + this.$t('strip') + ',' + this.$t('dataConfirmation'))
+                  this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
                  isTrue = false
                  return
                }
@@ -1309,40 +1317,46 @@
            for (let j = 0; j < selectedRowKeys.length; j++) {
              if (this.dataSource[i].id == selectedRowKeys[j]) {
                if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') &&
-                  this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
-                  if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
-                    && this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) ||
-                    (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId
-                      && !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) {
-                    isTrue = true
+                  this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
+                  if (this.dataSource[i].engineeringInterfacePerson) {
+                    if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
+                      && this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) ||
+                      (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId
+                        && !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) {
+                      isTrue = true
+                    } else {
+                      isTrue = false
+                      this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
+                      return
+                    }
+                    if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId
+                      && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) ||
+                      (!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId
+                        && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) {
+                      isTrue = true
+                    } else {
+                      isTrue = false
+                      this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
+                      return
+                    }
+                    if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId
+                      && this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) ||
+                      (!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId
+                        && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) {
+                      isTrue = true
+                    } else {
+                      isTrue = false
+                      this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
+                      return
+                    }
                  } else {
                    isTrue = false
-                    this.$message.warning(this.$t('The') + (i + 1) + this.$t('strip') + ',' + this.$t('pleaseConformityVerification'))
-                    return
-                  }
-                  if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId
-                    && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) ||
-                    (!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId
-                      && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) {
-                    isTrue = true
-                  } else {
-                    isTrue = false
-                    this.$message.warning(this.$t('The') + (i + 1) + this.$t('strip') + ',' + this.$t('pleaseConfirmedByPrehomo'))
-                    return
-                  }
-                  if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId
-                    && this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) ||
-                    (!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId
-                      && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) {
-                    isTrue = true
-                  } else {
-                    isTrue = false
-                    this.$message.warning(this.$t('The') + (i + 1) + this.$t('strip') + ',' + this.$t('pleaseDesignConformityConfirmation'))
+                    this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))
                    return
                  }
                } else {
                  isTrue = false
-                  this.$message.warning(this.$t('The') + (i + 1) + this.$t('strip') + ',' + this.$t('taskDataConfirmation'))
+                  this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
                  return
                }
              }
@@ -84,10 +84,11 @@
            <a-col :span="24">
              <div class="box-title-text">
                <div class="title-text">
-                  <span class="Required">*</span>
+<!--                  <span class="Required">*</span>-->
                  <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
                </div>
-                <a-form-model-item class="itemModel" :prop="'lawEngineerName'">
+<!--                :prop="'lawEngineerName'"-->
+                <a-form-model-item class="itemModel">
                  <PersonnelSelection
                    :query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
                    :personneQuery="formInline"
@@ -101,10 +102,11 @@
            <a-col :span="24">
              <div class="box-title-text">
                <div class="title-text">
-                  <span class="Required">*</span>
+<!--                  <span class="Required">*</span>-->
                  <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                </div>
-                <a-form-model-item class="itemModel" :prop="'engineeringInterfacePersonName'">
+<!--                :prop="'engineeringInterfacePersonName'"-->
+                <a-form-model-item class="itemModel">
                  <PersonnelSelection
                    :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
                    :personneQuery="formInline"
@@ -118,10 +120,11 @@
            <a-col :span="24">
              <div class="box-title-text">
                <div class="title-text">
-                  <span class="Required">*</span>
+<!--                  <span class="Required">*</span>-->
                  <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
                </div>
-                <a-form-model-item class="itemModel" :prop="'certificationEngineer'">
+<!--                :prop="'certificationEngineer'"-->
+                <a-form-model-item class="itemModel">
                  <a-select allowClear
                            v-model="formInline.certificationEngineer"
                            :placeholder="$t('certifiedEngineer')+$t('areaOfResponsibility')">
@@ -325,6 +328,9 @@
      editOk() {
        this.$refs.ruleForm.validate(valid => {
          if (valid) {
+            if (!this.formInline.certificationEngineer){
+              this.formInline.certificationEngineer = ''
+            }
            this.confirmLoading = true
            putAction(this.url.edit, this.formInline).then((res) => {
              if (res.success) {