From a038691e524e717da8242c3e4df5d153fc08b0f8 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Mon, 31 Oct 2022 17:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=94=B3=E8=AF=B7=202022?=
 =?UTF-8?q?=E5=B9=B410=E6=9C=8831=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auditManagement/authRuleApplicant.js  |  10 ++
 src/api/user.js                               |   4 +
 .../modules/auditManagement/auditRules.vue    | 105 ++++++++++++++++--
 src/views/modules/knifemold/receive.vue       |  15 +++
 4 files changed, 125 insertions(+), 9 deletions(-)
 create mode 100644 src/api/auditManagement/authRuleApplicant.js

diff --git a/src/api/auditManagement/authRuleApplicant.js b/src/api/auditManagement/authRuleApplicant.js
new file mode 100644
index 0000000..974ceab
--- /dev/null
+++ b/src/api/auditManagement/authRuleApplicant.js
@@ -0,0 +1,10 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 获取规则申请人信息
+export const getAuthRuleApplicantList = data => createAPI(`authRuleApplicant/getAuthRuleApplicantList`,'POST',data)
+
+export const saveAuthRuleApplicantList = data => createAPI(`authRuleApplicant/saveAuthRuleApplicantList`,'POST',data)
+
+
+
+
diff --git a/src/api/user.js b/src/api/user.js
index f50cd9f..3246cec 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -3,3 +3,7 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 // 修改用户默认语言
 export const updateUserLanguage = data => createAPI(`sys/user/updateUserLanguage`,'Post',data)
+
+
+// 获取用户列表
+export const userList = data => createAPI(`sys/user/userList`,'Post',data)
diff --git a/src/views/modules/auditManagement/auditRules.vue b/src/views/modules/auditManagement/auditRules.vue
index ce79bfa..0f4fd57 100644
--- a/src/views/modules/auditManagement/auditRules.vue
+++ b/src/views/modules/auditManagement/auditRules.vue
@@ -105,13 +105,14 @@
             fixed="right"
             header-align="center"
             align="center"
-            width="200"
+            width="240"
             :label="buttons.cz">
             <template slot-scope="scope">
               <a @click="initAuthStep(scope.row)">{{buttons.reviewer}}</a>
-              <a @click="initModel(scope.row)">{{buttons.edit}}</a>
-              <a @click="delAuditRules(scope.row)">{{buttons.delete}}</a>
-              <a v-if="scope.row.allToolType != 'Y'" @click="toolAuditRules(scope.row)">{{'设置工具类型'}}</a>
+              <a @click="initModel(scope.row)">| {{buttons.edit}}</a>
+              <a @click="delAuditRules(scope.row)">| {{buttons.delete}}</a>
+              <a v-if="scope.row.allToolType != 'Y'" @click="toolAuditRules(scope.row)"> | {{'设置工具类型'}}</a>
+              <a  v-if="scope.row.applicantFlag == 'Y'" @click="userToolAuditRules(scope.row)">{{'设置申请人'}}</a>
             </template>
           </el-table-column>
         </el-table>
@@ -157,9 +158,12 @@
         <el-form-item :label="'适用所有工具类型'">
           <el-checkbox v-model="saveAuditRuleData.allToolType"></el-checkbox>
         </el-form-item>
-
+        <el-form-item :label="'是否设置申请人'">
+          <el-checkbox v-model="saveAuditRuleData.applicantFlag"></el-checkbox>
+        </el-form-item>
         <el-form-item :label="inputSearch12">
-          <el-input style="width: 430px;" v-model="saveAuditRuleData.remark"></el-input>
+
+          <el-input style="width: 336px;" v-model="saveAuditRuleData.remark"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -317,11 +321,29 @@
 
     </span>
     </el-dialog>
+    <!-- 设置申请人-->
+    <el-dialog
+      style="font-size: 12px"
+      v-drag
+      :title="'设置申请人'"
+      :visible.sync="userVisible"
+      width="516px"
+      :append-to-body="true">
+      <el-transfer v-model="selectUserList" :data="userList" :titles="['未设置申请人列表', '已设置申请人列表']"></el-transfer>
+      <span slot="footer" class="dialog-footer">
+        <div style="margin-top: 5px">
+                <el-button type="primary" @click="saveUserToolAuditRules()">确定</el-button>
+                <el-button @click="userVisible = false" type="primary">取消</el-button>
+        </div>
+
+    </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-
+  import {userList} from "@/api/user.js"
   import column from "../common/column";
   import {
     searchSysLanguageParam,
@@ -342,6 +364,10 @@
     saveUserFavorite,
     removeUserFavorite
   } from '@/api/userFavorite.js'
+  import {
+    getAuthRuleApplicantList,
+    saveAuthRuleApplicantList
+  } from '@/api/auditManagement/authRuleApplicant.js'
   import {
     getAuthRuleList,
     saveAuthRule,
@@ -368,12 +394,16 @@
     },
     data() {
       return {
+        userVisible: false,
+        selectAuthRule: {},
+        userList: [],
+        selectUserList: [],
         toolVisible: false,
         partFamilyList: [],
         selectPartFamilyList: [],
         selectRow: '',
         saveAuditRuleData: {
-          recordTypeDb: '',
+          recordTypeDb: 1,
           ruleId: '',
           ruleDesc: '',
           site: this.$store.state.user.site,
@@ -391,6 +421,7 @@
           element4: '',
           byElement4: '',
           allToolType: true,
+          applicantFlag: false,
         },
         authStepData: {
           id: 0,
@@ -857,6 +888,59 @@
       this.getBusinessRoleList()
     },
     methods: {
+      // 获取所有用户列表
+      userToolAuditRules(row) {
+        this.selectAuthRule = row
+        this.userVisible = true
+        this.searchUserList()
+      },
+      // 获取所有用户列表
+      searchUserList() {
+        userList({site: this.site, status: 1}).then(({data}) => {
+          if (data && data.code == 0) {
+            this.userList = data.list.map(item => {
+              let newItem = {
+                key: item.username,
+                label: item.username + " - " + item.userDisplay,
+              }
+              return newItem
+            })
+            this.searchUserToolAuditRulesList()
+          }
+        })
+      },
+      // 获取以设置的申请人列表
+      searchUserToolAuditRulesList() {
+        getAuthRuleApplicantList({authRuleId: this.selectAuthRule.ruleId}).then(({data}) => {
+          if (data && data.code == 0) {
+            this.selectUserList = data.data.map(item => {
+              return item.userName
+            })
+          }
+        })
+      },
+      // 保存规则对应申请人
+      saveUserToolAuditRules() {
+       let authRuleApplicants = this.selectUserList.map( item => {
+          let newItem= {
+              authRuleId:this.selectAuthRule.ruleId,
+              userName:item ,
+          }
+          return newItem
+        })
+        let dto = {
+          authRuleId : this.selectAuthRule.ruleId,
+          authRuleApplicants : authRuleApplicants,
+        }
+        saveAuthRuleApplicantList(dto).then(({data}) => {
+          if (data && data.code == 0){
+            this.$message.success(data.msg)
+            this.userVisible = false
+          }else {
+            this.$message.success(data.msg)
+          }
+        })
+      },
       // 设置工具类型
       toolAuditRules(row) {
         this.toolVisible = true
@@ -1147,6 +1231,7 @@
         this.saveAuditRuleData.minValue = 0
         this.saveAuditRuleData.maxValue = 0
         this.saveAuditRuleData.allToolType = this.saveAuditRuleData.allToolType ? 'Y' : 'N'
+        this.saveAuditRuleData.applicantFlag = this.saveAuditRuleData.applicantFlag ? 'Y' : 'N'
         saveAuthRule(this.saveAuditRuleData).then(({data}) => {
           if (data.code == 0) {
             this.getDataList()
@@ -1168,7 +1253,7 @@
         this.setUp.saveButton = false
         if (row == null) {
           this.saveAuditRuleData.id = 0
-          this.saveAuditRuleData.recordTypeDb = ''
+          this.saveAuditRuleData.recordTypeDb = 1
           this.saveAuditRuleData.ruleId = ''
           this.saveAuditRuleData.ruleDesc = ''
           this.saveAuditRuleData.priority = 0
@@ -1185,6 +1270,7 @@
           this.saveAuditRuleData.byElement4 = ''
           this.saveAuditRuleData.remark = ''
           this.saveAuditRuleData.toolType = true
+          this.saveAuditRuleData.applicantFlag = false
         } else {
           this.saveAuditRuleData.id = row.id
           this.saveAuditRuleData.recordTypeDb = Number(row.recordTypeDb)
@@ -1203,6 +1289,7 @@
           this.saveAuditRuleData.byElement4 = row.byElement4
           this.saveAuditRuleData.remark = row.remark
           this.saveAuditRuleData.allToolType = row.allToolType == 'Y' ? true : false
+          this.saveAuditRuleData.applicantFlag = row.applicantFlag == 'Y' ? true : false
           if (row.active == "启用") {
             this.saveAuditRuleData.active = 'Y'
           } else {
diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index 7fad6ab..9e6d9ad 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -184,6 +184,16 @@
                                                    style="width: 100px; height: 80px"/></span>
               </template>
             </el-table-column>
+            <el-table-column
+              header-align="center"
+              width="40"
+              fixed="right"
+              :label="buttons.cz"
+              align="center">
+              <template slot-scope="scope">
+                <el-link @click="deleteTool(scope.row)">{{buttons.delete}}</el-link>
+              </template>
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>
@@ -735,6 +745,7 @@
           objectType: 'button'
         },
         buttons: {
+          cz: '操作',
           receive: '接收',
           add: '添加',
           edit: '编辑',
@@ -881,6 +892,10 @@
       }
     },
     methods: {
+      // 删除工具接收信息
+      deleteTool(){
+
+      },
       childByValue(childValue) {
         // childValue就是子组件传过来的值
         this.fileList.push(childValue)