qymljy пре 2 година
родитељ
комит
20866b8099

+ 19 - 10
src/Form/marketing2/saler/add.vue

@@ -4,13 +4,13 @@
     <el-drawer
         title="创建业务员"
         :visible.sync="dialogVisible"
-        size="20%"
+        size="25%"
         direction="rtl"
         append-to-body
         @close="dialogVisible = false">
       <div class="drawer__panel">
         <el-row>
-          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small">
+          <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="110px" size="small">
             <el-col :span="24">
               <el-form-item label="业务员:" prop="hrid">
                 <selectMenber  @selectMenber="selectMenber"></selectMenber>
@@ -46,15 +46,20 @@
                 <el-input  v-model="form.areaname" placeholder="区域" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item  label="最低授权折扣:" prop="discountrate">
+                <el-input  v-model="form.discountrate" placeholder="最低授权折扣" ></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
-<!--    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">
+<!--    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+
       <div>
         <p class="normal-title normal-margin">业务员信息</p>
 
@@ -79,12 +84,16 @@ export default {
       dialogVisible:false,
       form:{
         "sa_saleareaid":'',
-        "hrid":''
+        "hrid":'',
+        "discountrate":''
       },
       rules:{
         hrid:[
           { required: true, message: '请选择业务员', trigger: 'blur' },
           { required: true, message: '请选择业务员', trigger: 'change' },
+        ],
+        discountrate:[
+          { required: true, message: '请输入最低授权折扣', trigger: 'blur' },
         ]
       }
     }
@@ -100,6 +109,8 @@ export default {
     },
     onSubmit () {
       console.log(this.dataToForm)
+      this.form.sa_saleareaid = this.dataToForm.sa_saleareaid
+      console.log(this.form)
       this.$refs['form'].validate((valid) => {
         if (!valid) return false
         this.$confirm('确定将此人设置为业务员吗?', '提示', {
@@ -109,10 +120,7 @@ export default {
         }).then(async () => {
           const res = await this.$api.requested({
             "id":20221011144703,
-            "content": {
-              "sa_saleareaid":this.dataToForm.sa_saleareaid,
-              "hrid":this.form.hrid
-            }
+            "content": this.form
           })
           this.tool.showMessage(res,()=>{
             this.dialogVisible = false
@@ -120,7 +128,8 @@ export default {
             this.$emit('onSuccess')
             this.form = {
               "sa_saleareaid":'',
-              "hrid":''
+              "hrid":'',
+              "discountrate":''
             }
           })
         }).catch((err) => {

+ 9 - 3
src/Form/marketing2/saler/edit.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="onShow(dialogVisible = true)">编 辑</el-button>
+    <el-button  size="mini" @click="onShow(dialogVisible = true)">编 辑</el-button>
     <el-drawer
-        title="创建业务员"
+        title="编辑业务员"
         :visible.sync="dialogVisible"
         size="20%"
         direction="rtl"
@@ -13,7 +13,7 @@
           <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small">
             <el-col :span="24">
               <el-form-item label="业务员:" prop="hrid">
-                <selectMenber  @selectMenber="selectMenber"></selectMenber>
+                <selectMenber ref="salerName"  @selectMenber="selectMenbers"></selectMenber>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -83,6 +83,12 @@ export default {
   methods:{
     onShow(){
       this.form = this.data
+      console.log(this.$refs)
+      this.$refs.salerName.value.name = this.data.salername
+    },
+    selectMenbers (data) {
+      console.log(data)
+      this.form = Object.assign({},this.form,data)
     },
     onSubmit(){
 

+ 5 - 0
src/HManagement/marketing2/saler/area/detail/index.vue

@@ -7,6 +7,7 @@
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221011144603"
+        delApiId="20221011144803"
         idname="sa_salearea_hrid"
         ownertable="sa_salearea_hr"
         tags=""
@@ -83,6 +84,10 @@ export default {
         {
           label:'汇报对象',
           value:this.mainData.reporthrname
+        },
+        {
+          label:'最低权限折扣率',
+          value:this.mainData.discountrate
         }
       ]
     },

+ 1 - 1
src/HManagement/marketing2/saler/index.vue

@@ -8,7 +8,7 @@
         ref="basicLayout" 
         formPath="marketing2/saler"
         tableName="salerTable" 
-        :idName="['sa_saleareaid','sa_salearea_hrid']"
+        :idName="['sa_saleareaid','sa_salearea_hrid','hrid']"
         :apiId="{query:20221011144603,del:20221011144803}"
         :autoQuery="false"
         :options="options"

+ 7 - 5
src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -83,7 +83,7 @@
             <el-table-column
                 prop="itemclass"
                 label="类别"
-                width="180">
+                width="0">
               <template slot-scope="scope">
                 <p v-for="(item,index) in scope.row.itemclass">
                   <span style="float: left" v-if="index === scope.row.itemclass.length -1">{{item?item.itemclassname+'':'--'}}</span>
@@ -148,6 +148,7 @@ export default {
       currentPage:0,
       tableSelectData:[],
       selectData:[],
+      sa_quotedpriceid:'',
       params:{
         "id": 20221020164903,
         "version":1,
@@ -198,13 +199,14 @@ export default {
       console.log(id,"报价单id五")
       this.type = type
       console.log(this.type)
-      this.productData(id)
+      this.sa_quotedpriceid = id
+      this.productData()
     },
     /*产品配置信息*/
-    async productData(id){
+    async productData(){
       console.log("执行")
-      console.log(id,"报价单id四")
-      this.params.content.sa_quotedpriceid = id
+      console.log(this.sa_quotedpriceid,"报价单id四")
+      this.params.content.sa_quotedpriceid = this.sa_quotedpriceid
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total

+ 1 - 1
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -94,7 +94,7 @@ export default {
         },
         {
           label:'项目编号',
-          value:this.mainData.sa_projectid
+          value:this.mainData.projectnum
         },
         {
           label:'项目名称',

+ 1 - 1
src/router/HManagement.js

@@ -155,7 +155,7 @@ const HManagement = [
     children: [
       {
         path: '/saler_detail',
-        name: 'salermag',
+        name: 'salerManage',
         meta: {
           title: '业务员详情',
           ast_nav: true,

+ 0 - 1
src/utils/tool.js

@@ -16,7 +16,6 @@ export default {
       let auth_list = active_apps[0].meta.auth
       // 判断是否拥有权限
       let _haveAuth = auth_list.some(item=>item.option === auth)
-
       return _haveAuth
       
     } catch (error) {