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

src/pages/config/pages/attributeCustom/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="wx-custom-tab">
     <el-tabs v-model="tabValue" style="height: 100%;">
-      <el-tab-pane label="国内外标准法规" name="stand" v-btn-permission="'ad3ef2b8b8487229e52a7fe93416c437'">
+      <el-tab-pane label="国内外标准法规" name="stand"  v-if="regulations" >
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <stand v-if="tabValue === 'stand'"></stand>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="国内外政策" name="laws" v-btn-permission="'efcbe65f90d3a23f0be5df5ad60d1dac'">
+      <el-tab-pane label="国内外政策" name="laws"  v-if="policy">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <laws v-if="tabValue === 'laws'" ></laws >
         </div>
       </el-tab-pane>
-      <el-tab-pane label="企业标准库" name="buss" v-btn-permission="'7feeb73929c25a6f1fd67952704ec02b'">
+      <el-tab-pane label="企业标准库" name="buss"  v-if="library">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <buss v-if="tabValue === 'buss'" ></buss>
         </div>
@@ -40,7 +40,42 @@ export default {
   },
   data () {
     return {
-      tabValue: 'stand'
+      tabValue: 'stand',
+      regulations: false,
+      policy: false,
+      library: false,
+      menuName: [ "国内外标准法规", "国内外政策", "企业标准库"]
+    }
+  },
+  mounted() {
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["ad3ef2b8b8487229e52a7fe93416c437", "efcbe65f90d3a23f0be5df5ad60d1dac", "7feeb73929c25a6f1fd67952704ec02b"];
+    this.menuName.forEach(item => {
+      for (let i = 0; i < menuList.length; i++) {
+        let entity = menuList[i];
+        if (item != entity.menuName) continue;
+        if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
+          menuData.push(entity.id);
+          if (entity.id === "ad3ef2b8b8487229e52a7fe93416c437") {
+            this.regulations = true
+          } else if (entity.id === "efcbe65f90d3a23f0be5df5ad60d1dac") {
+            this.policy = true
+          } else if (entity.id === "7feeb73929c25a6f1fd67952704ec02b") {
+            this.library = true
+          }
+        }
+      }
+    });
+    if (this.regulations === true) {
+      this.activeName = "stand"
+      return;
+    } else if (this.skill === true) {
+      this.policy = "laws"
+      return;
+    }else if (this.skill === true) {
+      this.library = "buss"
+      return;
     }
   }
 }

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

@@ -825,6 +825,8 @@ export default {
       if (this.btnType === 'edit') {
         let Items = JSON.parse(localStorage.getItem('obj'))
         this.addQblxData.esName = Items.esName
+        this.addQblxData.unit = Items.unit
+        this.addQblxData.unitName = Items.unitName
         this.addQblxData.dutyUnit = Items.dutyUnit
         this.addQblxData.dutyPeopleId = Items.dutyPeopleId
         this.addQblxData.dutyPeople = Items.dutyPeople