[update] 修改企标流程样式

src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue

@@ -21,7 +21,7 @@
         <a-row>
           <a-col :span="12">
             <!--  流程名称  -->
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('processName')">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('processName')" :colon="formItemColon">
               <a-input :placeholder="$t('pleaseEnter') + $t('processName')"
                        @change="event => event.target.value = event.target.value.trim()"
                        :disabled="disabled || processInfoDisabled"
@@ -31,7 +31,7 @@
           </a-col>
           <a-col :span="12">
             <!--  截止日期  -->
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')" :colon="formItemColon">
               <a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
                              style="width: 100%"
                              :disabled="disabled || processInfoDisabled"
@@ -41,7 +41,7 @@
           </a-col>
           <a-col :span="24">
             <!--  流程说明  -->
-            <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('processExplain')">
+            <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('processExplain')" :colon="formItemColon">
               <a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
                           :maxLength="500"
                           :rows="4"
@@ -83,14 +83,14 @@
       <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
       <a-form :form="approvalInfoForm">
         <!--备注-->
-        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')">
+        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
           <a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
                       :maxLength="500"
                       :rows="4"
                       v-decorator="['commitText', validatorRules.commitText]" />
         </a-form-item>
         <!--附件-->
-        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
+        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('attach')" :colon="formItemColon">
           <j-upload v-decorator="['commitFile']" return-id />
         </a-form-item>
       </a-form>
@@ -159,8 +159,6 @@ import {
   activelyReportReject,
   activelyReportGetDataById
 } from '@/api/workCenter'
-import Vue from 'vue'
-import { USER_INFO } from '@/store/mutation-types'
 import pick from 'lodash.pick'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import { ProcessKey } from '@/enums/commonEnums'

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

@@ -1,67 +1,65 @@
 <template>
   <div>
-    <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-      <div class="collapsible-panel-form">
-        <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
-          <!--  是否下发联络人  -->
-          <div class="box-title-text form-flex-item flex-item-small">
-            <div class="title-text">
-              <span class="required">*</span>
-              <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.whetherToSendAContact')">
+    <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
+      <div class="form-flex-box">
+        <!--  是否下发联络人  -->
+        <div class="box-title-text form-flex-item flex-item-small">
+          <div class="title-text">
+            <span class="required">*</span>
+            <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.whetherToSendAContact')">
                   {{ $t('workCenter.revisionPlanActivelyReport.whetherToSendAContact') }}
                 </span>
-            </div>
-            <a-form-model-item class="item-model" prop="distributeFlag">
-              <a-radio-group v-model="formInline.distributeFlag">
-                <a-radio value="1">
-                  {{ $t('yes') }}
-                </a-radio>
-                <a-radio value="0">
-                  {{ $t('not') }}
-                </a-radio>
-              </a-radio-group>
-            </a-form-model-item>
           </div>
-          <!--  是否下发联络人选了是，不显示表格，只显示完整表单  -->
-          <template v-if="formInline.distributeFlag === '1'">
-            <!--  工作组/所联络人  -->
-            <div class="box-title-text form-flex-item flex-item-long">
-              <div class="title-text title-text-middle">
-                <span class="required">*</span>
-                <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.workingGroupContactPerson')">
+          <a-form-model-item class="item-model" prop="distributeFlag">
+            <a-radio-group v-model="formInline.distributeFlag">
+              <a-radio value="1">
+                {{ $t('yes') }}
+              </a-radio>
+              <a-radio value="0">
+                {{ $t('not') }}
+              </a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </div>
+        <!--  是否下发联络人选了是，不显示表格，只显示完整表单  -->
+        <template v-if="formInline.distributeFlag === '1'">
+          <!--  工作组/所联络人  -->
+          <div class="box-title-text form-flex-item flex-item-long">
+            <div class="title-text title-text-middle">
+              <span class="required">*</span>
+              <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.workingGroupContactPerson')">
                   {{ $t('workCenter.revisionPlanActivelyReport.workingGroupContactPerson') }}
                 </span>
-              </div>
-              <a-form-model-item class="item-model" prop="workGroupUser">
-                <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.workingGroupContactPerson')"
-                                v-model="formInline.workGroupUser"
-                                :disabled="disabled"
-                                filedName="workGroupUser"
-                                @nameChange="userSelectNameChange"
-                                :nameStr="formInline.workGroupUser_dictText"
-                                type="checkbox" />
-              </a-form-model-item>
             </div>
-            <!--  联络人主管级上一级领导  -->
-            <div class="box-title-text form-flex-item flex-item-long">
-              <div class="title-text title-text-long">
-                <span class="required">*</span>
-                <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.contactSupervisorSuperiorLeader')">
+            <a-form-model-item class="item-model" prop="workGroupUser">
+              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.workingGroupContactPerson')"
+                              v-model="formInline.workGroupUser"
+                              :disabled="disabled"
+                              filedName="workGroupUser"
+                              @nameChange="userSelectNameChange"
+                              :nameStr="formInline.workGroupUser_dictText"
+                              type="checkbox" />
+            </a-form-model-item>
+          </div>
+          <!--  联络人主管级上一级领导  -->
+          <div class="box-title-text form-flex-item flex-item-long">
+            <div class="title-text title-text-long">
+              <span class="required">*</span>
+              <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.contactSupervisorSuperiorLeader')">
                   {{ $t('workCenter.revisionPlanActivelyReport.contactSupervisorSuperiorLeader') }}
                 </span>
-              </div>
-              <a-form-model-item class="item-model" prop="contactUserLeaderLeader">
-                <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.contactSupervisorSuperiorLeader')"
-                                v-model="formInline.contactUserLeaderLeader"
-                                :disabled="disabled"
-                                filedName="contactUserLeaderLeader"
-                                @nameChange="userSelectNameChange"
-                                :nameStr="formInline.contactUserLeaderLeader_dictText"
-                                type="radio" />
-              </a-form-model-item>
             </div>
-          </template>
-        </div>
+            <a-form-model-item class="item-model" prop="contactUserLeaderLeader">
+              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.contactSupervisorSuperiorLeader')"
+                              v-model="formInline.contactUserLeaderLeader"
+                              :disabled="disabled"
+                              filedName="contactUserLeaderLeader"
+                              @nameChange="userSelectNameChange"
+                              :nameStr="formInline.contactUserLeaderLeader_dictText"
+                              type="radio" />
+            </a-form-model-item>
+          </div>
+        </template>
       </div>
     </a-form-model>
     <!--  是否下发联络人选了否，不显示完整表单，显示表格  -->
@@ -187,10 +185,6 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
-.collapsible-content-no-head {
-  border-top: 1px solid #E5E6EB;
-  border-radius: 8px 8px 8px 8px;
-}
 
 /deep/ .ant-form-item-children {
   width: 100%;

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

@@ -1,26 +1,24 @@
 <template>
   <div>
-    <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-      <div class="collapsible-panel-form">
-        <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
-          <!--  收集联络人主管级领导  -->
-          <div class="box-title-text form-flex-item-long">
-            <div class="title-text title-text-middle">
-              <span class="required">*</span>
-              <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders')">
+    <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
+      <div class="form-flex-box">
+        <!--  收集联络人主管级领导  -->
+        <div class="box-title-text form-flex-item-long">
+          <div class="title-text title-text-middle">
+            <span class="required">*</span>
+            <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders')">
                   {{ $t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders') }}
                 </span>
-            </div>
-            <a-form-model-item class="item-model" prop="collectUserLeader">
-              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders')"
-                              v-model="formInline.collectUserLeader"
-                              :disabled="disabled"
-                              filedName="collectUserLeader"
-                              @nameChange="userSelectNameChange"
-                              :nameStr="formInline.collectUserLeader_dictText"
-                              type="radio" />
-            </a-form-model-item>
           </div>
+          <a-form-model-item class="item-model" prop="collectUserLeader">
+            <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders')"
+                            v-model="formInline.collectUserLeader"
+                            :disabled="disabled"
+                            filedName="collectUserLeader"
+                            @nameChange="userSelectNameChange"
+                            :nameStr="formInline.collectUserLeader_dictText"
+                            type="radio" />
+          </a-form-model-item>
         </div>
       </div>
     </a-form-model>
@@ -118,10 +116,6 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
-.collapsible-content-no-head {
-  border-top: 1px solid #E5E6EB;
-  border-radius: 8px 8px 8px 8px;
-}
 
 .title-text-middle {
   width: 130px !important;

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

@@ -1,22 +1,20 @@
 <template>
-  <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-    <div class="collapsible-panel-form">
-      <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
-        <!--  制修订计划说明  -->
-        <div class="box-title-text form-flex-item-long">
-          <div class="title-text">
-            <span class="required">*</span>
-            <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')">
+  <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
+    <div class="form-flex-box">
+      <!--  制修订计划说明  -->
+      <div class="box-title-text form-flex-item-long">
+        <div class="title-text">
+          <span class="required">*</span>
+          <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')">
                   {{ $t('workCenter.revisionPlanActivelyReport.revisionPlanDesc') }}
                 </span>
-          </div>
-          <a-form-model-item class="item-model" prop="processDescription">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')"
-                        :maxLength="500"
-                        :disabled="disabled"
-                        v-model="formInline.processDescription" :rows="4" />
-          </a-form-model-item>
         </div>
+        <a-form-model-item class="item-model" prop="processDescription">
+          <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')"
+                      :maxLength="500"
+                      :disabled="disabled"
+                      v-model="formInline.processDescription" :rows="4" />
+        </a-form-model-item>
       </div>
     </div>
   </a-form-model>
@@ -93,55 +91,6 @@ export default {
   width: 100%;
 }
 
-.collapsible-panel-form {
-  margin-top: 20px;
-
-  &-header {
-    height: 56px;
-    line-height: 56px;
-    background: rgba(245, 245, 245, 0.6);
-    border-radius: 8px 8px 0 0;
-    border: 1px solid #E5E6EB;
-    padding: 0 20px;
-    font-size: 16px;
-    font-family: PingFang SC-Medium, PingFang SC, sans-serif;
-    font-weight: 600;
-    color: #1D2129;
-    display: flex;
-    justify-content: space-between;
-
-    .retractable-btn {
-      cursor: pointer;
-      font-size: 14px;
-      font-family: PingFang SC-Regular, PingFang SC, sans-serif;
-      color: @primary-color;
-    }
-
-    .anticon {
-      margin-right: 8px;
-    }
-
-    .pack-up-btn {
-      transform: rotate(-90deg);
-    }
-
-    .unfold-btn {
-      transform: rotate(90deg);
-    }
-  }
-
-  &-content {
-    border: 1px solid #E5E6EB;
-    border-top: none;
-    border-radius: 0 0 8px 8px;
-    padding: 20px;
-  }
-}
-.collapsible-content-no-head {
-  border-top: 1px solid #E5E6EB;
-  border-radius: 8px 8px 8px 8px;
-}
-
 .form-flex-item {
   width: calc(100% / 3);
 }