[update] 修改bug79861,79870,79875,79880,79883,79899,79909,79914,79916,79918,79934,79964,79969

src/common/lang/workCenter/zh.js

@@ -6,7 +6,7 @@ module.exports = {
   // 新建流程页
   newProcess: {
     externalStandardsManagementProcess: '外部标准管理流程',
-    standardRegulationEntryCorrectionProcess: '标准法规入库/更正流程',
+    standardRegulationEntryCorrectionProcess: '标准法规入库/变更流程',
     annotateTheConsultationProcess: '标准征求意见流程',
     projectComplianceAssessmentProcess: '项目合规评估流程',
     noMatchTrackingProcess: '未符合项跟踪流程',

src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue

@@ -633,6 +633,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue

@@ -990,4 +990,8 @@ export default {
 .title-text {
   width: 200px;
 }
+
+/deep/ .ant-form-item-children > * {
+  width: 100% !important;
+}
 </style>

src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue

@@ -531,6 +531,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue

@@ -1037,4 +1037,12 @@ export default {
 .form-flex-item-long {
   width: 100%;
 }
+
+.title-text {
+  width: 180px;
+}
+
+/deep/ .ant-form-item-children > * {
+  width: 100% !important;
+}
 </style>

src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue

@@ -455,6 +455,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue

@@ -263,4 +263,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue

@@ -188,7 +188,7 @@ export default {
       // 说明是已发起流程
       this.currentNodeName = this.$route.query.taskName
     } else {
-      this.currentNodeName = '发起人发起'
+      this.currentNodeName = '主起草人发起'
     }
   },
   data () {
@@ -468,6 +468,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue

@@ -33,6 +33,7 @@
                                 :disabledSourceSearch="true"
                                 type="radio"
                                 :selectOnly="true"
+                                :filters="{standardState: '1,2,3,4,5,6,7,8'}"
                                 v-model="formInline.standardNumber"
                                 @listChange="listChange" />
           </a-form-model-item>
@@ -40,14 +41,16 @@
         <!--  企标名称  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-                    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
-                    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
-                  </span>
+            <span class="required">*</span>
+            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
+              {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
+            </span>
           </div>
           <a-form-model-item class="item-model" prop="standardName">
             <a-input class="box-input"
                      v-model="formInline.standardName"
                      :maxLength="50"
+                     :disabled="disabled"
                      @change="event => event.target.value = event.target.value.trim()"
                      :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
           </a-form-model-item>
@@ -291,7 +294,7 @@
                   </span>
           </div>
           <a-form-model-item class="item-model" prop="associatedFile">
-            <a-button type="primary" class="button-text" style="width: 200px" @click="clickButtonToUpload('associatedFile')">
+            <a-button type="primary" class="button-text" style="width: 100%" @click="clickButtonToUpload('associatedFile')">
               {{
                 (formInline.associatedFile === 'null' || formInline.associatedFile === ''
                   || formInline.associatedFile === null || formInline.associatedFile === undefined)
@@ -378,6 +381,7 @@ export default {
     },
     // 标准等级分类改变后授权部门需要自动带出
     'formInline.gradeClassification' (val) {
+      console.log(val, this.isEditSetData, this.formInline.authDept)
       if (val && !this.isEditSetData) {
         if (val === StandardGradeClassify.ZERO_LEVEL.value) {
           // 选的是0级，授权部门带出不可编辑
@@ -386,9 +390,8 @@ export default {
             this.authDeptDisabled = true
           }
         } else if (val === StandardGradeClassify.ONE_LEVEL.value) {
-          // 选的是1级
-          // 带出3级的部门：起草部门
-          this.formInline.authDept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 选的是1级，带出主起草单位
+          this.formInline.authDept = this.formInline.mainDraftingUnit
           // 设置可选择项
           this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',')
           this.formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -397,9 +400,8 @@ export default {
             this.authDeptDisabled = false
           }
         } else if (val === StandardGradeClassify.TWO_LEVEL.value) {
-          // 选的是2级
-          // 带出3级的部门：起草部门
-          this.formInline.authDept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 选的是2级，带出主起草单位
+          this.formInline.authDept = this.formInline.mainDraftingUnit
           // 设置可选择项
           this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',')
           this.formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -408,8 +410,8 @@ export default {
             this.authDeptDisabled = false
           }
         } else if (val === StandardGradeClassify.THREE_LEVEL.value) {
-          // 选的是3级，授权部门带出不可编辑
-          this.formInline.authDept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 选的是3级，带出主起草单位
+          this.formInline.authDept = this.formInline.mainDraftingUnit
           if (!this.authDeptDisabled) {
             this.authDeptDisabled = true
           }
@@ -444,6 +446,24 @@ export default {
         }
       }
     },
+    // 主起草单位改变后，需要将选中的主起草单位增加到授权部门
+    'formInline.mainDraftingUnit' (val) {
+      if (val && !this.isEditSetData) {
+        if (this.formInline.gradeClassification === StandardGradeClassify.ONE_LEVEL.value ||
+          this.formInline.gradeClassification === StandardGradeClassify.TWO_LEVEL.value) {
+          // 标准等级分类是1级或者2级需要，把主起草单位追加到授权部门
+          let authDeptArr = (this.formInline.authDept || '').split(',')
+          // 把旧的主起草部门刨出去，否则每换一次主起草单位都会累计到授权部门
+          authDeptArr = authDeptArr.filter(item => item !== this.oldMainDraftingUnit)
+          authDeptArr.push(val)
+          this.formInline.authDept = authDeptArr.join(',')
+        } else if (this.formInline.gradeClassification === StandardGradeClassify.THREE_LEVEL.value) {
+          // 标准等级分类是3级，把授权部门替换成主起草单位
+          this.formInline.authDept = val
+        }
+      }
+      this.oldMainDraftingUnit = val
+    },
     // 企标是否试行改变，标准状态需要跟着变,试行周期必填校验也跟着变
     'formInline.tryFlag' (val) {
       if (val) {
@@ -480,6 +500,14 @@ export default {
             trigger: 'change'
           }
         ],
+        // 企标名称
+        standardName: [
+          {
+            required: true,
+            message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ],
         // 标准等级分类
         gradeClassification: [
           {
@@ -528,7 +556,8 @@ export default {
             trigger: 'change'
           }
         ]
-      }
+      },
+      oldMainDraftingUnit: '' // 上一次的主起草单位
     }
   },
   mounted () {
@@ -545,7 +574,10 @@ export default {
       this.formInline.standardSystem = this.formInline.standardSystem ? this.formInline.standardSystem.split(',').map(item => {
         return { value: item }
       }) : []
-      this.isEditSetData = false
+      this.formInline.gradeClassification = this.formInline.gradeClassification || undefined
+      setTimeout(() => {
+        this.isEditSetData = false
+      }, 500)
     },
     // 外层要获取数据
     getData () {
@@ -594,51 +626,56 @@ export default {
     listChange (value) {
       console.log(value)
       this.loading = true
+      this.isEditSetData = true
       // 企标名称
       this.formInline.standardName = value[0].standardName
       // 根据返回的id查询企标数据
       getEnterpriseStandardInfoById({ id: value[0].id, type: '2' }).then(res => {
         if (res.success) {
           const result = res.result
+          const formInline = {}
           // 标准等级分类
-          this.formInline.gradeClassification = result.grade_classification
+          formInline.gradeClassification = result.grade_classification || undefined
+          // 授权部门
+          formInline.authDept = result.auth_dept
           // 标准体系
-          this.formInline.standardSystem = result.standard_system ? result.standard_system.split(',').map(item => {
+          formInline.standardSystem = result.standard_system ? result.standard_system.split(',').map(item => {
             return { value: item }
           }) : []
-          console.log(this.formInline.standardSystem)
           // 标准英文名称
-          this.formInline.standardEnglishName = result.standard_english_name
+          formInline.standardEnglishName = result.standard_english_name
           // 发布日期
-          this.formInline.releaseDate = result.release_date
+          formInline.releaseDate = result.release_date
           // 实施日期
-          this.formInline.implementationDate = result.implementation_date
+          formInline.implementationDate = result.implementation_date
           // 是否试行
-          this.formInline.tryFlag = result.try_flag
+          formInline.tryFlag = result.try_flag
           // 试行周期
-          this.formInline.trialPeriod = result.trial_period || undefined
+          formInline.trialPeriod = result.trial_period || undefined
           // 零部件名称
-          this.formInline.partName = result.part_name
-          this.formInline.partName_dictText = result.part_name_dictText
+          formInline.partName = result.part_name
+          formInline.partName_dictText = result.part_name_dictText
           // 主起草人
-          this.formInline.mainDraftingUser = result.main_drafting_user
-          this.formInline.mainDraftingUser_dictText = result.main_drafting_user_dictText
+          formInline.mainDraftingUser = result.main_drafting_user
+          formInline.mainDraftingUser_dictText = result.main_drafting_user_dictText
           // 主起草单位
-          this.formInline.mainDraftingUnit = result.main_drafting_unit
+          formInline.mainDraftingUnit = result.main_drafting_unit
           // 代替标准号
-          this.formInline.substituteStandardNumber = result.substitute_standard_number
+          formInline.substituteStandardNumber = result.substitute_standard_number
           // 引用标准
-          this.formInline.quotedStandard = result.reference_standard
+          formInline.referenceStandard = result.reference_standard
           // 关联文件
-          this.formInline.associatedFile = result.associated_file
+          formInline.associatedFile = result.associated_file
           // 采标程度
-          this.formInline.acquisitionDegree = result.acquisition_degree || null
+          formInline.acquisitionDegree = result.acquisition_degree || null
           // 采用国际标准号
-          this.formInline.internationalStandardNum = result.international_standard_num
-          this.formInline = Object.assign({}, this.formInline)
+          formInline.internationalStandardNum = result.international_standard_num
+          this.formInline = Object.assign({}, this.formInline, formInline)
+          this.$refs.ruleForm.clearValidate()
         }
       }).finally(() => {
         this.loading = false
+        this.isEditSetData = false
       })
     },
     // 零部件名称选择完成的回调
@@ -672,4 +709,7 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+/deep/ .ant-form-item-children > * {
+  width: 100% !important;
+}
 </style>

src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue

@@ -45,7 +45,7 @@
         <div slot="action" slot-scope="{record, index}" class="action-span-cell">
           <a @click="handleEdit(record, index)" class="table-ope-btn" :disabled="disabled">{{ $t('edit') }}</a>
           <a-divider type="vertical" />
-          <a @click="handleDelete(record.id, index)" class="table-ope-btn" :disabled="disabled">{{ $t('delete') }}</a>
+          <a @click="handleDelete(index)" class="table-ope-btn" :disabled="disabled">{{ $t('delete') }}</a>
         </div>
 
       </j-table>

src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue

@@ -988,6 +988,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue

@@ -271,7 +271,7 @@
                   </span>
             </div>
             <a-form-model-item class="item-model" prop="compilationDescription">
-              <a-button type="primary" class="button-text" @click="clickButtonToUpload('compilationDescription')">
+              <a-button type="primary" class="button-text" style="width: 100%;" @click="clickButtonToUpload('compilationDescription')">
                 {{
                   (formInline.compilationDescription === 'null' || formInline.compilationDescription === ''
                     || formInline.compilationDescription === null || formInline.compilationDescription === undefined)
@@ -379,7 +379,6 @@
           <!--  授权部门  -->
           <div class="box-title-text form-flex-item">
             <div class="title-text">
-              <span class="required">*</span>
               <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.authorizationDepart')">
                     {{ $t('workCenter.enterpriseInitChangePlan.authorizationDepart') }}
                   </span>
@@ -789,14 +788,6 @@ export default {
             trigger: 'change'
           }
         ],
-        // 授权部门
-        authDept: [
-          {
-            required: true,
-            message: this.$t('workCenter.enterpriseInitChangePlan.authorizationDepart') + this.$t('cannotEmpty'),
-            trigger: 'change'
-          }
-        ],
         // 主起草人
         mainDraftingUser: [
           {
@@ -1021,4 +1012,8 @@ export default {
 .title-text-long {
   width: 220px !important;
 }
+
+/deep/ .ant-form-item-children > .ant-calendar-picker {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue

@@ -346,12 +346,9 @@ export default {
 }
 
 .form-flex-box {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.form-flex-item-half {
-  width: 50%;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  column-gap: 10px;
 }
 
 .box-title-text {
@@ -364,10 +361,15 @@ export default {
 }
 
 .form-flex-item-long {
+  grid-column: 1/span 2;
   width: 100%;
   padding: 0;
   .title-text {
     width: 180px;
   }
 }
+
+/deep/ .ant-form-item-children > .ant-calendar-picker {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue

@@ -820,4 +820,8 @@ export default {
 .title-text-long {
   width: 220px !important;
 }
+
+/deep/ .ant-form-item-children > * {
+  width: 100% !important;
+}
 </style>

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue

@@ -537,6 +537,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue

@@ -248,4 +248,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue

@@ -209,4 +209,8 @@ export default {
 .form-flex-item-long {
   width: 100% !important;
 }
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue

@@ -159,4 +159,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue

@@ -714,6 +714,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue

@@ -116,7 +116,7 @@
                        class="box-input"
                        :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
                        v-model.trim="formInline[item.dbFieldName]"
-                       :maxLength="50"
+                       :maxLength="item.dbLength"
                        @change="event => event.target.value = event.target.value.trim()"
                        :placeholder="$t('pleaseEnter')+item.dbFieldTxt" />
               <!--   10, 下拉单选（数据字典）  -->
@@ -680,4 +680,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue

@@ -457,6 +457,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue

@@ -263,4 +263,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>

src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue

@@ -455,6 +455,7 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
+        this.switchValue = 'base'
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {

src/views/workCenter/enterpriseStandardStartUse/modules/BaseInfoForm.vue

@@ -265,4 +265,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>