上传

src/Form/QuotedPrice/edit.vue

@@ -269,6 +269,18 @@
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
+            <el-col  :span="24">
+              <el-form-item label="业务员:" label-width="100px" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman  ref="selectSalesman"  :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange" v-model="form.name" placeholder="请选择业务员"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
             <el-col  :span="24">
               <el-form-item label="备注:" label-width="100px" prop="remarks">
                 <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
@@ -302,10 +314,11 @@
 <script>
 import quotedPriceProduct from '@/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct'
 import quotedPriceItemClass from "@/SDrpManagement/QuotedPrice/components/edit/quotedPriceItemClass";
+import selectSalesman from '@/SDrpManagement/QuotedPrice/components/selectSalesman'
 export default {
   name: "edit",
   props:['data','btnType'],
-  components:{quotedPriceProduct,quotedPriceItemClass},
+  components:{quotedPriceProduct,quotedPriceItemClass,selectSalesman},
   data(){
     var discountrate = (rule,value,callback) =>{
       if (this.form.discountrate < 0 || this.form.discountrate > 100){
@@ -318,6 +331,7 @@ export default {
       projectShow:false,
       customerShow:false,
       contactsShow:false,
+      salesmanVisible:false,
       disabled:false,
       userInfo:JSON.parse(window.sessionStorage.getItem('userInfo')),
       primary:'primary',
@@ -385,6 +399,14 @@ export default {
       isQuotedPrice:false,
       date:[],
       clearData:[],
+      salerParam:{
+        "id":20230306144402,
+        "content":{
+          "type":'',////type:1客户2:项目
+          "sys_enterpriseid":'',//type=1
+          "sa_projectid":'' //type=2时传
+        }
+      },
       form:{
         quotedpricetype:'',
         totalPrice:0,
@@ -408,6 +430,8 @@ export default {
         billdate:"",
         enddate:'',
         begdate:'',
+        saler_hrid:'',
+        salername:'',
         date:[],
         itemtype:[],
         quotedpricenotes: [
@@ -455,6 +479,7 @@ export default {
       this.drawer = true
       console.log("编辑内容3",this.data)
       this.form = Object.assign({},this.form,this.data)
+      console.log("编辑内容3",this.data)
       this.form.date[0] = this.form.begdate
       this.form.date[1] = this.form.enddate
       this.form.discountrate = Math.round((this.form.discountrate * 100)*100)/100
@@ -594,6 +619,9 @@ export default {
       this.form.fax = ''
       this.form.telephone = ''
       this.projectShow = false
+      this.salerParam.content.type = 2
+      this.salerParam.content.sa_projectid = this.form.sa_projectid
+      this.querySalesman()
     },
     /*更改项目前提示*/
     projectOpen(val) {
@@ -648,6 +676,11 @@ export default {
       this.form.fax = ''
       this.form.telephone = ''
       this.customerShow = false
+      if (!this.isQuotedPrice){
+        this.salerParam.content.type = 1
+        this.salerParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.querySalesman()
+      }
     },
     /*联系人选择信息*/
     contactsData(val){
@@ -697,6 +730,37 @@ export default {
         this.itemtype = res.data
       })
     },
+    /*业务员*/
+    showChange(){
+      this.salesmanVisible = true
+      if (this.isQuotedPrice){
+        this.$refs.selectSalesman.param.content.type = 2
+        this.$refs.selectSalesman.param.content.sa_projectid = this.form.sa_projectid
+        this.$refs.selectSalesman.listData()
+      }else {
+        this.$refs.selectSalesman.param.content.type = 1
+        this.$refs.selectSalesman.param.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.$refs.selectSalesman.listData()
+      }
+
+    },
+    salesmanChange(data){
+      console.log(data,"业务员")
+      this.form.saler_hrid = data[0].hrid
+      this.form.salername = data[0].name
+      this.form.name = data[0].name
+      this.salesmanVisible = false
+
+      /*   this.form.salername = data[0].name
+         this.form.saler_hrid = data[0].hrid
+         this.salesmanVisible = false*/
+    },
+    async querySalesman(){
+      const res = await this.$api.requested(this.salerParam)
+      this.form.salername = res.data[0].name
+      this.form.name = data[0].name
+      this.form.saler_hrid = res.data[0].hrid
+    }
    /* async mainData(val) {
       const res = await this.$api.requested({
         "id": 20220930103501,

src/Form/contractManage/add.vue

@@ -8,7 +8,7 @@
         <el-dropdown-item command="框架">经销商合作协议</el-dropdown-item>
         <el-dropdown-item command="经销项目">经销项目协议</el-dropdown-item>
         <el-dropdown-item command="直销项目">直销项目协议</el-dropdown-item>
-        <el-dropdown-item command="工具借用">工具使用协议</el-dropdown-item>
+        <el-dropdown-item command="工具借用">工具借用协议</el-dropdown-item>
         <el-dropdown-item command="居间">居间协议</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -61,11 +61,13 @@ export default {
     },
     DrawerShow (val) {
       val ? this.drawer = true : this.drawer = false
+
     }
   },
   methods:{
     closeDrawer () {
       this.$store.dispatch('DrawerShowChange',false)
+      console.log("关闭1111")
     },
     addBtn (type) {
       this.$store.dispatch('DrawerShowChange',true)

src/HDrpManagement/contractManage/components/addContract.vue

@@ -25,13 +25,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
+              <el-form-item label="业务员:" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+<!--                  <selectAgent type="5" ref="member"   :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>-->
+                  <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="24">
               <el-form-item label="业务员:" prop="">
                   <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -68,7 +81,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item label="合同模板:" prop="type">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
@@ -84,7 +97,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="140px" size="small">
             <el-col :span="24">
               <el-form-item label="合同标题:" prop="title">
-                <el-input type="text" size="small" v-model="form.title"></el-input>
+                <el-input type="text" size="small" v-model="form.title" placeholder="请输入合同标题"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -95,7 +108,7 @@
                   v-model="agentVisible"
                   width="500">
                   <selectAgent type="5" ref="member" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择经销商"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -107,23 +120,30 @@
                   v-model="projectVisible"
                   width="600">
                   <seleteProject ref="project" type="2" :sys_enterpriseid='form.sys_enterpriseid' @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
-                  <el-input readonly type="text" slot="reference" size="small" v-model="form.projectname" @focus="showChange('projectVisible')"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" v-model="form.projectname" @focus="showChange('projectVisible')" placeholder="请选择项目"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目编号:" prop="">
-                <el-input disabled type="text" size="small" v-model="form.projectnum" ></el-input>
+                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+              <el-form-item label="业务员:" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -165,7 +185,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item label="合同模板:" prop="type">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
@@ -181,7 +201,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="140px" size="small">
             <el-col :span="24">
               <el-form-item label="合同标题:" prop="title">
-                <el-input type="text" size="small" v-model="form.title"></el-input>
+                <el-input type="text" size="small" v-model="form.title" placeholder="请输入合同标题"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -192,7 +212,7 @@
                   v-model="accountVisible"
                   width="500">
                   <selectAgent type="7" ref="member"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename" placeholder="请选择客户"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -204,23 +224,30 @@
                   v-model="projectVisible"
                   width="600">
                   <seleteProject ref="project" type="1" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('projectVisible')" v-model="form.projectname"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('projectVisible')" v-model="form.projectname" placeholder="请选择项目"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目地址:" prop="">
-                <el-input disabled type="text" size="small" v-model="address"></el-input>
+              <el-form-item label="项目地址:" prop="address">
+                <el-input disabled type="text" size="small" v-model="address" placeholder="请选择项目地址"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+              <el-form-item label="业务员:" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -253,7 +280,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="收货人电话:" prop="">
+              <el-form-item label="收货人电话:" prop="phonenumber">
                 <el-input disabled type="text" size="small" v-model="form.phonenumber"></el-input>
               </el-form-item>
             </el-col>
@@ -279,7 +306,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item label="合同模板:" prop="type">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
@@ -295,7 +322,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="140px" size="small">
             <el-col :span="24">
               <el-form-item label="合同标题:" prop="title">
-                <el-input type="text" size="small" v-model="form.title"></el-input>
+                <el-input type="text" size="small" v-model="form.title" placeholder="请输入合同标题"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -305,22 +332,30 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="600">
-<!--                  <selectAgent type="2" ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>-->
-                  <!-- <el-tabs v-model="activeName" @tab-click="tabClick">
-                    <el-tab-pane label="企业" name="企业">
+
+                   <el-tabs v-model="activeName" @tab-click="tabClick">
+                    <el-tab-pane label="客户" name="客户">
+                      <selectAgent ref="member" type="7"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                     </el-tab-pane>
                     <el-tab-pane label="经销商" name="经销商">
-                      <selectAgent ref="member" type="5" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                      <selectAgent ref="member" type="5"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                     </el-tab-pane>
-                  </el-tabs> -->
-                  <selectAgent ref="member" type="10"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
+                  </el-tabs>
+<!--                  <selectAgent ref="member" type="10"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>-->
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename" placeholder="请选择企业"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+              <el-form-item label="业务员:" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -340,12 +375,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="单套价格(元)" prop="">
+              <el-form-item label="单套价格(元)" prop="signamount">
                 <el-input type="text" disabled size="small" placeholder="系统自动计算" v-model="form.signamount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item label="合同模板:" prop="type">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
@@ -361,7 +396,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="135px" size="small">
             <el-col :span="24">
               <el-form-item label="合同标题:" prop="title">
-                <el-input type="text" size="small" v-model="form.title"></el-input>
+                <el-input type="text" size="small" v-model="form.title" placeholder="请输入合同标题"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -374,7 +409,7 @@
 
                   <selectAgent ref="member" type="5" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
 
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择居间商"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -386,23 +421,30 @@
                   v-model="concratVisible"
                   width="600">
                   <seleteProjectContract   ref="project" @onSelect="concratChange" @onCanel="concratVisible=false" ></seleteProjectContract>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('concratVisible')" v-model="form.ascription_title"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('concratVisible')" v-model="form.ascription_title" placeholder="请选择项目合同"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目名称:" prop="projectname">
-                <el-input disabled type="text" size="small" v-model="form.projectname"></el-input>
+                <el-input disabled type="text" size="small" v-model="form.projectname" placeholder="请选择项目"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目编号:" prop="projectnum">
-                <el-input disabled type="text" size="small" v-model="form.projectnum"></el-input>
+                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="项目编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="业务员:" prop="">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+              <el-form-item label="业务员:" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -416,7 +458,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="计算方式" prop="">
+              <el-form-item label="计算方式" prop="calculatemodel">
                 <el-radio-group v-model="form.calculatemodel">
                   <el-radio label="1">按订单金额比例计算</el-radio>
                   <el-radio label="2">按居间产品折扣计算</el-radio>
@@ -425,12 +467,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio"></el-input>
+                <el-input type="text" size="small" v-model.number="form.orderratio"  placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount"></el-input>
+                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -441,7 +483,7 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="合同模板:" prop="">
+              <el-form-item label="合同模板:" prop="type">
                 <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
               </el-form-item>
             </el-col>
@@ -470,9 +512,10 @@ import seleteProjectContract from './seleteProjectContract'
 import TimeSelect from './TimeSelect'
 import selectModel from './seleteModel'
 import seleteReceipt from './seleteReceipt'
+import selectSalesman from './selectSalesman'
 export default {
   name: '',
-  components:{selectPople,TimeSelect,seleteProject,selectAgent,selectModel,seleteProjectContract,seleteReceipt},
+  components:{selectPople,TimeSelect,seleteProject,selectAgent,selectModel,seleteProjectContract,seleteReceipt,selectSalesman},
   data () {
     var checkNumber = (rule, value, callback) => {
       if (typeof +value != 'number') {
@@ -482,7 +525,7 @@ export default {
     }
     var NumberSize = (rule, value, callback) => {
       if (+value > 100 || +value < 0 && value) {
-        return callback(new Error('折扣范围(0-100)'));
+        return callback(new Error('折扣范围(0-100%)'));
       }
       callback()
     }
@@ -501,7 +544,7 @@ export default {
       }
     }
     return {
-      activeName: '企业',
+      activeName: '客户',
       agentVisible:false,
       salerVisible:false,
       projectVisible:false,
@@ -509,6 +552,7 @@ export default {
       modelVisible:false,
       concratVisible:false,
       receiptVisible:false,
+      salesmanVisible:false,
       modelList:[],
       /* 新建居间项目时 所关联的居间商 */
       centerEnterpriseList:[],
@@ -524,13 +568,15 @@ export default {
         "sa_projectid": "", //可选
         "type": "", //可选
         "discountrate": '', //可选
-        "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+        /*"saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选*/
+        "saler_hrid":'',
         "signdate": "", //可选
         "signby": "", //可选
         "remarks": "", //可选
         "title": "",
         "signamount":'',
-        "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+        /*"salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,*/
+        "salername":'',
         "enterprisename":'',
         "sys_printmodelid": '',//可选
         "typemx":"",//可选
@@ -584,10 +630,14 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         salername: [
           { required: true, message: '请选择经销商', trigger: 'change' },
@@ -619,6 +669,14 @@ export default {
           }
         }
       },
+      salsemanParam:{
+        "id":20230305201202,
+        "content":{
+          "type":'',//type:1经销商合作协议,2:经销项目协议,直销项目协议,居间协议,3:工具借用协议
+          "sys_enterpriseid":'',//type=1或3时传
+          "sa_projectid":'' //type=2时传
+        }
+      }
     };
   },
   computed: {
@@ -632,6 +690,7 @@ export default {
         if (!val) {
           this.showChange(false)
           if (this.$refs.form) this.$refs.form.resetFields()
+          this.onCancel()
           this.$refs.timeSelect.time = ''
           
           
@@ -647,7 +706,8 @@ export default {
         
       },
       immediate:true,
-    }
+    },
+
   },
   created () {
     this.form = {
@@ -660,13 +720,15 @@ export default {
       "sa_projectid": "", //可选
       "type": "", //可选
       "discountrate": '', //可选
-      "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+      /*"saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选*/
+      "saler_hrid":"",
       "signdate": "", //可选
       "signby": "", //可选
       "remarks": "", //可选
       "title": "",
       "signamount":'',
-      "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+      /*"salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,*/
+      "salername":"",
       "enterprisename":'',
       "sys_printmodelid": '',//可选
       "typemx":"",//可选
@@ -752,6 +814,7 @@ export default {
     },
     onCancel () {
       this.$store.dispatch('DrawerShowChange',false)
+      this.$refs.form.resetFields()
       this.form = {
         "sa_contractid": 0,
         "sys_enterpriseid": "",
@@ -762,13 +825,15 @@ export default {
         "sa_projectid": "", //可选
         "type": "", //可选
         "discountrate": '', //可选
-        "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+        /*"saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选*/
+        "saler_hrid":'',
         "signdate": "", //可选
         "signby": "", //可选
         "remarks": "", //可选
         "title": "",
         "signamount":'',
-        "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+        /*"salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,*/
+        "salername":'',
         "enterprisename":'',
         "sys_printmodelid": '',//可选
         "typemx":"",//可选
@@ -782,9 +847,20 @@ export default {
         "rec_contactsid":'',//收货联系人
         'phonenumber':''
       }
+      this.$refs.member.selected = []
+      this.$refs.selectSalesman.selected = []
+      this.address = ''
+      this.agentVisible = false
+      this.salerVisible = false
+      this.projectVisible = false
+      this.accountVisible = false
+      this.modelVisible = false
+      this.concratVisible = false
+      this.receiptVisible = false
+      this.salesmanVisible = false
+
     },
     showChange (key) {
-
       this.agentVisible = false
       this.salerVisible = false
       this.projectVisible = false
@@ -792,8 +868,7 @@ export default {
       this.modelVisible = false
       this.concratVisible = false
       this.receiptVisible = false
-      console.log(key,"key的值")
-
+      this.salesmanVisible = false
       if (key === 'projectVisible'){
         if (this.form.sys_enterpriseid !== ''){
           this.$refs.project.params.content.sys_enterpriseid = this.form.sys_enterpriseid
@@ -816,18 +891,36 @@ export default {
       }else if(key === 'concratVisible'){
         this.$refs.project.queryEnterpriseArchives()
         key ? this[key] = true : ''
+      }else if(key === 'salesmanVisible'){
+        this.$refs.selectSalesman.listData()
+        key ? this[key] = true : ''
       }else {
         key ? this[key] = true : ''
       }
-
       this.$refs.member.listData()
-
-
     },
     agentChange (data) {
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
-      this.form.enterprisename = data[0].enterprisename   
-      this.agentVisible = false 
+      this.form.enterprisename = data[0].enterprisename
+      this.agentVisible = false
+      if (this.$route.query.type == '框架'){
+        this.salsemanParam.content.type = 1
+        this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.querySalse()
+      }
+
+    },
+    async querySalse(){
+      const res = await this.$api.requested(this.salsemanParam)
+      console.log("res",res)
+      this.form.salername = res.data[0].name
+      this.form.saler_hrid = res.data[0].hrid
+    },
+    salesmanChange(data){
+      console.log(data,"业务员")
+      this.form.salername = data[0].name
+      this.form.saler_hrid = data[0].hrid
+      this.salesmanVisible = false
     },
     salerChange (data) {
       this.form.saler_hrid = data[0].hrid
@@ -840,6 +933,9 @@ export default {
       this.form.sa_projectid = data.sa_projectid
       this.address = data.province + data.city + data.county + data.address
       this.projectVisible = false
+      this.salsemanParam.content.type = 2
+      this.salsemanParam.content.sa_projectid = this.form.sa_projectid
+      this.querySalse()
     },
     receiptChange (data) {
       this.form.receiptName = data.name
@@ -851,6 +947,9 @@ export default {
       this.form.enterprisename = data[0].enterprisename
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
       this.accountVisible = false
+      this.salsemanParam.content.type = 3
+      this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+      this.querySalse()
     },
     centerChange (data) {
       this.form.enterprisename = data[0].enterprisename
@@ -866,6 +965,9 @@ export default {
       this.form.projectnum = data.projectnum
       this.form.sa_projectid = data.sa_projectid
       this.concratVisible = false
+      this.salsemanParam.content.type = 2
+      this.salsemanParam.content.sa_projectid = this.form.sa_projectid
+      this.querySalse()
     },
     modelChange (data) {
       this.form.modelname = data.modelname
@@ -900,11 +1002,11 @@ export default {
       console.log(this.activeName)
       if (this.activeName === '客户'){
         this.agentListPrams.content.where.type = '7'
-        this.agentListPrams.content.where.typemx = '工具使用(借用)协议'
+
         this.$refs.member.listData()
       }else {
         this.agentListPrams.content.where.type = '5'
-        this.agentListPrams.content.where.typemx = '工具使用(借用)协议'
+
         this.$refs.member.listData()
       }
     },
@@ -945,8 +1047,18 @@ export default {
         }
       })*/
       console.log(this.payTypeData,'处理后数据')
+    },
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
+    },
+    orderratioChange(){
+      this.form.orderratio =  Math.round(this.form.orderratio * 100)/100
+    },
+    productdiscountChange(){
+      this.form.productdiscount =  Math.round(this.form.productdiscount * 100)/100
     }
   },
+
   mounted() {
     this.payTypeList()
   }

src/HDrpManagement/contractManage/components/editContract.vue

@@ -26,12 +26,20 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <!--                  <selectAgent type="5" ref="member"   :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>-->
+                  <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate">
-                <el-input type="text" size="small" v-model="form.discountrate"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -118,12 +126,19 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -215,12 +230,19 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -314,14 +336,29 @@
                       <selectAgent ref="member" type="5" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                     </el-tab-pane>
                   </el-tabs>-->
-                  <selectAgent ref="member" type="10"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
+                  <el-tabs v-model="activeName" @tab-click="tabClick">
+                    <el-tab-pane label="客户" name="客户">
+                      <selectAgent ref="member" type="7"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                    </el-tab-pane>
+                    <el-tab-pane label="经销商" name="经销商">
+                      <selectAgent ref="member" type="5"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                    </el-tab-pane>
+                  </el-tabs>
+<!--                  <selectAgent ref="member" type="10"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>-->
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename" placeholder="请选择企业"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -403,7 +440,14 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
-                  <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman type="2" ref="selectSalesman" :sa_projectid="form.sa_projectid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -426,12 +470,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio"></el-input>
+                <el-input type="text" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount"></el-input>
+                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -469,12 +513,13 @@ import selectModel from './seleteModel'
 import TimeSelect from './TimeSelect'
 import seleteProjectContract from './seleteProjectContract'
 import seleteReceipt from './seleteReceipt'
+import selectSalesman from './selectSalesman'
 import { log } from '@antv/g2plot/lib/utils'
 
 export default {
   props:['data','disabled'],
   name: '',
-  components:{selectPople,TimeSelect,seleteProject,selectAgent,selectModel,seleteProjectContract,seleteReceipt},
+  components:{selectPople,TimeSelect,seleteProject,selectAgent,selectModel,seleteProjectContract,seleteReceipt,selectSalesman},
   data () {
     var checkNumber = (rule, value, callback) => {
       if (typeof +value != 'number') {
@@ -484,7 +529,7 @@ export default {
     }
     var NumberSize = (rule, value, callback) => {
       if (+value > 100 || +value <= 1 && value) {
-        return callback(new Error('折扣范围(1-100)'));
+        return callback(new Error('折扣范围(1-100%)'));
       }
       callback()
     }
@@ -505,6 +550,7 @@ export default {
       modelVisible:false,
       concratVisible:false,
       receiptVisible:false,
+      salesmanVisible:false,
       payTypeData:[],
       address:'',
       /* 新建居间项目时 所关联的居间商 */
@@ -579,10 +625,14 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         enterprisename: [
           { required: true, message: '请选择经销商', trigger: 'change' },
@@ -626,6 +676,14 @@ export default {
             "typemx":"",
           }
         }
+      },
+      salsemanParam:{
+        "id":20230305201202,
+        "content":{
+          "type":'',//type:1经销商合作协议,2:经销项目协议,直销项目协议,居间协议,3:工具借用协议
+          "sys_enterpriseid":'',//type=1或3时传
+          "sa_projectid":'' //type=2时传
+        }
       }
     };
   },
@@ -635,6 +693,7 @@ export default {
     drawer (val) {
       if(!val) {
         this.showChange(false)
+        this.onCancel()
       } else {
         if(this.$refs.project) {
           this.$refs.project.params.content.type = this.$route.query.type == '经销项目' ? '2' : '1'
@@ -650,9 +709,9 @@ export default {
   methods: {
     editBtn () {
       this.form = Object.assign({},this.form,this.data)
-      this.form.productdiscount = this.form.productdiscount * 100
-      this.form.orderratio = this.form.orderratio * 100
-      this.form.discountrate = this.form.discountrate * 100
+      this.form.productdiscount === 0 ? this.form.productdiscount = '' : this.form.productdiscount = Math.round((this.form.productdiscount * 100) * 100)/100
+      this.form.orderratio === 0 ? this.form.orderratio = '' : this.form.orderratio = Math.round((this.form.orderratio * 100) * 100)/100
+      this.form.discountrate === 0 ? this.form.discountrate = '' : this.form.discountrate = Math.round((this.form.discountrate * 100) * 100)/100
       this.address = this.form.province + this.form.city + this.form.county + this.form.address
       this.drawer = true
       this.$nextTick(() => {
@@ -780,6 +839,12 @@ export default {
           this.$refs.form.validateField("enterprisename")
           this.$refs.form.validateField("sys_enterpriseid")
         }
+      }else if(key === 'concratVisible'){
+        this.$refs.project.queryEnterpriseArchives()
+        key ? this[key] = true : ''
+      }else if(key === 'salesmanVisible'){
+        this.$refs.selectSalesman.listData()
+        key ? this[key] = true : ''
       }else {
         key ? this[key] = true : ''
       }
@@ -787,12 +852,37 @@ export default {
     },
     onCancel () {
       this.drawer = false
+      this.agentVisible = false
+      this.salerVisible = false
+      this.projectVisible = false
+      this.accountVisible = false
+      this.modelVisible = false
+      this.concratVisible = false
+      this.receiptVisible = false
+      this.salesmanVisible = false
       this.$refs.form.resetFlieds()
     },
     agentChange (data) {
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
       this.form.enterprisename = data[0].enterprisename   
-      this.agentVisible = false 
+      this.agentVisible = false
+      if (this.$route.query.type == '框架'){
+        this.salsemanParam.content.type = 1
+        this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.querySalse()
+      }
+    },
+    async querySalse(){
+      const res = await this.$api.requested(this.salsemanParam)
+      console.log("res",res)
+      this.form.salername = res.data[0].name
+      this.form.saler_hrid = res.data[0].hrid
+    },
+    salesmanChange(data){
+      console.log(data,"业务员")
+      this.form.salername = data[0].name
+      this.form.saler_hrid = data[0].hrid
+      this.salesmanVisible = false
     },
     salerChange (data) {
       this.form.saler_hrid = data[0].hrid
@@ -811,6 +901,9 @@ export default {
           this.form.sa_projectid = data.sa_projectid
           this.address = data.province + data.city + data.county + data.address
           this.projectVisible = false
+          this.salsemanParam.content.type = 2
+          this.salsemanParam.content.sa_projectid = this.form.sa_projectid
+          this.querySalse()
         })
         
       }
@@ -825,6 +918,9 @@ export default {
       this.form.enterprisename = data[0].enterprisename
       this.form.sys_enterpriseid = data[0].sys_enterpriseid
       this.accountVisible = false
+      this.salsemanParam.content.type = 3
+      this.salsemanParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+      this.querySalse()
     },
     centerChange (data) {
       this.form.enterprisename = data[0].enterprisename
@@ -843,6 +939,9 @@ export default {
       this.form.projectnum = data.projectnum
       this.form.sa_projectid = data.sa_projectid
       this.concratVisible = false
+      this.salsemanParam.content.type = 2
+      this.salsemanParam.content.sa_projectid = this.form.sa_projectid
+      this.querySalse()
     },
     clearTime () {
       this.form.begdate = ''
@@ -856,11 +955,11 @@ export default {
       console.log(this.activeName)
       if (this.activeName === '客户'){
         this.agentListPrams.content.where.type = '7'
-        this.agentListPrams.content.where.typemx = '工具使用(借用)协议'
+
         this.$refs.member.listData()
       }else {
         this.agentListPrams.content.where.type = '5'
-        this.agentListPrams.content.where.typemx = '工具使用(借用)协议'
+
         this.$refs.member.listData()
       }
     },
@@ -901,7 +1000,17 @@ export default {
          }
        })*/
       console.log(this.payTypeData,'处理后数据')
+    },
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
+    },
+    orderratioChange(){
+      this.form.orderratio =  Math.round(this.form.orderratio * 100)/100
+    },
+    productdiscountChange(){
+      this.form.productdiscount =  Math.round(this.form.productdiscount * 100)/100
     }
+
   },
 };
 </script>

src/HDrpManagement/contractManage/components/selectSalesman.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <!-- <el-input class="normal-margin" type="text" v-model="search" @keyup.native.enter="listData" suffix-icon="el-icon-search" size="small" placeholder="输入成员名称">
+      <div slot="prepend">
+        <el-tag type="info" size="mini" closable v-for="item in selected" :key="item.index">{{item.name}}</el-tag>
+      </div>
+    </el-input> -->
+    <div class="search_input normal-margin">
+      <div class="tag flex-align-center" type="primary" size="mini" closable v-for="item in selected" :key="item.index">
+        <div class="avatar-mini">
+          <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
+          <p v-else>{{item.name}}</p>
+        </div>
+        <p class="inline-16">{{item.name}}</p>
+        <b><i class="el-icon-close" @click="closeTag(item)"></i></b>
+      </div>
+      <input class="input_panel" type="text" v-model="search" @keyup.enter="listData" placeholder="输入搜索内容">
+    </div>
+    <div class="flex-align-stretch menber__panel">
+      <div class="flex-align-center menber__item flex-between" :class="showSelelctIcon(item)?'active_menber__item':''" style="flex:1 0 auto" v-for="item in tableData" :key="item.index" @click="clickMenber(item)">
+        <div  class="flex-align-center">
+          <div class="avatar inline-16">
+            <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
+            <p v-else>{{item.name}}</p>
+          </div>
+          <div>
+            <p>{{ item.name }}</p>
+            <small style="color:#999999ad;margin-top:10px">地址:{{ item.address?item.address:"暂无" }}&emsp;联系电话:{{ item.phonenumber?item.phonenumber:"暂无" }}</small>
+          </div>
+        </div>
+        <i class="el-icon-check iconCheck" v-if="showSelelctIcon(item)"></i>
+      </div>
+    </div>
+    <el-empty v-if="tableData.length === 0" description="暂无数据" :image-size="40"></el-empty>
+    <el-button size="mini" type="text" style="margin-top:16px;float:right" @click="onCancel">取 消</el-button>
+    <!--	<el-button size="mini" type="primary" style="margin-top:16px;float:right;margin-right:10px" @click="onSelect">确 定</el-button>-->
+    <div style="margin-top:16px;text-align:left">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="param.content.pageSize"
+          layout="total, prev, pager, next"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['radio','type','sa_projectid','checked','sys_enterpriseid'],
+  data () {
+    return {
+      search:'',
+      tableData: [],
+      total:0,
+      currentPage:0,
+      selected:[],
+      param:{
+        "id":20230305201202,
+        "content":{
+          "type":'',//type:1经销商合作协议,2:经销项目协议,直销项目协议,居间协议,3:工具借用协议
+          "sys_enterpriseid":'',//type=1或3时传
+          "sa_projectid":'' //type=2时传
+        }
+      }
+    }
+  },
+  components:{
+  },
+  methods:{
+    async listData () {
+     this.param.content.type = this.type
+      this.param.content.sys_enterpriseid = this.sys_enterpriseid
+      this.param.content.sa_projectid = this.sa_projectid
+      console.log(this.param)
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    clickMenber (item) {
+      if (this.radio) {
+        this.selected = []
+      }
+      let _isSame = this.selected.some(m=>item.hrid === m.hrid)
+      if (!_isSame) {
+        this.selected.push(item)
+      } else {
+        this.selected = this.selected.filter(e=>{
+          return e.hrid !== item.hrid
+        })
+      }
+      this.onSelect()
+    },
+    showSelelctIcon (item) {
+      let _isSame = this.selected.some(m=>item.hrid === m.hrid)
+      return _isSame
+    },
+    onSelect () {
+      this.$emit('onSelect',this.selected)
+    },
+    closeTag (item) {
+      this.selected = this.selected.filter(e=>{
+        return e.hrid !== item.hrid
+      })
+    },
+    onCancel () {
+      this.$emit('onCancel')
+    }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.search_input{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  padding: 8px 8px 0 8px;
+  border: 1px solid #f1f2f3;
+  border-radius: 5px;
+}
+.input_panel{
+  flex: 1;
+  min-width: 100px;
+  border:none;
+  outline: none;
+  margin-bottom: 8px;
+  color:#666
+}
+.menber__item{
+  width: calc(100% - 20px);
+  padding:5px 10px;
+  border-radius: 5px;
+  cursor: pointer;
+  color:#666;
+  margin-bottom: 5px;
+  transition: .2s linear;
+}
+.menber__item:hover{
+  background: #b5e4ff6e;
+}
+.active_menber__item{
+  background: #b5e4ff6e;
+}
+.menber__panel {
+  max-height: 300px;
+  overflow-y:scroll ;
+}
+.avatar{
+  position: relative;
+  height:30px;
+  width: 30px;
+  border-radius: 100%;
+  text-align: center;
+  line-height: 30px;
+  color:#fff;
+  font-weight: 500;
+  background: #3874F6;
+  cursor: pointer;
+  overflow: hidden;
+}
+.avatar__image{
+  height: 100%;
+  width: 100%;
+}
+.avatar-mini{
+  position: relative;
+  height:20px;
+  width: 20px;
+  line-height: 20px;
+  text-align: center;
+  margin-right: 5px;
+  color:#fff;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 100%;
+  background: #3874F6;
+}
+.iconCheck{
+  font-weight: bold;
+  color:#3874F6
+}
+.tag{
+  font-size: 12px;
+  color:#666;
+  padding: 5px;
+  border-radius: 3px;
+  margin:0 5px 8px 0;
+  background: #b5e4ff6e;
+  cursor: pointer;
+}
+</style>

src/HDrpManagement/contractManage/index.vue

@@ -134,6 +134,7 @@
 
 <script>
 import { log } from '@antv/g2plot/lib/utils'
+import {mapGetters} from "vuex";
 
 export default {
   data () {

src/HDrpManagement/contractManage/modules/detail.vue

@@ -323,7 +323,7 @@ export default {
           },*/
           {
             label:'折扣(%)',
-            value:Math.round((this.mainData.discountrate * 100)*100)/100
+            value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
           },
           {
             label:'状态',
@@ -394,7 +394,7 @@ export default {
           },
           {
             label:'折扣(%)',
-            value:Math.round((this.mainData.discountrate * 100)*100)/100
+            value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
           },
           {
             label:'业务员',
@@ -459,7 +459,7 @@ export default {
           },
           {
             label:'折扣(%)',
-            value:Math.round((this.mainData.discountrate * 100)*100)/100
+            value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
           },
           {
             label:'合同有效期',
@@ -757,7 +757,7 @@ export default {
                   },
                   {
                     label:'折扣(%)',
-                    value:Math.round((this.mainData.discountrate * 100)*100)/100
+                    value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
                   },
                   {
                     label:'领域',
@@ -859,7 +859,7 @@ export default {
                   },
                   {
                     label:'折扣(%)',
-                    value:Math.round((this.mainData.discountrate * 100)*100)/100
+                    value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
                   },
                   {
                     label:'领域',
@@ -946,7 +946,7 @@ export default {
                   },
                   {
                     label:'折扣(%)',
-                    value:Math.round((this.mainData.discountrate * 100)*100)/100
+                    value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
                   },
                   {
                     label:'合同有效期',
@@ -966,7 +966,7 @@ export default {
                   },
                   {
                     label:'折扣(%)',
-                    value:Math.round((this.mainData.discountrate * 100)*100)/100
+                    value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
                   },
                   {
                     label:'领域',

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -386,13 +386,15 @@ export default {
         "sa_projectid": "", //可选
         "type": "", //可选
         "discountrate": '', //可选
-        "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+        /*"saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选*/
+        "saler_hrid":this.data.leader[0].userid || '',
         "signdate": "", //可选
         "signby": "", //可选
         "remarks": "", //可选
         "title": "",
         "signamount":'',
-        "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+        /*"salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,*/
+        "salername":this.data.leader[0].name || '',
         "enterprisename":'',
         "sys_printmodelid": '',//可选
         "typemx":"",//可选
@@ -406,7 +408,8 @@ export default {
         "rec_contactsid":'',//收货联系人
         'phonenumber':'',
         'paytype':'',
-        'reminddays':''
+        'reminddays':'',
+        "source":1
       },
       rules: {
         title: [
@@ -587,6 +590,13 @@ export default {
               // this.$store.dispatch('DrawerShowChange',false)
               // this.$store.dispatch('changeDetailDrawer',true)
               // this.$router.push({path:'/contractDetail',query:{type:this.contractType,id:res.data.sa_contractid,rowindex:res.data.rowindex}})
+              let route = this.$route
+              if (route.path !== '/contractDetail') {
+                this.oldRoute = {path:route.path,query:route.query}
+                this.$store.dispatch('setHistoryRouter',this.oldRoute)
+              }
+              this.$store.dispatch('changeDetailDrawer',true)
+              this.$router.push({path:'/contractDetail',query:{type:this.contractType,id:res.data.sa_contractid,rowindex:res.data.rowindex}})
             })
           }
           

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -269,6 +269,11 @@
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
+            <el-col  :span="24">
+              <el-form-item label="业务员:" label-width="100px" prop="salername">
+                <el-input disabled  v-model="form.salername" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
+              </el-form-item>
+            </el-col>
             <el-col  :span="24">
               <el-form-item label="备注:" label-width="100px" prop="remarks">
                 <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
@@ -399,10 +404,13 @@ export default {
         enddate:'',
         begdate:'',
         itemtype:[],
+        saler_userid:this.data.leader[0].userid || '',
+        salername:this.data.leader[0].name || '',
         quotedpricenotes: [
           "1、报价为含税13%税率,含运费",
           "2、报价有限期 2023-02-02 13:16:47至2023-02-22 13:16:47",
-        ]
+        ],
+        source:1
       },
       rules:{
         projectname:[
@@ -499,6 +507,11 @@ export default {
         this.tool.showMessage(res,() => {
           /*this.changeData(this.productObj)*/
           this.$emit('addSuccess')
+          let route = this.$route
+          if (route.path !== '/quotedPriceDetail') {
+            this.oldRoute = {path:route.path,query:route.query}
+            this.$store.dispatch('setHistoryRouter',this.oldRoute)
+          }
           this.$store.dispatch('changeDetailDrawer',true)
           this.$router.push({path:'/quotedPriceDetail',query:{id:res.data.sa_quotedpriceid,rowindex:res.data.rowindex}})
         })

src/SDrpManagement/QuotedPrice/components/selectSalesman.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <!-- <el-input class="normal-margin" type="text" v-model="search" @keyup.native.enter="listData" suffix-icon="el-icon-search" size="small" placeholder="输入成员名称">
+      <div slot="prepend">
+        <el-tag type="info" size="mini" closable v-for="item in selected" :key="item.index">{{item.name}}</el-tag>
+      </div>
+    </el-input> -->
+    <div class="search_input normal-margin">
+      <div class="tag flex-align-center" type="primary" size="mini" closable v-for="item in selected" :key="item.index">
+        <div class="avatar-mini">
+          <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
+          <p v-else>{{item.name}}</p>
+        </div>
+        <p class="inline-16">{{item.name}}</p>
+        <b><i class="el-icon-close" @click="closeTag(item)"></i></b>
+      </div>
+      <input class="input_panel" type="text" v-model="search" @keyup.enter="listData" placeholder="输入搜索内容">
+    </div>
+    <div class="flex-align-stretch menber__panel">
+      <div class="flex-align-center menber__item flex-between" :class="showSelelctIcon(item)?'active_menber__item':''" style="flex:1 0 auto" v-for="item in tableData" :key="item.index" @click="clickMenber(item)">
+        <div  class="flex-align-center">
+          <div class="avatar inline-16">
+            <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
+            <p v-else>{{item.name}}</p>
+          </div>
+          <div>
+            <p>{{ item.name }}</p>
+            <small style="color:#999999ad;margin-top:10px">地址:{{ item.address?item.address:"暂无" }}&emsp;联系电话:{{ item.phonenumber?item.phonenumber:"暂无" }}</small>
+          </div>
+        </div>
+        <i class="el-icon-check iconCheck" v-if="showSelelctIcon(item)"></i>
+      </div>
+    </div>
+    <el-empty v-if="tableData.length === 0" description="暂无数据" :image-size="40"></el-empty>
+    <el-button size="mini" type="text" style="margin-top:16px;float:right" @click="onCancel">取 消</el-button>
+    <!--	<el-button size="mini" type="primary" style="margin-top:16px;float:right;margin-right:10px" @click="onSelect">确 定</el-button>-->
+    <div style="margin-top:16px;text-align:left">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="param.content.pageSize"
+          layout="total, prev, pager, next"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['radio','type','sa_projectid','checked','sys_enterpriseid'],
+  data () {
+    return {
+      search:'',
+      tableData: [],
+      total:0,
+      currentPage:0,
+      selected:[],
+      param:{
+        "id":20230306144402,
+        "content":{
+          "type":'',////type:1客户2:项目
+          "sys_enterpriseid":'',//type=1
+          "sa_projectid":'' //type=2时传
+        }
+      }
+    }
+  },
+  components:{
+  },
+  methods:{
+    async listData () {
+     /*this.param.content.type = this.type
+      this.param.content.sys_enterpriseid = this.sys_enterpriseid
+      this.param.content.sa_projectid = this.sa_projectid*/
+      console.log(this.param)
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    clickMenber (item) {
+      if (this.radio) {
+        this.selected = []
+      }
+      let _isSame = this.selected.some(m=>item.hrid === m.hrid)
+      if (!_isSame) {
+        this.selected.push(item)
+      } else {
+        this.selected = this.selected.filter(e=>{
+          return e.hrid !== item.hrid
+        })
+      }
+      this.onSelect()
+    },
+    showSelelctIcon (item) {
+      let _isSame = this.selected.some(m=>item.hrid === m.hrid)
+      return _isSame
+    },
+    onSelect () {
+      this.$emit('onSelect',this.selected)
+    },
+    closeTag (item) {
+      this.selected = this.selected.filter(e=>{
+        return e.hrid !== item.hrid
+      })
+    },
+    onCancel () {
+      this.$emit('onCancel')
+    }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.search_input{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  padding: 8px 8px 0 8px;
+  border: 1px solid #f1f2f3;
+  border-radius: 5px;
+}
+.input_panel{
+  flex: 1;
+  min-width: 100px;
+  border:none;
+  outline: none;
+  margin-bottom: 8px;
+  color:#666
+}
+.menber__item{
+  width: calc(100% - 20px);
+  padding:5px 10px;
+  border-radius: 5px;
+  cursor: pointer;
+  color:#666;
+  margin-bottom: 5px;
+  transition: .2s linear;
+}
+.menber__item:hover{
+  background: #b5e4ff6e;
+}
+.active_menber__item{
+  background: #b5e4ff6e;
+}
+.menber__panel {
+  max-height: 300px;
+  overflow-y:scroll ;
+}
+.avatar{
+  position: relative;
+  height:30px;
+  width: 30px;
+  border-radius: 100%;
+  text-align: center;
+  line-height: 30px;
+  color:#fff;
+  font-weight: 500;
+  background: #3874F6;
+  cursor: pointer;
+  overflow: hidden;
+}
+.avatar__image{
+  height: 100%;
+  width: 100%;
+}
+.avatar-mini{
+  position: relative;
+  height:20px;
+  width: 20px;
+  line-height: 20px;
+  text-align: center;
+  margin-right: 5px;
+  color:#fff;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 100%;
+  background: #3874F6;
+}
+.iconCheck{
+  font-weight: bold;
+  color:#3874F6
+}
+.tag{
+  font-size: 12px;
+  color:#666;
+  padding: 5px;
+  border-radius: 3px;
+  margin:0 5px 8px 0;
+  background: #b5e4ff6e;
+  cursor: pointer;
+}
+</style>

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -197,7 +197,7 @@ export default {
         },
         {
           label:'折扣(%)',
-          value:Math.round((this.mainData.discountrate * 100)*100)/100
+          value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
         },
         {
           label:'总金额(元)',
@@ -270,7 +270,7 @@ export default {
             },
             {
               label:'折扣(%)',
-              value:Math.round((this.mainData.discountrate * 100)*100)/100
+              value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
             },
             {
               label:'总金额(元)',

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -19,7 +19,7 @@
         <el-descriptions-item label="手机号">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="报价日期">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="折扣(%)">{{ basic.discountrate?Math.round((basic.discountrate * 100)*100)/100:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="折扣(%)">{{ basic.discountrate !== 0?Math.round((basic.discountrate * 100)*100)/100:"--" }}</el-descriptions-item>
         <el-descriptions-item label="总金额(元)">{{ totalPrice?totalPrice:"--" }}</el-descriptions-item>
 
         <el-descriptions-item label="品牌">{{ basic.brandname?basic.brandname:"--" }}</el-descriptions-item>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -268,6 +268,18 @@
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
+            <el-col  :span="24">
+              <el-form-item label="业务员:" label-width="100px" prop="salername">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="salesmanVisible"
+                    width="500">
+                  <selectSalesman  ref="selectSalesman"  :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange" v-model="form.salername" placeholder="请选择业务员"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
             <el-col  :span="24">
               <el-form-item label="备注:" label-width="100px" prop="remarks">
                 <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
@@ -292,10 +304,11 @@
 
 <script>
 import quoted_price_product from '../components/quotedPriceProduct'
+import selectSalesman from '../components/selectSalesman'
 export default {
   name: "ProjectQuotationAdd",
   props:["drawerShow","typeData"],
-  components:{quoted_price_product},
+  components:{quoted_price_product,selectSalesman},
   data(){
     var discountrate = (rule,value,callback) =>{
       if (this.form.discountrate < 0 || this.form.discountrate > 100){
@@ -310,6 +323,7 @@ export default {
       projectShow:false,
       customerShow:false,
       contactsShow:false,
+      salesmanVisible:false,
       projectParam:{
         "id": 20221020143503,
         "content": {
@@ -362,6 +376,14 @@ export default {
           }
         }
       },
+      salerParam:{
+        "id":20230306144402,
+        "content":{
+          "type":'',////type:1客户2:项目
+          "sys_enterpriseid":'',//type=1
+          "sa_projectid":'' //type=2时传
+        }
+      },
       contacts:{
         contactsData:[],
         total:0,
@@ -399,6 +421,8 @@ export default {
         billdate:"",
         enddate:'',
         begdate:'',
+        saler_hrid:'',
+        salername:'',
         itemtype:[],
         quotedpricenotes: [
           "1、报价为含税13%税率, 含运费 ",
@@ -582,6 +606,9 @@ export default {
       this.form.fax = ''
       this.form.telephone = ''
       this.projectShow = false
+      this.salerParam.content.type = 2
+      this.salerParam.content.sa_projectid = this.form.sa_projectid
+      this.querySalesman()
     },
     /*客户选择信息*/
     customerData(val){
@@ -593,6 +620,11 @@ export default {
       this.form.fax = ''
       this.form.telephone = ''
       this.customerShow = false
+      if (!this.isQuotedPrice){
+        this.salerParam.content.type = 1
+        this.salerParam.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.querySalesman()
+      }
     },
     /*联系人选择信息*/
     contactsData(val){
@@ -643,6 +675,35 @@ export default {
       this.$store.dispatch('optiontypeselect','itemtype').then(res => {
         this.itemtype = res.data
       })
+    },
+    /*业务员*/
+    showChange(){
+      this.salesmanVisible = true
+      if (this.isQuotedPrice){
+        this.$refs.selectSalesman.param.content.type = 2
+        this.$refs.selectSalesman.param.content.sa_projectid = this.form.sa_projectid
+        this.$refs.selectSalesman.listData()
+      }else {
+        this.$refs.selectSalesman.param.content.type = 1
+        this.$refs.selectSalesman.param.content.sys_enterpriseid = this.form.sys_enterpriseid
+        this.$refs.selectSalesman.listData()
+      }
+
+    },
+    salesmanChange(data){
+      console.log(data,"业务员")
+      this.form.saler_hrid = data[0].hrid
+      this.form.salername = data[0].name
+      this.salesmanVisible = false
+
+   /*   this.form.salername = data[0].name
+      this.form.saler_hrid = data[0].hrid
+      this.salesmanVisible = false*/
+    },
+    async querySalesman(){
+      const res = await this.$api.requested(this.salerParam)
+      this.form.salername = res.data[0].name
+      this.form.saler_hrid = res.data[0].hrid
     }
     /*isSpecial(val){
       console.log("获取")

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -52,7 +52,7 @@
           <small style="color:#999999ad;margin-top:10px">部门：{{ men.depname?men.depname:"未知部门" }}&emsp;职位：{{ men.position?men.position:"未知部门" }}</small>
         </div>
         <div style="float: right;margin-left: 60px">
-          <el-button type="text" @click="setClick(men)" size="mini">设置</el-button>
+          <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" @click="setClick(men)" size="mini">设置</el-button>
         </div>
       </div>