Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -164,7 +164,7 @@
                     <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">实施日期</template>
                     </ProcessTitle>
-                    <div class="prc-content-border" v-show="verifySarStandard" >
+                    <div class="prc-content-border content_input" v-show="verifySarStandard" >
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
@@ -1285,6 +1285,7 @@
               zbjbdFileList: [],
               kwjFileList: [],
               glwjFileList: [],
+              nodeList5: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1468,6 +1469,8 @@
                     zrUserName: '',
                     jlUserId: '',
                     jlUserName: '',
+                    wssmr: '',
+                    wssmrId: '',
                     applyUpdUserId: this.$store.getters.userInfo.userId,
                     applyUpdUserName: this.$store.getters.userInfo.userName,
                     prcCreateUser: this.$store.getters.userInfo.userId,
@@ -2805,6 +2808,11 @@
         position: relative;
         overflow: hidden;
       }
+      .prc-content-border {
+        /deep/ .el-input__inner {
+          padding-left: 30px;
+        }
+      }
       /deep/ .el-dialog__body {
         padding: 0 20px 10px;
         color: #606266;