Sfoglia il codice sorgente

用户管理调整

qymljy 3 mesi fa
parent
commit
34ee987e62

+ 12 - 0
src/HManagement/accountManage/modules/account_detail.vue

@@ -160,6 +160,10 @@ export default {
             {label:this.$t('身份证号'),value:this.accountInfo.idcard},
             {label:this.$t('性别'),value:this.accountInfo.sex},
             {label:this.$t('是否服务人员'),value:this.accountInfo.isworker === 1?this.$t('是'):this.$t('否')},
+            {
+              label:this.$t('商品授权管控'),
+              value:this.mainData.is_control_product?'是':'否'
+            }
           ]
         },{
           title:this.$t('系统信息'),
@@ -196,6 +200,10 @@ export default {
             {label:this.$t('订单可退货天数'),value:this.accountInfo.limitreturnday},
             {label:this.$t('是否订单审核可开票'),value:this.accountInfo.invoicingpoint == '1' ? this.$t('订单审核') : this.$t('发货')},
             {label:this.$t('是否授权所有营销类别'),value:this.accountInfo.saleclassauth ? this.$t('否') : this.$t('是')},
+            {
+              label:this.$t('商品授权管控'),
+              value:this.mainData.is_control_product?'是':'否'
+            },
             {label:this.$t('创建人'),value:this.accountInfo.createby},
             {label:this.$t('创建时间'),value:this.accountInfo.createdate},
           ]
@@ -219,6 +227,10 @@ export default {
         {
           label:this.$t('联系方式'),
           value:this.mainData.phonenumber
+        },
+        {
+          label:this.$t('商品授权管控'),
+          value:this.mainData.is_control_product?'是':'否'
         }
       ]
       console.log(this.mainAreaData)

+ 18 - 6
src/HManagement/accountManage/modules/add.vue

@@ -12,9 +12,9 @@
       @close="onClose">
       <div class="drawer__panel">
         <el-row>
-          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right" :label-width="tool.onlyZh('110px')" >
             <el-col :span="24">
-              <el-form-item :label="$t(`手机号码`)" :label-width="tool.onlyZh('80px')" prop="phonenumber">
+              <el-form-item :label="$t(`手机号码`)" prop="phonenumber">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -26,17 +26,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`账号`)" :label-width="tool.onlyZh('80px')" prop="accountno">
+              <el-form-item :label="$t(`账号`)"  prop="accountno">
                 <el-input v-model="form.accountno" :disabled="!!isSelectPhone" autocomplete="off" :placeholder="$t(`账号`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`用户名称`)" :label-width="tool.onlyZh('80px')" prop="name">
+              <el-form-item :label="$t(`用户名称`)"  prop="name">
                 <el-input  v-model="form.name" :disabled="!!isSelectPhone" autocomplete="off" :placeholder="$t(`用户名称`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="isSelectPhone">
-              <el-form-item :label="$t(`用户类型`)" :label-width="tool.onlyZh('80px')" prop="usertype">
+              <el-form-item :label="$t(`用户类型`)"  prop="usertype">
                 <el-select v-model="form.usertype" style="width:100%" :placeholder="$t('请选择')">
                   <el-option
                     v-for="item in selectType"
@@ -48,7 +48,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`授权角色`)" :label-width="tool.onlyZh('80px')" prop="roleids">
+              <el-form-item :label="$t(`授权角色`)"  prop="roleids">
                 <!-- <el-input v-model="form.sex" autocomplete="off" :placeholder="$t(`输入性别`)"></el-input> -->
                 <el-select v-model="form.roleids" style="width:100%" :placeholder="$t('请选择')" multiple>
                   <el-option
@@ -62,6 +62,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`商品授权管控`)"  prop="is_control_product">
+                <el-radio-group v-model="form.is_control_product">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -100,6 +108,9 @@ export default {
         usertype: [
           { required: true, message: this.$t('请选择用户类型'), trigger: 'change' }
         ],
+        is_control_product: [
+          { required: true, message: this.$t('请设置商品授权管控'), trigger: 'change' }
+        ],
       },
       form:{
         "userid": 0,
@@ -109,6 +120,7 @@ export default {
         "remarks":"",
         "roleids":[],
         "accountno":'',
+        "is_control_product":1
       },
       options:[],
       pepoleParam: {

+ 21 - 8
src/HManagement/accountManage/modules/edit.vue

@@ -11,29 +11,29 @@
       append-to-body>
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form"  size="small" label-position="right">
+          <el-form :model="form" :rules="rules" ref="form"  size="small" label-position="right" :label-width="tool.onlyZh('110px')">
             <el-col :span="12">
-              <el-form-item :label="$t(`账号`)" :label-width="tool.onlyZh('100px')">
+              <el-form-item :label="$t(`账号`)" prop="accountno">
                 <el-input v-model="form.accountno" readonly autocomplete="off" :placeholder="$t(`账号`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`手机号码`)" :label-width="tool.onlyZh('100px')" prop="phonenumber">
+              <el-form-item :label="$t(`手机号码`)"  prop="phonenumber">
                 <el-input v-model="form.phonenumber" autocomplete="off" :placeholder="$t(`请输入手机号码`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`用户类型`)" :label-width="tool.onlyZh('100px')">
+              <el-form-item :label="$t(`用户类型`)" prop="usertypename">
                 <el-input v-model="form.usertypename" readonly autocomplete="off" :placeholder="$t(`用户类型`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`用户名称`)" :label-width="tool.onlyZh('100px')" prop="name">
+              <el-form-item :label="$t(`用户名称`)"  prop="name">
                 <el-input  v-model="form.name" autocomplete="off" :placeholder="$t(`用户名称`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`授权角色`)" :label-width="tool.onlyZh('100px')" prop="roleids">
+              <el-form-item :label="$t(`授权角色`)"  prop="roleids">
                 <!-- <el-input v-model="form.sex" autocomplete="off" :placeholder="$t(`输入性别`)"></el-input> -->
                 <el-select v-model="form.roleids" style="width:100%" :placeholder="$t('请选择')" multiple>
                   <el-option
@@ -47,6 +47,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`商品授权管控`)"  prop="is_control_product">
+                <el-radio-group v-model="form.is_control_product">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -76,6 +84,9 @@ export default {
         roleids: [
           { required: true, message: this.$t('请选择授权角色'), trigger: 'change' }
         ],
+        is_control_product: [
+          { required: true, message: this.$t('请设置商品授权管控'), trigger: 'change' }
+        ],
       },
       form:{
         "userid": 0,
@@ -83,7 +94,8 @@ export default {
         "phonenumber": "",
         "status": 1,
         "remarks":"",
-        "roleids":[]
+        "roleids":[],
+        "is_control_product":''
       },
       showTips:false,
       options:[]
@@ -130,7 +142,8 @@ export default {
             "phonenumber": this.form.phonenumber,
             "remarks":this.form.remarks,
             "roleids":this.form.roleids,
-            "accountno":this.form.accountno
+            "accountno":this.form.accountno,
+            "is_control_product":this.form.is_control_product
           }
         }).then(res=>{
           this.tool.showMessage(res,()=>{

File diff suppressed because it is too large
+ 0 - 3
src/HManagement/siteManage/securityConfig/index.vue


Some files were not shown because too many files changed in this diff