From 9cf74048c492486259ccf2619e4d855baf371811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 23 Oct 2022 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=A7=92=E8=89=B2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=B7=E6=A0=BC=E5=B1=8F=E8=94=BD=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/RoleList.vue      |  3 ++
 .../src/views/system/modules/RoleModal.vue    | 35 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 09a3126d..287a55c4 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -134,6 +134,9 @@
           {
             title: '数据类型', align:"left", dataIndex: 'type', width: 100
           },
+          {
+            title: '价格屏蔽', align:"left", dataIndex: 'priceLimitStr', width: 100
+          },
           {
             title: '描述', align:"left", dataIndex: 'description', width: 150
           },
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index 00a0dc2d..1ab62f99 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -8,7 +8,7 @@
     @cancel="handleCancel"
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
-    style="top:25%;height: 50%;overflow-y: hidden">
+    style="top:20%;height: 60%;overflow-y: hidden">
     <template slot="footer">
       <a-button key="back" v-if="isReadOnly" @click="handleCancel">
         关闭
@@ -20,13 +20,20 @@
           <a-input placeholder="请输入角色名称" v-decorator.trim="[ 'name', validatorRules.name]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="数据类型">
+          <a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]" style="width:94%">
+            <a-select-option value="全部数据">全部数据</a-select-option>
+            <a-select-option value="本机构数据">本机构数据</a-select-option>
+            <a-select-option value="个人数据">个人数据</a-select-option>
+          </a-select>
           <a-tooltip title="1、全部数据-该角色对应的用户可以看到全部单据；2、本机构数据-该角色对应的用户可以看到自己所在机构的全部单据；
-          3、个人数据-该角色对应的用户只可以看到自己的单据。单据是指采购入库、销售出库等">
-            <a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]">
-              <a-select-option value="全部数据">全部数据</a-select-option>
-              <a-select-option value="本机构数据">本机构数据</a-select-option>
-              <a-select-option value="个人数据">个人数据</a-select-option>
-            </a-select>
+              3、个人数据-该角色对应的用户只可以看到自己的单据。单据是指采购入库、销售出库等">
+            <a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" />
+          </a-tooltip>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="价格屏蔽">
+          <j-select-multiple style="width:94%" placeholder="请选择价格屏蔽" v-model="priceLimitList.value" :options="priceLimitList.options"/>
+          <a-tooltip title="价格屏蔽支持多选，主要用于控制首页界面和物料的价格屏蔽">
+            <a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" />
           </a-tooltip>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
@@ -41,10 +48,14 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import {addRole,editRole,checkRole } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
   export default {
     name: "RoleModal",
+    components: {
+      JSelectMultiple
+    },
     data () {
       return {
         title:"操作",
@@ -59,6 +70,14 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
+        priceLimitList: {
+          options: [
+            { 'value': '1', 'text': '屏蔽采购价'},
+            { 'value': '2', 'text': '屏蔽零售价'},
+            { 'value': '3', 'text': '屏蔽销售价'}
+          ],
+          value: ''
+        },
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules:{
@@ -91,6 +110,7 @@
       edit (record) {
         this.form.resetFields();
         this.model = Object.assign({}, record);
+        this.priceLimitList.value = this.model.priceLimit
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'name', 'type', 'sort', 'description'))
@@ -108,6 +128,7 @@
           if (!err) {
             that.confirmLoading = true;
             let formData = Object.assign(this.model, values);
+            formData.priceLimit = this.priceLimitList.value
             let obj;
             if(!this.model.id){
               obj=addRole(formData);