Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!246

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -58,7 +58,6 @@
                   :on-success="handleOnsuccess"
                 >
                 <el-button
-                  :disabled="acceptShow"
                   type="primary"
                   class="common-button-primary"
                   @click="uploadFile(scope.row)"

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -20,6 +20,10 @@
           <label class="transition-box-label">资料标题：</label>
           <span class="transition-box-span">{{ detailInfoForm.dataTitle }}</span>
         </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">资料说明：</label>
+          <span class="transition-box-span">{{ detailInfoForm.dataExplain }}</span>
+        </p>
         <div class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <div class="file-box" v-if="fileList.length > 0">
@@ -233,8 +237,8 @@ export default {
     .title {
       flex: 1;
       font-weight: bold;
-      font-size: 20px;
+      font-size: 40px;
-      margin-left: 15px;
+      margin-left: 30px;
 
       .el-icon-s-order {
         font-size: 22px;
@@ -244,16 +248,16 @@ export default {
     }
   }
   .transition-box {
-    padding: 0 10px;
+    padding: 0 10% 0 10%;
     background: #ffffff;
-    font-size: 14px;
+    font-size: 28px;
 
     .transition-box-p {
-      line-height: 35px;
+      line-height: 50px;
 
       .transition-box-label {
         display: inline-block;
-        width: 100px;
+        width: 200px;
         vertical-align: top;
       }
 
@@ -280,9 +284,9 @@ export default {
 
           & > i {
             display: inline-block;
-            margin-left: 3px;
+            margin-left: 6px;
-            width: 18px;
+            width: 36px;
-            height: 16px;
+            height: 32px;
             background-repeat: no-repeat;
             background-size: 100% 100%;
             background-position: center center;

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -156,6 +156,23 @@
                 clearable
             />
           </el-form-item>
+          <el-form-item
+              label="资料说明"
+              prop="dataExplain"
+              class="add-form-item"
+          >
+            <el-input
+                type="textarea"
+                autosize
+                style="width: 95%"
+                maxlength="200"
+                show-word-limit
+                v-model="attributeEO.dataExplain"
+                placeholder="请输入资料说明"
+                clearable
+            />
+            <el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
+          </el-form-item>
           <el-form-item
               label="附件"
               prop="attachFileId"
@@ -220,6 +237,7 @@ export default {
       attributeEO: {
         dataType: '',
         dataTitle: '',
+        dataExplain: '',
         attachFileId: '',
       },
       attributeEOFormRules: {