修改分部显示和侧边栏

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -20,10 +20,12 @@
                      filterable
                      clearable
                      placeholder="请选择分部">
-            <el-option v-for="(item,index) in organList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -227,12 +229,13 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    getEmployeeOrgan().then((res) => {
-      if (res.code == 200) {
-        this.organList = res.data;
-      }
-    });
+    // getEmployeeOrgan().then((res) => {
+    //   if (res.code == 200) {
+    //     this.organList = res.data;
+    //   }
+    // });
     // 获取分部
+     this.$store.dispatch("setBranchs");
     goodsQuery({ status: 1, rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;

src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -29,11 +29,11 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item
@@ -303,7 +303,7 @@ import {
 import { orderServerList } from "@/utils/searchArray";
 import { getCooperation } from "@/api/buildTeam";
 export default {
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -373,6 +373,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -177,7 +177,6 @@
       <orderAuditDetail
         :orderId="activceId"
         :shopList="shopList"
-        :organList="organList"
         :isLook="isLook"
         ref="orderAuditDetail"
         v-if="orderVisible"
@@ -238,7 +237,7 @@ export default {
         type: null,
       },
       tableList: [],
-      organList: [],
+      // organList: [],
       orderServerList,
       orderAuditTypeList,
       rules: {

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -29,11 +29,11 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item
@@ -291,7 +291,6 @@
     <div
       class="lookTitle"
       v-if="auditStatus == 'ING'"
-      v-permission="'routeOrder/auditOutOrder'"
     >
       审核意见
     </div>
@@ -299,7 +298,6 @@
       :model="submitForm"
       v-if="auditStatus == 'ING'"
       ref="submitForm"
-      v-permission="'routeOrder/auditOutOrder'"
     >
       <el-form-item
         prop="memo"
@@ -328,7 +326,7 @@ import Tooltip from "@/components/Tooltip/index";
 let that;
 export default {
   components: { Tooltip },
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -391,6 +389,7 @@ export default {
             calenderId: orderInfo.calenderId ? orderInfo.calenderId : "",
           };
           this.auditStatus = orderInfo.auditStatus;
+          console.log(orderInfo)
           this.$set(
             this.form,
             "goodsList",
@@ -401,6 +400,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/setSilder/addSilder.vue

@@ -93,7 +93,6 @@
         </el-form-item>
         <el-form-item label="菜单名"
                       prop="name"
-                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.name"
                     autocomplete="off"></el-input>