完善数据权限及系统设置

src/views/baseInfo/supplier/supplier/supplierAdd.vue

@@ -14,61 +14,108 @@
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>供应商名称</div>
-              <el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName"
+              <el-form-item prop="supplierName"><el-input
-                  clearable placeholder="" /></el-form-item>
+                v-model="formobj.supplierName"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>供应商简称</div>
-              <el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY"
+              <el-form-item prop="supplierPY"><el-input
-                  clearable placeholder="" /></el-form-item>
+                v-model="formobj.supplierPY"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>供应商编码</div>
-              <el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode"
+              <el-form-item prop="supplierCode"><el-input
-                  clearable placeholder="" /></el-form-item>
+                v-model="formobj.supplierCode"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>供应商类型</div>
               <el-form-item prop="supplierTypeSid">
-                <el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder=""
+                <el-select
-                  @change="supplierTypeChange">
+                  v-model="formobj.supplierTypeSid"
-                  <el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName"
+                  class="addinputInfo"
-                    :value="item.sid" />
+                  filterable
+                  placeholder=""
+                  @change="supplierTypeChange"
+                >
+                  <el-option
+                    v-for="item in supplierType_list"
+                    :key="item.sid"
+                    :label="item.supplierTypeName"
+                    :value="item.sid"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>供应商电话</div>
-              <el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw"
+              <el-form-item prop="contactTelePhone"><el-input
-                  v-model="formobj.contactTelePhone" clearable placeholder="" /></el-form-item>
+                v-model="formobj.contactTelePhone"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">传真</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.fax" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.fax"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">详细地址</div>
               <el-form-item>
-                <div class="addinputInfo"
+                <div
-                  style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
+                  class="addinputInfo"
-                  <el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px"
+                  style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center"
-                    @change="provinceChange">
+                >
+                  <el-select
+                    v-model="formobj.province"
+                    filterable
+                    clearable
+                    placeholder="请选择省"
+                    style="width:160px"
+                    @change="provinceChange"
+                  >
                     <el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name" />
                   </el-select>
-                  <el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px"
+                  <el-select
-                    @change="cityChange">
+                    v-model="formobj.city"
+                    filterable
+                    placeholder="请选择市"
+                    style="width:160px"
+                    @change="cityChange"
+                  >
                     <el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name" />
                   </el-select>
-                  <el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px"
+                  <el-select
-                    @change="countyChange">
+                    v-model="formobj.county"
+                    filterable
+                    placeholder="请选择县"
+                    style="width:160px"
+                    @change="countyChange"
+                  >
                     <el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name" />
                   </el-select>
-                  <el-input style="width: 30%" v-model="formobj.address" clearable placeholder="" />
+                  <el-input v-model="formobj.address" style="width: 30%" clearable placeholder="" />
                 </div>
               </el-form-item>
             </el-col>
@@ -76,79 +123,131 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">联系人</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactName" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.contactName"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">联系电话</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactMobile" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.contactMobile"
-            </el-col>
+                class="addinputInfo addinputw"
-            <el-col :span="8">
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
+            <el-col :span="8" />
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">邮编</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.zipCode" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.zipCode"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">电子邮件</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.email" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.email"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">网址</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.website" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.website"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>开票公司名称</div>
-              <el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw"
+              <el-form-item prop="billingCompanyName"><el-input
-                  v-model="formobj.billingCompanyName" clearable placeholder="" /></el-form-item>
+                v-model="formobj.billingCompanyName"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">税号</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.registNum" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.registNum"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">法人</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.legalName" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.legalName"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">采购员</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.purchaser"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>开票类型</div>
               <el-form-item prop="billingTypeValue">
-                <el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder=""
+                <el-select
-                  @change="billingTypeChange">
+                  v-model="formobj.billingTypeValue"
-                  <el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue"
+                  class="addinputInfo"
-                    :value="item.dictValue" />
+                  filterable
+                  placeholder=""
+                  @change="billingTypeChange"
+                >
+                  <el-option
+                    v-for="item in billingType_list"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictValue"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>税率</div>
-              <el-form-item prop="taxRate"><el-input class="addinputInfo addinputw"
+              <el-form-item prop="taxRate"><el-input
-                  @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable
+                v-model="formobj.taxRate"
-                  placeholder="" /></el-form-item>
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+                @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)"
+              /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable
+              <el-form-item><el-input
-                  placeholder="" /></el-form-item>
+                v-model="formobj.remarks"
+                class="addinputInfo addinputw"
+                clearable
+                placeholder=""
+              /></el-form-item>
             </el-col>
           </el-row>
           <div class="title titleOne">
@@ -235,14 +334,14 @@
           sortNo: '',
           billingTypeKey: '',
           billingTypeValue: '',
-          useOrgSid: '',
           createOrgName: '',
           createOrgSid: '',
           taxRate: '',
           remarks: '',
           baseSupplierBankList: [],
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
+          userSid: window.sessionStorage.getItem('userSid')
         },
         rules: {
           supplierName: [{
@@ -303,7 +402,7 @@
           }
         })
         req.selSupplierType({
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+          orgPath: window.sessionStorage.getItem('orgSid')
         }).then((res) => {
           if (res.success) {
             this.supplierType_list = res.data
@@ -505,14 +604,14 @@
           sortNo: '',
           billingTypeKey: '',
           billingTypeValue: '',
-          useOrgSid: '',
           createOrgName: '',
           createOrgSid: '',
           taxRate: '',
           remarks: '',
           baseSupplierBankList: [],
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
+          userSid: window.sessionStorage.getItem('userSid')
         }
         this.submitdisabled = false
         this.$emit('doback')

src/views/baseInfo/supplier/suppliertype/suppliertype.vue

@@ -138,6 +138,7 @@
           supplierTypeName: '',
           supplierTypeCode: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
       }
@@ -232,6 +233,7 @@
           supplierTypeName: '',
           supplierTypeCode: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
       },
@@ -242,6 +244,7 @@
           supplierTypeName: row.supplierTypeName,
           supplierTypeCode: row.supplierTypeCode,
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
       },
@@ -255,6 +258,7 @@
           return
         }
         this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.formobj.orgSid = window.sessionStorage.getItem('orgSid')
         req.saveOrUpdate(this.formobj).then((res) => {
           if (res.success) {
             this.dialogVisible = false

src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue

@@ -70,6 +70,7 @@
           locationSid: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
         warehouseList: [],
@@ -123,6 +124,7 @@
           locationSid: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue

@@ -106,6 +106,7 @@
           remarks: '',
           warehouseType: "0",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
       }
@@ -151,6 +152,7 @@
           remarks: '',
           warehouseType: "0",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue

@@ -82,6 +82,7 @@
           areaTypeSid: "",
           areaTypeName: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
         warehouseList: [],
@@ -135,6 +136,7 @@
           areaTypeSid: "",
           areaTypeName: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
 
         }

src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue

@@ -45,6 +45,7 @@
           warehouseAreaTypeName: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
 
         },
@@ -76,8 +77,8 @@
           warehouseAreaTypeName: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
-
         }
         this.$emit('doback')
       },

src/views/goods/brands/brandsAdd.vue

@@ -122,8 +122,8 @@
           letter: '',
           image: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
-
         },
         hideUploadBtn: false,
         hideUploadBtn2: false,
@@ -229,6 +229,7 @@
           letter: '',
           image: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/goods/category/categoryAdd.vue

@@ -174,8 +174,8 @@
           sortNo: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
-
         },
         goodsTypeList: [],
         outStockRuleList: [],
@@ -302,6 +302,7 @@
           sortNo: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/goods/factory/factoryAdd.vue

@@ -95,6 +95,7 @@
           sortNo: '',
           remarks: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
         rules: {
@@ -179,6 +180,7 @@
           sortNo: '',
           remarks: "",
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/goods/goods/goodsAdd.vue

@@ -792,6 +792,7 @@
           },
           baseGoodsSkus: [],
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
         brandList: [],
@@ -881,6 +882,7 @@
           },
           baseGoodsSkus: [],
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/goods/unit/unitAdd.vue

@@ -63,6 +63,7 @@
           unitName: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         },
         rules: {
@@ -118,6 +119,7 @@
           unitName: '',
           remarks: '',
           orgPath: window.sessionStorage.getItem('defaultDeptSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
           userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')

src/views/system/menuManage/menuManage.vue

@@ -62,14 +62,18 @@
               <el-input v-model="scope.row.sortNo" size="mini"/>
             </template>
           </el-table-column>-->
-            <el-table-column prop="pageUrl" width="120" label="类型" align="center" />
+            <el-table-column prop="menuTypeValue" width="120" label="类型" align="center" />
-            <el-table-column prop="pageUrl" label="链接地址" align="center" />
+            <el-table-column prop="pageUrl" label="路由路径" align="center" />
-            <el-table-column prop="isShow" label="可见性" align="center">
+            <el-table-column prop="menuUrl" label="路由名称" align="center" />
+            <el-table-column prop="pageName" label="组件路径" align="center" />
+            <el-table-column prop="cid" label="权限标识" align="center" />
+            <el-table-column prop="isShow" label="状态" align="center">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.isShow" active-color="#13ce66" inactive-color="#ff4949" active-value="1"
                   inactive-value="0" @change="enabledChange(scope.row.isShow,scope.row)" />
               </template>
             </el-table-column>
+            <el-table-column prop="sortNo" label="排序" align="center" />
           </el-table>
         </div>
       </div>
@@ -77,18 +81,37 @@
       <!-- 编辑功能信息 -->
       <el-dialog :title="dialogTitle + '功能信息'" :visible.sync="editDialog" width="40%">
         <table class="e-table" cellspacing="0">
-          <!-- <tr>
-            <td>上级菜单</td>
-            <td>
-              <el-input v-model="form.pname" :disabled="true" style="width:300px" />
-            </td>
-          </tr> -->
           <tr>
             <td>资源名称</td>
             <td>
               <el-input v-model="form.sourceName" :disabled="true" style="width:300px" />
             </td>
           </tr>
+          <tr>
+            <td>上级菜单</td>
+            <td>
+              <!-- <el-input v-model="form.pname" :disabled="true" style="width:300px" /> -->
+
+              <el-select v-model="form.pname" placeholder="请选择" style="width:300px">
+                <el-option hidden :key="form.psid" :label="form.pname" :value="form.pname"></el-option>
+                <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+                  :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
+                  :props="defaultProps" @check-change="checkchange" @node-click="departmentClick">
+                </el-tree>
+              </el-select>
+
+            </td>
+          </tr>
+          <tr>
+            <td>类型分类</td>
+            <td>
+              <el-radio-group v-model="editMenuType" @change="menuTypeChangeRadio">
+                <el-radio :label="'0'">目录</el-radio>
+                <el-radio :label="'1'">菜单</el-radio>
+                <el-radio :label="'2'">按钮</el-radio>
+              </el-radio-group>
+            </td>
+          </tr>
           <tr>
             <td>菜单名称</td>
             <td>
@@ -96,36 +119,41 @@
             </td>
           </tr>
           <tr>
-            <td>菜单路由</td>
+            <td>路由路径</td>
             <td>
               <el-input v-model="form.menuUrl" />
             </td>
           </tr>
           <tr>
-            <td>菜单图片路径</td>
+            <td>路由名称</td>
-            <td>
-              <el-input v-model="form.iconUrl" />
-            </td>
-          </tr>
-          <tr>
-            <td>前端页面名称</td>
-            <td>
-              <el-input v-model="form.pageName" />
-            </td>
-          </tr>
-          <tr>
-            <td>前端页面路径</td>
             <td>
               <el-input v-model="form.pageUrl" />
             </td>
           </tr>
           <tr>
-            <td>类型分类</td>
+            <td>菜单图片</td>
             <td>
-              <el-radio-group v-model="editMenuType" @change="menuTypeChangeRadio">
+              <el-input v-model="form.iconUrl" />
-                <el-radio :label="'1'">目录</el-radio>
+            </td>
-                <el-radio :label="'2'">菜单</el-radio>
+          </tr>
-                <el-radio :label="'3'">按钮</el-radio>
+          <tr>
+            <td>组件路径</td>
+            <td>
+              <el-input v-model="form.pageName" />
+            </td>
+          </tr>
+          <tr v-show="editMenuType=='2'">
+            <td>权限标识</td>
+            <td>
+              <el-input v-model="form.cid" />
+            </td>
+          </tr>
+          <tr>
+            <td>是否手机端权限</td>
+            <td>
+              <el-radio-group v-model="editPhoneFunction" @change="changeRadio4">
+                <el-radio :label="'0'">否</el-radio>
+                <el-radio :label="'1'">是</el-radio>
               </el-radio-group>
             </td>
           </tr>
@@ -158,7 +186,7 @@
       </el-dialog>
 
     </el-tab-pane>
-    <el-tab-pane label="新增菜单" name="addrole">
+    <el-tab-pane label="新增菜单" name="addrole" class="listconadd">
       <!-- 添加 -->
       <!--<el-dialog :title="dialogTitle + '菜单管理'" :visible.sync="editDialog" width="40%">-->
       <table class="e-table" cellspacing="0">
@@ -175,42 +203,73 @@
           </td>
         </tr>
         <tr>
-          <td>菜单名称</td>
+          <td>上级菜单</td>
           <td>
-            <el-input v-model="form.name" style="width:300px" />
+            <!-- <el-tree v-loading="loading" :data="treedata" ref="sourceTree" accordion node-key="sid"
-          </td>
+              :props="defaultProps" @check-change="checkchange">
-        </tr>
+            </el-tree> -->
-        <tr>
+
-          <td>菜单路由</td>
+            <el-select v-model="form.pname" placeholder="请选择" style="width:300px">
-          <td>
+              <el-option hidden :key="form.psid" :label="form.pname" :value="form.pname"></el-option>
-            <el-input v-model="form.menuUrl" style="width:300px" />
+              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
-          </td>
+                :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
-        </tr>
+                :props="defaultProps" @check-change="checkchange" @node-click="departmentClick">
-        <tr>
+              </el-tree>
-          <td>菜单图片路径</td>
+            </el-select>
-          <td>
-            <el-input v-model="form.iconUrl" style="width:300px" />
-          </td>
-        </tr>
-        <tr>
-          <td>前端页面名称</td>
-          <td>
-            <el-input v-model="form.pageName" style="width:300px" />
-          </td>
-        </tr>
-        <tr>
-          <td>前端页面路径</td>
-          <td>
-            <el-input v-model="form.pageUrl" style="width:300px" />
           </td>
         </tr>
         <tr>
           <td>类型分类</td>
           <td>
             <el-radio-group v-model="addMenuType" @change="menuTypeChangeRadio2">
-              <el-radio :label="'1'">目录</el-radio>
+              <el-radio :label="'0'">目录</el-radio>
-              <el-radio :label="'2'">菜单</el-radio>
+              <el-radio :label="'1'">菜单</el-radio>
-              <el-radio :label="'3'">按钮</el-radio>
+              <el-radio :label="'2'">按钮</el-radio>
+            </el-radio-group>
+          </td>
+        </tr>
+        <tr>
+          <td>菜单名称</td>
+          <td>
+            <el-input v-model="form.name" style="width:300px" />
+          </td>
+        </tr>
+        <tr>
+          <td>路由路径</td>
+          <td>
+            <el-input v-model="form.pageUrl" style="width:300px" />
+          </td>
+        </tr>
+        <tr>
+          <td>路由名称</td>
+          <td>
+            <el-input v-model="form.menuUrl" style="width:300px" />
+          </td>
+        </tr>
+        <tr>
+          <td>菜单图片</td>
+          <td>
+            <el-input v-model="form.iconUrl" style="width:300px" />
+          </td>
+        </tr>
+        <tr>
+          <td>组件路径</td>
+          <td>
+            <el-input v-model="form.pageName" style="width:300px" />
+          </td>
+        </tr>
+        <tr v-show="addMenuType=='2'">
+          <td>权限标识</td>
+          <td>
+            <el-input v-model="form.cid" />
+          </td>
+        </tr>
+        <tr>
+          <td>是否手机端权限</td>
+          <td>
+            <el-radio-group v-model="addPhoneFunction" @change="changeRadio3">
+              <el-radio :label="'0'">否</el-radio>
+              <el-radio :label="'1'">是</el-radio>
             </el-radio-group>
           </td>
         </tr>
@@ -251,7 +310,8 @@
     saveMenusInfo,
     putMenusInfo,
     delMenus,
-    IsEnable
+    IsEnable,
+    sourceMenuTree,
   } from '@/api/system/menu/index.js'
 
   export default {
@@ -263,7 +323,7 @@
         dialogTitle: '',
         checked: '',
         form: {
-          pname: '顶级菜单',
+          pname: '',
           iconUrl: '',
           isShow: '1',
           menuName: '',
@@ -275,10 +335,11 @@
           psid: '',
           remarks: '',
           sortNo: 0,
+          cid: '',
           sourceName: 'wms',
+          phoneFunction: "0",
           sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
         },
-        formBackup: Object.assign({}, this.form),
         tableData: [],
         page: {
           current: 1,
@@ -296,8 +357,18 @@
         isadd: false,
         editShow: '1',
         addShow: '1',
-        addMenuType: '1',
+        addMenuType: '0',
-        editMenuType: '1',
+        editMenuType: '0',
+        addPhoneFunction: "0",
+        editPhoneFunction: "0",
+        // 树形
+        loading: false,
+        defaultProps: {
+          children: 'children',
+          label: 'name'
+        },
+        checkedId: [], // 菜单授权 已选中
+        treedata: [], // 菜单授权
       }
     },
     mounted() {
@@ -309,6 +380,31 @@
       //    })
     },
     methods: {
+      departmentClick(data) {
+        console.log("departmentClick", data);
+        this.form.psid = data.sid
+        this.form.pname = data.name
+        this.$refs.Tree.visible = false
+      },
+      checkchange(data, checked) {
+        console.log("checkchange", data);
+        console.log("checkchange", checked);
+        if (checked) {
+          this.form.psid = data.sid
+          this.form.pname = data.name
+
+          let arr = []
+          arr = [data.sid];
+          this.$refs.Tree.setCheckedKeys(arr);
+
+          console.log("checkchange", this.form.pname);
+          console.log("checkchange", this.form.psid);
+
+          return;
+        }
+
+      },
+
       menuTypeChangeRadio(val) {
         console.log('menuTypeChangeRadio', val)
         this.form.menuType = val
@@ -325,6 +421,14 @@
         console.log('changeRadio2', val)
         this.form.isShow = val
       },
+      changeRadio3(val) {
+        console.log('changeRadio', val)
+        this.form.phoneFunction = val
+      },
+      changeRadio4(val) {
+        console.log('changeRadio2', val)
+        this.form.phoneFunction = val
+      },
       pagination(val) { // 分页
         this.page.current = val.pageNum
         this.page.size = val.pageSize
@@ -341,12 +445,14 @@
           const treedata = res.data
           console.log('菜单列表', res)
           this.tableData = treedata
+          this.treedata = treedata
           this.page.total = res.data.total
         })
       },
       // 资源名称
       getsourceList() {
         const params = {}
+        console.log()
         sourceList(params).then(res => {
           this.sourceNameData = res.data
           this.loading = false
@@ -355,14 +461,14 @@
       handleClick(tab, event) {
         if (tab.name == 'addrole') {
           this.dialogTitle = '新增'
-          this.form = Object.assign({}, this.formBackup)
           this.form.isShow = '1'
-          this.form.menuType = '1'
+          this.form.menuType = '0'
           //      this.form.psid = row.sid || 0
-          this.form.pname = '顶级菜单'
           this.form.sourceName = 'wms'
           this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa33'
-          this.form.psid = 0
+          this.form.pname = ''
+          this.form.psid = '0'
+          // this.sourceMenus()
         } else {
           this.getPageList()
         }
@@ -376,11 +482,11 @@
         //      }
         //			  this.dialogTitle = '新增'
         //			  this.editDialog = true
-        this.form = Object.assign({}, this.formBackup)
         this.form.isShow = '1'
-        this.form.menuType = '1'
+        this.form.menuType = '0'
         //      this.form.psid = row.sid || 0
-        this.form.pname = row.name || '顶级菜单'
+        this.form.pname = ''
+        this.form.psid = ''
         this.form.sourceName = row.sourceName
         this.form.sourceSid = row.sourceSid
         if (row.isSource == '1') {
@@ -406,6 +512,7 @@
           putMenusInfo(this.form).then(res => {
             this.editDialog = false
             this.getPageList()
+            this.rest()
             this.$message({
               message: res.msg,
               type: 'success'
@@ -415,12 +522,35 @@
           saveMenusInfo(this.form).then(res => {
             this.activeName = 'roleList'
             this.getPageList()
+            this.rest()
             this.$message({
               message: res.msg,
               type: 'success'
             })
           })
         }
+
+      },
+
+      rest() {
+        this.form = {
+          pname: '',
+          iconUrl: '',
+          isShow: '1',
+          menuName: '',
+          menuUrl: '',
+          pageAliasName: '',
+          pageName: '',
+          pageUrl: '',
+          pageUrlRedirect: '',
+          psid: '',
+          remarks: '',
+          cid: '',
+          sortNo: 0,
+          sourceName: 'wms',
+          phoneFunction: "0",
+          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
+        }
       },
       deleteRow(row) {
         this.$confirm('确定要删除该菜单吗, 是否继续?', '提示', {

src/views/system/userManage/userManageAdd.vue

@@ -114,7 +114,9 @@
     },
     methods: {
       getRoleList() {
-        var param = {}
+        var param = {
+          orgSid: window.sessionStorage.getItem('orgSid')
+        }
         roleList(param).then(res => {
           if (res.code === '200') {
             this.roleListAll = res.data

src/views/system/userManage/userManageList.vue

@@ -384,7 +384,9 @@
         this.getOrgUserList()
       },
       getRoleList() {
-        var param = {}
+        var param = {
+          orgSid: window.sessionStorage.getItem('orgSid')
+        }
         roleList(param).then(res => {
           if (res.code === '200') {
             this.roleListAll = res.data