完善采购订单、登录、菜单、角色功能

src/layout/components/Sidebar/index.vue

@@ -47,15 +47,34 @@
       //   return this.$router.options.routes
       // },
       activeMenu() {
+        // console.log('aaaaaaaaaaa', this.$route)
+        //   console.log("val>>>>>>>>>>>>>>>>.", this.$route.query.index); // 页面获取
+        // this.$route.query.index = [{
+        //   sid: '11',
+        //   name: "ssss"
+        // }, {
+        //   sid: '22',
+        //   name: "aaa"
+        // }, {
+        //   sid: '33',
+        //   name: "bbb"
+        // }]
         const route = this.$route
         const {
           meta,
-          path
+          path,
+          // query,
         } = route
+
+        // this.$route.query = {
+        //   index: '1'
+        // }
+
         // if set path, the sidebar will highlight the path you set
         if (meta.activeMenu) {
           return meta.activeMenu
         }
+        // console.log('bbbbbbb', path)
         return path
       },
       showLogo() {

src/views/login/login.vue

@@ -529,6 +529,8 @@
             window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
             window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
               .pNameAndDepartmentNameAndPostName)
+          } else {
+            loading.close()
           }
 
         }).catch(() => {
@@ -578,6 +580,8 @@
             window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
             window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
               .pNameAndDepartmentNameAndPostName)
+          } else {
+            loading.close()
           }
 
         }).catch(() => {

src/views/purchase/purchaseOrder/index.vue

@@ -105,7 +105,8 @@
             <el-table-column prop="supplierName" label="供应商" width="150" align="center" />
             <el-table-column prop="purchaserName" label="业务员" width="120" align="center" />
             <el-table-column prop="wareHouseName" label="收货仓库" width="150" align="center" />
-            <el-table-column prop="receiveStateValue" label="状态" width="120" align="center" />
+            <el-table-column prop="state" label="单据状态" width="120" align="center" />
+            <el-table-column prop="receiveStateValue" label="收货状态" width="120" align="center" />
             <el-table-column prop="amountTotal" label="商品总额" width="120" align="center" />
             <el-table-column prop="freight" label="采购运费" width="120" align="center" />
             <el-table-column prop="otherAmount" label="其他费用" width="120" align="center" />
@@ -644,8 +645,21 @@
       toSubmit() {
         if (this.sids.length > 0) {
 
+          for (var i = 0; i < this.selectionList.length; i++) {
+            var item = this.selectionList[i]
+
+            if (item.state != "未审核") {
+              this.$message({
+                type: 'warning',
+                showClose: true,
+                message: '请勿选择已提交的记录进行操作'
+              })
+              return
+            }
+
+          }
+
           req.submit(this.sids).then((resp) => {
-            loading.close()
             if (resp.success) {
               this.$message({
                 type: 'success',
@@ -656,9 +670,7 @@
             } else {
               // 根据resp.code进行异常情况处理
             }
-          }).catch(e => {
-            loading.close()
-          })
+          }).catch(e => {})
 
         } else {
           this.$message({

src/views/purchase/purchaseReview/index.vue

@@ -205,7 +205,7 @@
     <!-- 新增修改部分组件 -->
     <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
 
-    <el-dialog title="审核信息" :visible="dialogVisible" width="50%">
+    <el-dialog title="审核信息" :visible="dialogVisible" width="50%" :before-close="handleDialogClose">
       <el-form ref="" :model="orderInfo" class="formaddcopy02">
         <el-row class="first_row">
           <el-col :span="24">
@@ -615,6 +615,22 @@
       },
       toSubmit() {
         if (this.sids.length > 0) {
+
+          for (var i = 0; i < this.selectionList.length; i++) {
+            var item = this.selectionList[i]
+
+            if (item.state != "审核中") {
+              this.$message({
+                type: 'warning',
+                showClose: true,
+                message: '请勿选择已审核的记录进行操作'
+              })
+              return
+            }
+
+          }
+
+
           this.dialogVisible = true
         } else {
           this.$message({
@@ -710,6 +726,9 @@
           }
         }).catch(e => {})
 
+      },
+      handleDialogClose() {
+        this.dialogVisible = false
       }
 
     }

src/views/system/menuManage/menuManage.vue

@@ -142,6 +142,12 @@
               <el-input v-model="form.pageName" />
             </td>
           </tr>
+          <tr v-show="editMenuType=='2'">
+            <td>按钮Key</td>
+            <td>
+              <el-input v-model="form.btnKey" style="width:300px" />
+            </td>
+          </tr>
           <tr v-show="editMenuType=='2'">
             <td>权限标识</td>
             <td>
@@ -258,10 +264,16 @@
             <el-input v-model="form.pageName" style="width:300px" />
           </td>
         </tr>
+        <tr v-show="addMenuType=='2'">
+          <td>按钮Key</td>
+          <td>
+            <el-input v-model="form.btnKey" style="width:300px" />
+          </td>
+        </tr>
         <tr v-show="addMenuType=='2'">
           <td>权限标识</td>
           <td>
-            <el-input v-model="form.cid" />
+            <el-input v-model="form.cid" style="width:300px" />
           </td>
         </tr>
         <tr>
@@ -336,9 +348,10 @@
           remarks: '',
           sortNo: 0,
           cid: '',
+          btnKey: "",
           sourceName: 'wms',
           phoneFunction: "0",
-          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
+          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
         },
         tableData: [],
         page: {
@@ -349,7 +362,7 @@
             name: '',
             psid: '',
             sourceName: 'wms',
-            sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
+            sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
           }
         },
         rank: '1',
@@ -414,10 +427,16 @@
 
       menuTypeChangeRadio(val) {
         console.log('menuTypeChangeRadio', val)
+        if (val != '2') {
+          this.form.btnKey = ""
+        }
         this.form.menuType = val
       },
       menuTypeChangeRadio2(val) {
         console.log('menuTypeChangeRadio2', val)
+        if (val != '2') {
+          this.form.btnKey = ""
+        }
         this.form.menuType = val
       },
       changeRadio(val) {
@@ -446,6 +465,7 @@
       },
       getPageList() { // 获取列表
         this.loading = true
+        this.page.params.orgSid = window.sessionStorage.getItem('orgSid')
         pageList(this.page).then((res) => {
           this.loading = false
           console.log('这里是条件查询', this.page)
@@ -467,12 +487,13 @@
       },
       handleClick(tab, event) {
         if (tab.name == 'addrole') {
+          this.form = {}
           this.dialogTitle = '新增'
           this.form.isShow = '1'
           this.form.menuType = '0'
           //      this.form.psid = row.sid || 0
           this.form.sourceName = 'wms'
-          this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa33'
+          this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa44'
           this.form.pname = ''
           this.form.psid = '0'
           // this.sourceMenus()
@@ -492,8 +513,8 @@
         this.form.isShow = '1'
         this.form.menuType = '0'
         //      this.form.psid = row.sid || 0
-        this.form.pname = ''
-        this.form.psid = ''
+        this.form.pname = row.name
+        this.form.psid = row.sid
         this.form.sourceName = row.sourceName
         this.form.sourceSid = row.sourceSid
         if (row.isSource == '1') {
@@ -501,6 +522,10 @@
         } else {
           this.form.psid = row.sid
         }
+        let arr = []
+        arr = [row.sid];
+        this.$refs.Tree.setCheckedKeys(arr);
+
       },
       editRow(row) {
         console.log("editRow", row);
@@ -510,11 +535,34 @@
 
         this.editShow = this.form.isShow
         this.editMenuType = this.form.menuType
+        let arr = []
+        arr = [row.sid];
+        this.$refs.Tree.setCheckedKeys(arr);
 
         // this.form.isShow = 1
         this.form.pname = row.psid == '0' ? '顶级菜单' : row.pname
       },
       save() {
+        if (this.form.name == '') {
+          this.$message({
+            message: '菜单名称不能为空',
+            type: 'warning'
+          })
+          return
+        }
+
+        if (this.form.menuType == '2') {
+
+          if (this.form.btnKey == '') {
+            this.$message({
+              message: '按钮Key不能为空',
+              type: 'warning'
+            })
+            return
+          }
+
+        }
+
         if (this.form.sid) {
           putMenusInfo(this.form).then(res => {
             this.editDialog = false
@@ -556,7 +604,7 @@
           sortNo: 0,
           sourceName: 'wms',
           phoneFunction: "0",
-          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
+          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
         }
       },
       deleteRow(row) {

src/views/system/roleAdminister/roleAdminister.vue

@@ -212,14 +212,18 @@
             </div>
           </el-dialog>
 
-          <el-dialog title="角色授权" :visible.sync="charactarDialog" width="70%">
+          <el-dialog title="角色授权" :visible.sync="charactarDialog" width="70%" :before-close="dialogClose">
             <el-tabs v-model="charactarName" type="card" style="margin-top: -30px;" @tab-click="handleCharactar">
               <el-tab-pane label="菜单权限" name="first">
                 <table class="e-table" cellspacing="0">
                   <tr>
                     <td>角色名称</td>
                     <td>
-                      <el-input v-model="roleForm.name" readonly></el-input>
+                      <div style="display: flex;flex-direction: row;align-items: center;">
+                        <el-input v-model="roleForm.name" readonly style="flex: 6;"></el-input>
+                        <el-checkbox style="flex: 1;margin-left: 50px;" v-model="checkStrictly">父子级联动</el-checkbox>
+                      </div>
+
                     </td>
                   </tr>
                   <tr>
@@ -227,7 +231,8 @@
                     <td>
                       <div style="height:230px;overflow:auto;overflow-x:hidden;">
                         <el-tree v-loading="loading" :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
-                          :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange">
+                          :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange"
+                          :check-strictly="!checkStrictly">
                         </el-tree>
                       </div>
                     </td>
@@ -235,7 +240,7 @@
                 </table>
                 <div style="margin-top: 10px" class="text-center">
                   <el-button type="primary" @click="getCheckedKeys">保 存</el-button>
-                  <el-button @click="charactarDialog = false">关 闭</el-button>
+                  <el-button @click="dialogClose">关 闭</el-button>
                 </div>
               </el-tab-pane>
               <!-- <el-tab-pane label="功能权限" name="second">
@@ -476,6 +481,7 @@
             sid: "4"
           }
         ],
+        checkStrictly: true, //   true 父子节点不关联
 
       }
     },
@@ -752,7 +758,8 @@
         this.loading = true
         let params = {
           roleSid: row.sid,
-          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
+          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44',
+          orgSid: window.sessionStorage.getItem('orgSid')
         }
         roleMenuTree(params).then(res => {
           let data1 = res.data
@@ -953,6 +960,10 @@
           })
         })
       },
+      dialogClose() {
+        this.charactarDialog = false
+        this.checkStrictly = true
+      },
       //    菜单授权
       getCheckedKeys() {
         let roleMenus = []
@@ -980,6 +991,7 @@
         saveorgrolemenus(params).then(res => {
           this.roleDialog = false
           this.charactarDialog = false
+          this.checkStrictly = true
           this.$message({
             message: res.msg,
             type: 'success'