Merge remote-tracking branch 'origin/master'

src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue

@@ -37,7 +37,7 @@
               :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol"
               :label="$t('expirationDate')"
               :colon="formItemColon">
-              <a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
+              <a-date-picker :placeholder="(disabled || !isInitiate) ? '' : ($t('pleaseSelect') + $t('expirationDate'))"
                              style="width: 100%"
                              :disabled="disabled || !isInitiate"
                              value-format="YYYY-MM-DD hh:mm:ss"
@@ -51,7 +51,7 @@
               :wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
               :label="$t('processExplain')"
               :colon="formItemColon">
-              <a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
+              <a-textarea :placeholder="(disabled || !isInitiate) ? '' : ($t('pleaseEnter') + $t('processExplain'))"
                           :maxLength="500"
                           :rows="4"
                           :disabled="disabled || !isInitiate"
@@ -92,7 +92,7 @@
       <a-form :form="approvalInfoForm">
         <!--备注-->
         <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
+          <a-textarea :placeholder="(disabled) ? '' : ($t('pleaseEnter') + $t('remarks'))"
                       :maxLength="500"
                       :rows="4"
                       :disabled="disabled"

src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue

@@ -46,12 +46,13 @@
       </template>
       <!--各涉及部门解读人-->
       <template slot="interpretPersonIds" slot-scope="{text, record, index}">
-        <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.departInterpretingPeople')"
+        <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.departInterpretingPeople'))"
                         v-model="record.interpretPersonIds"
                         :disabled="disabled"
                         filedName="interpretPersonIds"
                         @nameChange="(value, fieldName) => tableUserSelectNameChange(value, fieldName, index)"
                         type="checkbox"
+                        :showBtn="false"
                         :nameStr="record.interpretPersonIds_dictText" />
       </template>
       <template v-slot:action="{text, record}">
@@ -725,6 +726,7 @@ export default {
         item.interpretPersonIds = ids
         item.interpretPersonIds_dictText = names
       })
+      this.onClearSelected()
     },
     /**
      * 编辑
@@ -759,6 +761,7 @@ export default {
           Object.assign(item, form)
         })
       }
+      this.onClearSelected()
       this.$forceUpdate()
     },
     /**

src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue

@@ -33,7 +33,7 @@
             <a-select v-model="record.decompositionSource"
                       @change="handleChangeDecompositionSource"
                       :disabled="disabled"
-                      :placeholder="$t('pleaseSelect') + $t('workCenter.standardInterpretationProcess.decompositionOrderSource')"
+                      :placeholder="disabled ? '' : ($t('pleaseSelect') + $t('workCenter.standardInterpretationProcess.decompositionOrderSource'))"
                       style="width: 100%;">
               <a-select-option v-for="item in decompositionSourceList"
                                :disabled="item.isDisabled === '1'"

src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue

@@ -12,7 +12,7 @@
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.countersigningPerson')" :colon="false">
               <!--会签人员-->
-              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.countersigningPerson')"
+              <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.countersigningPerson'))"
                               v-decorator="['countersignPersonIds', validatorRules.countersignPersonIds]"
                               :disabled="disabled"
                               type="checkbox"
@@ -24,7 +24,7 @@
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.reviewersPerson')" :colon="false">
               <!--审核人员-->
-              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.reviewersPerson')"
+              <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.reviewersPerson'))"
                               v-decorator="['uploader', validatorRules.uploader]"
                               :disabled="disabled"
                               filedName="uploader"
@@ -35,7 +35,7 @@
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.approvedPerson')" :colon="false">
               <!--批准人员-->
-              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.approvedPerson')"
+              <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.approvedPerson'))"
                               v-decorator="['approvePersonId', validatorRules.approvePersonId]"
                               :disabled="disabled"
                               filedName="approvePersonId"

src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue

@@ -9,7 +9,7 @@
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.mainInterpreter')" :colon="false">
               <!--主解读人-->
-              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.mainInterpreter')"
+              <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.mainInterpreter'))"
                               v-decorator="['masterInterpretId', validatorRules.masterInterpretId]"
                               :disabled="disabled"
                               filedName="masterInterpretId"

src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue

@@ -25,7 +25,7 @@
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.interpretingTasksIsDistribute')" :colon="false">
               <!--解读任务是否下发-->
-              <j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('workCenter.standardInterpretationProcess.interpretingTasksIsDistribute')"
+              <j-dict-select-tag :placeholder="(disabled || isNextStep) ? '' : ($t('pleaseSelect') + $t('workCenter.standardInterpretationProcess.interpretingTasksIsDistribute'))"
                                  dict-code="is_distribute"
                                  :disabled="disabled || isNextStep"
                                  v-decorator="[ 'distribute', validatorRules.isDistribute ]" />
@@ -54,7 +54,7 @@
               <a-col :span="8">
                 <a-form-item :label="$t('workCenter.standardInterpretationProcess.countersigningPerson')" :colon="false">
                   <!--会签人员-->
-                  <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.countersigningPerson')"
+                  <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.countersigningPerson'))"
                                   v-decorator="['countersignPersonIds', validatorRules.countersignPersonIds]"
                                   :disabled="disabled"
                                   type="checkbox"
@@ -66,7 +66,7 @@
               <a-col :span="8">
                 <a-form-item :label="$t('workCenter.standardInterpretationProcess.reviewersPerson')" :colon="false">
                   <!--审核人员-->
-                  <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.reviewersPerson')"
+                  <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.reviewersPerson'))"
                                   v-decorator="['uploader', validatorRules.uploader]"
                                   :disabled="disabled"
                                   filedName="uploader"
@@ -77,7 +77,7 @@
               <a-col :span="8">
                 <a-form-item :label="$t('workCenter.standardInterpretationProcess.approvedPerson')" :colon="false">
                   <!--批准人员-->
-                  <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.approvedPerson')"
+                  <user-selection :placeholder="disabled ? '' : ($t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.approvedPerson'))"
                                   v-decorator="['approvePersonId', validatorRules.approvePersonId]"
                                   :disabled="disabled"
                                   filedName="approvePersonId"