Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/api/login.js

@@ -25,7 +25,8 @@ export function login (params) {
         url: '/api/fs4a/Login/v1',
         method: 'post',
         data: params,
-        islogin: true
+        islogin: true,
+        msg: '登录'
     })
 }
 

src/api/section.js

@@ -0,0 +1,46 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-04-13 16:27:03
+ * @LastEditTime: 2022-04-14 13:38:06
+ * @LastEditors: your name
+ * @Description: 标段管理
+ * have a nice day!
+ */
+
+import request from '@/utils/request'
+
+// 组织树查询
+export function GetOrganTreeNoReg(params) {
+  return request({
+    url: '/api/fs4a/GetOrganTreeNoReg',
+    method: 'get',
+    params
+  })
+}
+
+// 标段树查询
+export function GetSections(params) {
+  return request({
+    url: '/api/fs4a/GetSections',
+    method: 'get',
+    params
+  })
+}
+
+// 监管单位查询
+export function GetRegList(params) {
+  return request({
+    url: '/api/fs4a/GetRegList',
+    method: 'get',
+    params
+  })
+}
+
+// 保存标段
+export function SaveSection(params) {
+  return request({
+    url: '/api/fs4a/SaveSection',
+    method: 'post',
+    data: params
+  })
+}

src/components/CheckCardList/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-04-08 14:19:57
- * @LastEditTime: 2022-04-11 11:53:15
+ * @LastEditTime: 2022-04-13 18:07:51
  * @LastEditors: your name
  * @Description: 多选卡片列表
  * have a nice day!
@@ -37,7 +37,7 @@
             class="infinite-scroll"
           >
             <el-checkbox-group
-              v-model="checkedList"
+              v-model="checkedKeys"
               @change="checkChange"
             >
               <el-col
@@ -48,7 +48,7 @@
                 <div
                   class="check-card"
                   :style="{ height: cardHeight }"
-                  @click="cardClickHandler(item[checkId])"
+                  @click.self="cardClickHandler(item[checkId])"
                 >
                   <div class="label">{{ item[label] }}</div>
                   <el-checkbox :label="item[checkId]" />
@@ -123,7 +123,7 @@ export default {
       pageSize: 20,
       loading: false,
       total: 0,
-      checkedList: []
+      checkedKeys: []
     }
   },
   computed: {
@@ -173,15 +173,13 @@ export default {
     },
     load() {
       this.pageNum += 1
-      // console.log(this.pageNum, this.total, this.loading)
       this.fetchData()
     },
     cardClickHandler(id) {
       console.log(id)
     },
     checkChange(arr) {
-      console.log(arr)
-      // this.$emit('check-change', arr)
+      this.$emit('check-change', arr)
     },
     // 父组件请求完成后调用此方法设置total值
     setTotal(total) {
@@ -189,6 +187,10 @@ export default {
     },
     setLoading(loading) {
       this.loading = loading
+    },
+    // 设置勾选
+    setCheckedKeys(keys) {
+      this.checkedKeys = keys
     }
   }
 }

src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 09:45:17
- * @LastEditTime: 2022-04-06 11:17:20
+ * @LastEditTime: 2022-04-14 16:15:03
  * @LastEditors: your name
  * @Description: axios封装
  */
@@ -37,7 +37,7 @@ service.interceptors.request.use(
       // please modify it according to the actual situation
       config.headers['Token'] = getToken()
     }
-    if (config.data) {
+    if (config.data && !config.url.includes('/api/fs4a/sendLog')) {
       config.data['OperatorId'] = getUserId()
     }
     flag = true
@@ -46,6 +46,9 @@ service.interceptors.request.use(
         text: '数据加载中'
       })
     }
+    if (config.url.includes('/api/fs4a/sendLog') && config.data.Data[0]?.OperateResult?.Token) {
+      config.headers['token'] = config.data.Data[0].OperateResult.Token
+    }
     config.metaData = {
       BeginTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
@@ -73,7 +76,7 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // 特定请求完成后发送日志
-    const { metaData, url, Ident, data, msg } = response.config
+    const { metaData, url, Ident, data, msg, islogin } = response.config
     if (!url.includes('/api/fs4a/sendLog') && (Ident || msg)) {
       Object.assign(metaData, {
         LogInfo: typeof data === 'string' ? JSON.parse(data) : data,
@@ -82,18 +85,29 @@ service.interceptors.response.use(
         OperateResult: res.returnData,
         Ident: Ident ?? ''
       })
-      service({
+      const { BeginTime, EndTime, OperateResult } = metaData
+      const config = {
         url: '/api/fs4a/sendLog',
         method: 'post',
         data: {
           Data: [metaData],
           BrowserTag: navigator.userAgent,
           OperateIP: returnCitySN.cip,
-          Operator: getUserId(),
           Msg: msg,
-          Type: '2'
+          Type: '2',
+          BeginTime,
+          EndTime,
+          OperateResult
         }
-      })
+      }
+      if (islogin) {
+        if (res.returnData) {
+          config.data.OperatorId = config.data.Operator = res.returnData.UserId.toString()
+        }
+      } else {
+        config.data.OperatorId = config.data.Operator = getUserId()
+      }
+      service(config)
     }
     if (res.code == 0 || res.code == -1) {
       flag = false

src/views/lotAuthorization/components/home.vue

@@ -13,14 +13,14 @@
       <el-col :span="6">
         <div class="body-card">
           <CheckCardList
-            ref="officerList"
-            title="职员列表"
-            label="OfficerName"
-            check-id="OfficerId"
-            search-placeholder="请输入职员名称"
-            :data-list="officerList"
-            @load="loadOfficerList"
-            @check-change="officerCheckChangeHandler"
+            ref="userList"
+            title="用户列表"
+            label="UserName"
+            check-id="UserId"
+            search-placeholder="请输入用户名称"
+            :data-list="userList"
+            @load="loadUserList"
+            @check-change="userCheckChangeHandler"
           />
         </div>
       </el-col>
@@ -30,14 +30,14 @@
             ref="sectionTree"
             :default-props="{
               children: 'children',
-              label: 'SectionName'
+              label: 'SessionName'
             }"
             :data="sectionTree"
             :checked-keys-duo="sectionCheckedKeys"
             :org-list="sectionList"
             :default-multiple="true"
-            node-key="SectionId"
-            up-node-key="SectionUpid"
+            node-key="SessionId"
+            up-node-key="UpSessionId"
             title="选择标段"
             @getTreeDataDuo="sectionCheckChangeHandler"
           />
@@ -48,8 +48,8 @@
           <CheckCardList
             ref="regulatorList"
             title="监管单位"
-            label="name"
-            check-id="id"
+            label="OrganName"
+            check-id="OrganId"
             search-placeholder="请输入单位名称"
             :data-list="regulatorList"
             @load="loadRegulatorList"
@@ -83,22 +83,58 @@
 <script>
 import CheckCardList from '@/components/CheckCardList'
 import MultipleTree from '@/components/organization'
-import officerList from '../mixins/officerList'
+import userList from '../mixins/userList'
 import sectionTree from '../mixins/sectionTree'
 import regulatorList from '../mixins/regulatorList'
 import orgTree from '../mixins/orgTree'
+import { SaveSection } from '@/api/section'
 
 export default {
   components: { CheckCardList, MultipleTree },
-  mixins: [officerList, sectionTree, regulatorList, orgTree],
-  data() {
-    return {
-      regulatorList: []
-    }
-  },
+  mixins: [userList, sectionTree, regulatorList, orgTree],
   methods: {
     btnSaveHandler() {
-      this.$message.warning('开发中')
+      if (this.checkedUsers.length === 0) {
+        this.$message.error('请选择用户')
+        return
+      } else if (this.checkedSections.length === 0) {
+        this.$message.error('请选择标段')
+        return
+      } else if (this.checkedRegulators.length === 0) {
+        this.$message.error('请选择监管单位')
+        return
+      } else if (this.checkedOrgs.length === 0) {
+        this.$message.error('请选择组织')
+        return
+      }
+      const mixedDatas = []
+      this.checkedUsers.forEach(user => {
+        this.checkedSections.forEach(section => {
+          this.checkedRegulators.forEach(regulator => {
+            this.checkedOrgs.forEach(org => {
+              mixedDatas.push({
+                officerId: user.UserId,
+                OrganId: org.OrganId,
+                OthOrganId: regulator.OrganId,
+                ...section
+              })
+            })
+          })
+        })
+      })
+      this.saveSection(mixedDatas)
+    },
+    async saveSection(params) {
+      try {
+        const res = await SaveSection(params)
+        if (res.code === 0) {
+          this.$message.success(res.message ?? '成功')
+        } else {
+          this.$message.error(res.message ?? '失败')
+        }
+      } catch (error) {
+        console.log('错误', error)
+      }
     }
   }
 }

src/views/lotAuthorization/mixins/officerList.js

@@ -1,47 +0,0 @@
-/*
- * @Author: Badguy
- * @Date: 2022-04-11 11:00:32
- * @LastEditTime: 2022-04-11 11:37:01
- * @LastEditors: your name
- * @Description: 职员列表
- * have a nice day!
- */
-
-import { staffList as GetOfficerList } from '@/api/postInterface'
-
-export default {
-  data() {
-    return {
-      officerList: []
-    }
-  },
-  methods: {
-    officerCheckChangeHandler() {},
-    async loadOfficerList(keyWords = '', pageSize = 20, pageNum = 1) {
-      try {
-        this.$refs['officerList'].setLoading(true)
-        const res = await GetOfficerList({
-          QueryName: keyWords,
-          PageSize: pageSize,
-          PageIndex: pageNum
-        })
-        if (res.code === 0) {
-          const { records, pages } = res.returnData
-          if (pageNum === 1) {
-            this.officerList = records
-          } else {
-            this.officerList.push(...records)
-          }
-          this.$refs['officerList'].setTotal(pages)
-          this.$refs['officerList'].setLoading(false)
-        } else {
-          this.$message.error(res.message)
-          this.$refs['officerList'].setLoading(false)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-        this.$refs['officerList'].setLoading(false)
-      }
-    }
-  }
-}

src/views/lotAuthorization/mixins/orgTree.js

@@ -1,13 +1,14 @@
 /*
  * @Author: your name
  * @Date: 2021-12-22 17:00:22
- * @LastEditTime: 2022-04-11 11:36:27
+ * @LastEditTime: 2022-04-14 13:32:01
  * @LastEditors: your name
  * @Description: 组织树
  */
 
 import { translateDataToTreeAll } from '@/utils/validate'
-import { tissueTreeList } from '@/api/postInterface'
+import { GetOrganTreeNoReg } from '@/api/section'
+
 export default {
   data() {
     return {
@@ -26,6 +27,7 @@ export default {
         }
       ],
       orgList: [],
+      checkedOrgs: [],
       orgCheckedKeys: []
     }
   },
@@ -34,13 +36,12 @@ export default {
   },
   methods: {
     orgCheckChangeHandler(arr) {
-      console.log(arr)
+      this.checkedOrgs = arr.filter(item => item.OrganId !== -1)
+      // console.log(this.checkedOrgs)
     },
-    async getOrganTree(name = '') {
+    async getOrganTree() {
       try {
-        const result = await tissueTreeList({
-          QueryName: name
-        })
+        const result = await GetOrganTreeNoReg()
         if (result.code === 0 && result.returnData.length) {
           const obj = {
             AuthCount: 0,

src/views/lotAuthorization/mixins/regulatorList.js

@@ -1,20 +1,50 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-11 11:08:35
- * @LastEditTime: 2022-04-11 11:36:39
+ * @LastEditTime: 2022-04-14 13:34:30
  * @LastEditors: your name
  * @Description: 监管单位列表
  * have a nice day!
  */
 
+import { GetRegList } from '@/api/section'
+
 export default {
   data() {
     return {
-      regulatorList: []
+      regulatorList: [],
+      checkedRegulators: []
     }
   },
   methods: {
-    regulatorCheckChangeHandler() {},
-    async loadRegulatorList(keyWords = '', pageSize = 20, pageNum = 1) {}
+    regulatorCheckChangeHandler(checkedKeys) {
+      this.checkedRegulators = this.regulatorList.filter(item => checkedKeys.includes(item.OrganId))
+      // console.log(this.checkedRegulators)
+    },
+    async loadRegulatorList(keyWords, pageSize = 20, pageNum = 1) {
+      try {
+        this.$refs['regulatorList'].setLoading(true)
+        const res = await GetRegList({
+          size: pageSize,
+          page: pageNum
+        })
+        if (res.code === 0) {
+          const { records, pages } = res.returnData
+          if (pageNum > 1) {
+            this.regulatorList.push(...records)
+          } else {
+            this.regulatorList = records
+          }
+          this.$refs['regulatorList'].setTotal(pages)
+          this.$refs['regulatorList'].setLoading(false)
+        } else {
+          this.$message.error(res.message)
+          this.$refs['regulatorList'].setLoading(false)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+        this.$refs['regulatorList'].setLoading(false)
+      }
+    }
   }
 }

src/views/lotAuthorization/mixins/sectionTree.js

@@ -1,30 +1,57 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-11 11:05:04
- * @LastEditTime: 2022-04-11 11:57:08
+ * @LastEditTime: 2022-04-14 13:32:01
  * @LastEditors: your name
  * @Description: 标段树
  * have a nice day!
  */
 
+import { translateDataToTreeAll } from '@/utils/validate'
+import { GetSections } from '@/api/section'
+
 export default {
   data() {
     return {
       sectionTree: [
         {
-          SectionId: -1,
-          SectionName: '标段1',
-          SectionUpid: -2,
+          SessionId: -1,
+          SessionName: '标段1',
+          UpSessionId: -2,
           disabled: true,
           children: []
         }
       ],
-      sectionCheckedKeys: [],
-      sectionList: []
+      sectionList: [],
+      checkedSections: [],
+      sectionCheckedKeys: []
     }
   },
+  mounted() {
+    this.getSectionTree()
+  },
   methods: {
-    sectionCheckChangeHandler() {},
-    async getSectionTree() {}
+    sectionCheckChangeHandler(arr) {
+      this.checkedSections = arr.filter(item => item.SessionId !== -1)
+      // console.log(this.checkedSections)
+    },
+    async getSectionTree() {
+      try {
+        const result = await GetSections()
+        if (result.code === 0 && result.returnData.length) {
+          const obj = {
+            SessionId: -1,
+            SessionName: '标段',
+            UpSessionId: -2,
+            disabled: true,
+            children: translateDataToTreeAll(result.returnData, 'UpSessionId', 'SessionId')
+          }
+          this.sectionList = result.returnData
+          this.sectionTree = [obj]
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
+    }
   }
 }

src/views/lotAuthorization/mixins/userList.js

@@ -0,0 +1,51 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-04-11 11:00:32
+ * @LastEditTime: 2022-04-14 13:34:22
+ * @LastEditors: your name
+ * @Description: 用户列表
+ * have a nice day!
+ */
+
+import { GetUserList } from '@/api/apiAuthority'
+
+export default {
+  data() {
+    return {
+      userList: [],
+      checkedUsers: []
+    }
+  },
+  methods: {
+    userCheckChangeHandler(checkedKeys) {
+      this.checkedUsers = this.userList.filter(item => checkedKeys.includes(item.UserId))
+      // console.log(this.checkedUsers)
+    },
+    async loadUserList(keyWords = '', pageSize = 20, pageNum = 1) {
+      try {
+        this.$refs['userList'].setLoading(true)
+        const res = await GetUserList({
+          QueryName: keyWords,
+          PageSize: pageSize,
+          PageIndex: pageNum
+        })
+        if (res.code === 0) {
+          const { records, pages } = res.returnData
+          if (pageNum > 1) {
+            this.userList.push(...records)
+          } else {
+            this.userList = records
+          }
+          this.$refs['userList'].setTotal(pages)
+          this.$refs['userList'].setLoading(false)
+        } else {
+          this.$message.error(res.message)
+          this.$refs['userList'].setLoading(false)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+        this.$refs['userList'].setLoading(false)
+      }
+    }
+  }
+}