From eca88adbf1f571f5cb9e5d29770072966cac833a Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sat, 28 May 2022 13:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=83=E9=99=90=202022-05-?=
 =?UTF-8?q?28=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/factory/userSpecialSecurity.js        |  9 +++
 .../searchSAPPurchaseOrder.vue                |  5 ++
 src/views/modules/sys/user.vue                | 68 +++++++++++++++++--
 3 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 src/api/factory/userSpecialSecurity.js

diff --git a/src/api/factory/userSpecialSecurity.js b/src/api/factory/userSpecialSecurity.js
new file mode 100644
index 0000000..770656a
--- /dev/null
+++ b/src/api/factory/userSpecialSecurity.js
@@ -0,0 +1,9 @@
+import { createAPI } from "@/utils/httpRequest.js";
+//------------工厂信息部分----------------
+// 获取用户权限列表
+export const getUserSpecialSecurity = data => createAPI(`/specialSecurity/getUserSpecialSecurity/${data}`,'get')
+// 保存默认特殊权限
+export const saveUserSpecialSecurity = data => createAPI(`/specialSecurity/saveUserSpecialSecurity`,'post',data)
+// 更新用户特殊权限
+export const updateUserSpecialSecurity = data => createAPI(`/specialSecurity/updateUserSpecialSecurity`,'post',data)
+
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index ee1052a..bb894a1 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -1112,6 +1112,11 @@
                     this.doSaveCRoll()
                   })
                 }
+                if (this.sum2 + this.sum4 === this.dataForm.quantity){
+                  this.doSaveCRoll()
+                }
+
+
               } else {
                 this.$alert('该客户编号不存在', '错误', {
                   confirmButtonText: '确定'
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 0d034da..6d450fb 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -122,6 +122,36 @@
       :visible.sync="specialVisible"
       width="600px"
       :append-to-body="true">
+      <el-table
+        :data="securityList"
+        border
+        v-loading="dataListLoading"
+        highlight-current-row
+        @current-change="handleCurrentChange"
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed"
+          :width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50">
+        </el-table-column>
+      </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary">确定</el-button>
         <el-button @click="specialVisible = false" type="primary">取消</el-button>
@@ -148,10 +178,13 @@
 import {getUserAccessSiteList, saveUserAccessSiteList} from '@/api/factory/accessSite.js'
 import {getSiteList} from '@/api/factory/site.js'
 import AddOrUpdate from './user-add-or-update'
+import {getUserBusinessRoleList, saveUserBusinessRole,} from '@/api/auditManagement/auditType.js'
+
 import {
-  getUserBusinessRoleList,
-  saveUserBusinessRole,
-} from '@/api/auditManagement/auditType.js'
+  getUserSpecialSecurity,
+  saveUserSpecialSecurity,
+  updateUserSpecialSecurity
+} from '@/api/factory/userSpecialSecurity.js'
 
 
 export default {
@@ -173,11 +206,27 @@ export default {
       dataForm: {
         userName: ''
       },
+      columnList: [{
+          userId: this.$store.state.user.name,
+          serialNumber: 'security'+this.$route.meta.menuId+'securitydesc',
+          tableId: this.$route.meta.menuId + 'security',
+          tableName: "locationTable",
+          columnProp: "securitydesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+        },],
       dataList: [],
+      securityList: [],
       siteList: [],
-      selectSitList: ["1",],
+      selectSitList: [],
       selectUser: {},
-
       pageIndex: 1,
       pageSize: 20,
       totalPage: 0,
@@ -213,13 +262,18 @@ export default {
         }
         return itemSite;
       })
-      saveUserAccessSiteList(accessSiteList).then(({data}) => {
+      let accessSite = {
+        userid: this.selectUser.username,
+        accessSiteList: accessSiteList
+      }
+
+      saveUserAccessSiteList(accessSite).then(({data}) => {
         if (data.code === 0) {
           this.$message.success(data.msg)
           this.siteList = []
           this.selectSitList = []
           this.siteVisible = false
-        }else {
+        } else {
           this.$message.warning(data.msg)
         }
       })