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

src/pages/config/pages/roleManage/index.vue

@@ -535,6 +535,11 @@ export default {
               message: '删除成功!'
             });
             this.getTree()
+          } else if(!res.ok) {
+            this.$message({
+              type: 'warning',
+              message: res.message
+            });
           }
         })
       }).catch(() => {

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

@@ -1169,14 +1169,15 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        console.log(this.form);
+        let wssmrName = this.form.wssmrname
+        this.form.wssmr = wssmrName
         this.form.sycpx = this.form.sycpx.split(',')
         this.form.nylx = this.form.nylx.split(',')
         this.form.cllx = this.form.cllx.split(',')
         this.form.syrz = this.form.syrz.split(',')
+        this.form.syrz = this.form.syrz.split(',')
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -226,10 +226,10 @@
           <el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice"
                    style="display: flex;flex-wrap: wrap">
             <!--            产品平台-->
-            <el-form-item label="产品平台" class="serch-form-item">
-              <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"
-                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="产品平台" class="serch-form-item">-->
+<!--              <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getLocalProductTableBtn"></el-input>-->
+<!--            </el-form-item>-->
             <!--            项目编号-->
             <el-form-item label="项目编号" class="serch-form-item">
               <el-input v-model="localProTableSearch.projectNumber" placeholder="根据项目编号" clearable :maxlength="500"