bug修复优化

src/Form/marketing2/saler/add.vue

@@ -49,7 +49,7 @@
             </el-col>
             <el-col :span="15">
               <el-form-item  label="最低授权折扣(%):" prop="discountrate" label-width="132px">
-                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" ></el-input>
+                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -157,6 +157,15 @@ export default {
         "hrid":'',
         "discountrate":''
       }
+    },
+    discountrateChange(val){
+      if (val < 0){
+        this.form.discountrate = 1
+      }else if(val > 100){
+        this.form.discountrate = 100
+      }else {
+        this.form.discountrate = Math.round(val * 100)/100
+      }
     }
   },
   created () {

src/Form/marketing2/saler/edit.vue

@@ -51,7 +51,7 @@
           <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="132px" size="small">
             <el-col :span="15">
               <el-form-item  label="最低授权折扣(%):" prop="discountrate">
-                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" ></el-input>
+                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -115,6 +115,15 @@ export default {
           this.$emit('onSuccess')
         })
       })
+    },
+    discountrateChange(val){
+      if (val < 0){
+        this.form.discountrate = 1
+      }else if(val > 100){
+        this.form.discountrate = 100
+      }else {
+        this.form.discountrate = Math.round(val * 100)/100
+      }
     }
   }
 }

src/HDrpManagement/contractManage/components/taskTarget/addTarget.vue

@@ -1,16 +1,27 @@
 <template>
   <div>
     <el-button type="primary" size="small" :disabled="disabled" @click="addBtn">添 加</el-button>
-    <el-dialog title="添加年度" append-to-body :visible.sync="visible" width="400px"> 
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+    <el-dialog title="添加年度" append-to-body :visible.sync="visible" width="500px">
+      <el-form :model="form" :rules="rules" ref="form" label-width="55px" label-position="right" size="mini">
         <el-form-item label="年度:" prop="year">
           <el-date-picker
+            style="width: 100%"
             v-model="form.year"
             type="year"
             value-format="yyyy"
             placeholder="选择年">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="领域:" prop="year">
+          <el-select v-model="form.tradefield" placeholder="请选择领域" style="width: 100%">
+            <el-option
+                v-for="item in fieldList"
+                :key="item.rowindex"
+                :label="item.tradefield"
+                :value="item.tradefield">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="dialog-footer">
         <el-button size="small" @click="visible=false" class="normal-btn-width">取 消</el-button>
@@ -28,13 +39,15 @@ export default {
     return {
       visible:false,
       form: {
-        year: '2022'
+        year: '2022',
+        tradefield:''
       },
       rules:{
         year:[
           { required: true, message: '请选择年度', trigger: 'change'},
         ],
-      }
+      },
+      fieldList:[]
     };
   },
   computed:{
@@ -45,7 +58,7 @@ export default {
     addBtn () {
       this.visible=true
       this.form.year = this.$parent.year
-
+      this.queryField()
       
     },
     async submit () {
@@ -55,13 +68,30 @@ export default {
             "year": this.form.year,
             "sa_salestargetbillid": 0, //新建年度是为0，添加人员时为具体的数据id
             "sys_enterpriseid": this.data.sys_enterpriseid,
-            "sa_contractid":this.$route.query.id
+            "sa_contractid":this.$route.query.id,
+            "tradefield":this.form.tradefield
         },
       })
       this.tool.showMessage(res,() => {
         this.visible = false
         this.$emit('onSuccess',this.form.year)
       })
+    },
+    /*领域信息*/
+    async queryField(){
+      const res = await this.$api.requested({
+        "id": 20221223141802,
+        "content": {
+          "sys_enterpriseid": this.data.sys_enterpriseid,//可不传，默认取当前账号的
+          "pageNumber": 1,
+          "pageSize": 99,
+          "where": {
+            "condition": ""
+          }
+        }
+      })
+      console.log(res,"领域信息")
+      this.fieldList = res.data
     }
   },
 };

src/HDrpManagement/contractManage/components/taskTarget/taskTarget.vue

@@ -24,6 +24,13 @@
           <p class="center d-text">{{scope.row.year}}</p>
         </template>
 
+      </el-table-column>
+      <el-table-column label="领域">
+
+        <template slot-scope="scope">
+          <p class="center d-text">{{scope.row.tradefield}}</p>
+        </template>
+
       </el-table-column>
       <el-table-column label="年度(万元)">
         <el-table-column

src/HDrpManagement/publicCustomer/index.vue

@@ -74,6 +74,17 @@
           </el-option>
         </el-select>
       </div>
+        <div  class="mt-10">
+          <label class="search__label">成交状态:</label>
+          <el-select  class="inline-16" v-model="selectParam.tradingstatus" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.tradingstatus"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
       <div  class="mt-10">
         <label class="search__label">创建时间:</label>
         <el-date-picker
@@ -158,6 +169,17 @@ export default {
             value:'已终止'
           }
         ],
+        tradingstatus:[
+          {
+            value:'未成交'
+          },
+          {
+            value:'已成交'
+          },
+          {
+            value:'多次成交'
+          }
+        ]
       },
       selectParam: {
         sa_customerpoolid:'',
@@ -166,7 +188,8 @@ export default {
         customergrade:'',
         industry:'',
         startdate: "",
-        enddate: ""
+        enddate: "",
+        tradingstatus:''
       },
       dateSelect:'',
       selectCustomer:[]

src/HManagement/marketing2/agent/details/index.vue

@@ -22,7 +22,21 @@
     </div>
     <div slot="slot0">
       <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建团队账号</el-button>
-      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="calc(100vh - 455px)"></tableLayout>
+      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="true" height="calc(100vh - 425px)">
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'name'">
+            <div v-if="scope.column.data.isleader === 1">
+              <p class="inline-16">{{scope.column.data[scope.column.columnname]}}</p>
+              <el-tag size="mini">主账号</el-tag>
+            </div>
+            <div v-else>
+              <p class="inline-16">{{scope.column.data[scope.column.columnname]}}</p>
+            </div>
+
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+      </tableLayout>
     </div>
     <div slot="slot1">
       <salescope :data="mainData"></salescope>
@@ -65,6 +79,7 @@ export default {
     return {
       mainData:{},
       mainAreaData:[],
+      tablecols:[]
     }
   },
   components:{

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -56,14 +56,18 @@ export default {
     },
     changeDataStructure () {
       this.mainAreaData = [
-        {
-          label:'业务员',
-          value:this.mainData.name
-        },
         {
           label:'编号',
           value:this.mainData.hrcode
         },
+        {
+          label:'登录账号',
+          value:this.mainData.accountno
+        },
+        {
+          label:'业务员',
+          value:this.mainData.name
+        },
         {
           label:'部门',
           value:this.mainData.depname
@@ -86,7 +90,7 @@ export default {
         },
         {
           label:'最低授权折扣(%)',
-          value:this.mainData.discountrate*100
+          value:Math.round((this.mainData.discountrate*100)*100)/100
         }
       ]
     },

src/HManagement/marketing2/saler/area/detail/modules/detailedData.vue

@@ -5,12 +5,13 @@
         <div slot="title" class="my-label__title">基本信息</div>
         <el-descriptions-item  label="编号">{{ detailData.hrcode?detailData.hrcode:"--" }}</el-descriptions-item>
         <el-descriptions-item label="业务员">{{ detailData.name?detailData.name:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="登录账号">{{ detailData.accountno?detailData.accountno:"--"}}</el-descriptions-item>
         <el-descriptions-item label="部门">{{ detailData.depname?detailData.depname:"--"}}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{ detailData.phonenumber?detailData.phonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="邮箱">{{ detailData.email?detailData.email:"--" }}</el-descriptions-item>
         <el-descriptions-item label="负责区域">{{ detailData.areaname?detailData.areaname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="汇报对象">{{ detailData.reporthrname?detailData.reporthrname:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="最低授权折扣(%)" >{{ detailData.discountrate?detailData.discountrate*100:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="最低授权折扣(%)" >{{ detailData.discountrate?Math.round((detailData.discountrate*100)*100)/100:"--" }}</el-descriptions-item>
       </el-descriptions>
     </div>
 

src/HManagement/marketing2/saler/index.vue

@@ -18,7 +18,7 @@
         <div slot="custom"></div>
         <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname === 'discountrate'">
-            {{scope.data.column.data.discountrate*100}}
+            {{Math.round((scope.data.column.data.discountrate*100)*100)/100}}
           </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/HManagement/task/index.vue

@@ -17,10 +17,10 @@
           type:type
         }
       }">
-      <div slot="custom">
+      <template #custom>
         <div  class="mt-10">
           <label class="search__label">任务范围:</label>
-          <el-select class="inline-16" v-model="type" size="small" placeholder="请选择" @change="selectChange" clearable>
+          <el-select class="inline-16" v-model="type" size="small" placeholder="请选择" @change="selectChange" >
             <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -29,7 +29,18 @@
             </el-option>
           </el-select>
         </div>
-      </div>
+        <div  class="mt-10">
+          <label class="search__label">任务状态:</label>
+          <el-select class="inline-16" v-model="status" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in statusList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+            </el-option>
+          </el-select>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <div>
           <span v-if="scope.data.column.columnname === 'leader'">
@@ -62,7 +73,18 @@ export default {
   data () {
     return {
       options:[{label:'我负责的',value:1},{label:'我参与的',value:2},{label:'我下属负责的',value:3},{label:'我下属参与的',value:4},{label:'我创建的',value:5}],
-      type:1
+      type:1,
+      statusList:[
+        {
+          label:'已完成',
+          value:1
+        },
+        {
+          label:'进行中',
+          value:2
+        }
+      ],
+      status:''
     }
   },
   methods:{
@@ -71,6 +93,7 @@ export default {
     },
     queryData () {
       this.$refs['basicLayout'].param.content.type = this.type
+      this.$refs.basicLayout.param.content.where.status = this.status
       this.$refs['basicLayout'].listData()
     }
   },

src/HManagement/task/modules/add.vue

@@ -73,7 +73,7 @@
               trigger="manual"
               width="400"
               v-model="assistShow">
-            <member ref="member" :param="param" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+            <member ref="memberAssist" :param="param" :implement="form.leaderuserid" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
             <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
               <p slot="prepend">协助人</p>
             </el-input>
@@ -134,7 +134,6 @@ export default {
           }
         }
       },
-
 			errormsg:'',
 			bindData:{},
 			leader:{},
@@ -208,11 +207,13 @@ export default {
 		showMenber () {
 			this.leaderShow = true
       this.assistShow = false
+      this.$refs.member.listData()
 			// this.validateInput()
 		},
     showMenberAssist () {
       this.assistShow = true
       this.leaderShow = false
+      this.$refs.memberAssist.listData()
       // this.validateInput()
     },
     async insertAssist(id){

src/HManagement/task/modules/edit.vue

@@ -73,7 +73,7 @@
               trigger="manual"
               width="400"
               v-model="assistShow">
-            <member ref="member" :param="param" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+            <member ref="memberAssist" :param="paramAssist" :radio="false" :implement="implement" @onSelect="setAssist" @onCancel="assistShow = false"></member>
             <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
               <p slot="prepend">协助人</p>
             </el-input>
@@ -131,6 +131,19 @@ export default {
             "condition":"",
             "withoutselect":0,
             
+          }
+        }
+      },
+      paramAssist:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+
           }
         }
       },
@@ -140,12 +153,14 @@ export default {
 			leader:{},
       assistPerson:'',
       assist:[],
+      implement:''
 		}
 	},
 	methods:{
 		onShow () {
 			this.form = Object.assign({},this.form,this.data)
 			this.leader = this.data.leader[0]?this.data.leader[0]:''
+      this.implement = this.data.leader[0].userid
       this.assistList(this.data.sys_taskid)
 		},
 		validateInput () {
@@ -162,6 +177,7 @@ export default {
 		setLeader (val) {
 			this.leader = val[0]
 			this.form.leaderuserid = val[0].userid
+      this.implement = this.form.leaderuserid
 			this.leaderShow = false
 		},
     setAssist (val) {
@@ -206,11 +222,15 @@ export default {
 		showMenber () {
 			this.leaderShow = true
       this.assistShow = false
+      this.param.content.ownerid = this.data.sys_taskid
+      this.$refs.member.listData()
 			// this.validateInput()
 		},
     showMenberAssist () {
       this.assistShow = true
       this.leaderShow = false
+      this.paramAssist.content.ownerid = this.data.sys_taskid
+      this.$refs.memberAssist.listData()
       // this.validateInput()
     },
     async assistList(id){

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -64,6 +64,17 @@
             </el-option>
           </el-select>
         </div>
+        <div  class="mt-10">
+          <label class="search__label">成交状态:</label>
+          <el-select  class="inline-16" v-model="selectParam.tradingstatus" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.tradingstatus"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
         <div  class="mt-10">
           <label class="search__label" >创建时间:</label>
           <el-date-picker
@@ -164,6 +175,17 @@ export default {
           {
             value:'已终止'
           }
+        ],
+        tradingstatus:[
+          {
+            value:'未成交'
+          },
+          {
+            value:'已成交'
+          },
+          {
+            value:'多次成交'
+          }
         ]
       },
       selectParam: {
@@ -173,6 +195,7 @@ export default {
         industry:'',
         startdate:'',
         enddate:'',
+        tradingstatus:''
 
       },
       dateSelect:''

src/SManagement/sales_forecast/modules/project.vue

@@ -114,9 +114,21 @@ export default {
     rowClick (row) {
       this.act_row = row
       this.$emit('queryProduct',row.sa_projectid)
+    },
+    /*是否过期*/
+    isOverdue(){
+      let date = new Date(this.mainData.periodend)
+      let now = Date.now()
+      if (date.getTime() < now) {
+        console.log('已过期')
+        this.checkDateOut =  false
+      } else {
+        console.log('未过期')
+        this.checkDateOut = true
+      }
     }
   },
-  watch:{
+  /*watch:{
     mainData (val) {
       let date = new Date(this.mainData.periodend)
       let now = Date.now()
@@ -128,9 +140,10 @@ export default {
         this.checkDateOut = true
       }
     }
-  },
+  },*/
   mounted () {
     this.listData()
+    this.isOverdue()
   }
 }
 

src/components/newLayout/modules/header.vue

@@ -23,7 +23,7 @@
         </div>
       </span>
       <el-dropdown-menu style="width:200px;text-align:center" slot="dropdown">
-        <el-dropdown-item @click.native="$router.replace({path:'/user_center'})">个人中心</el-dropdown-item>
+        <el-dropdown-item @click.native="$router.push({path:'/user_center'})">个人中心</el-dropdown-item>
         <!-- <el-dropdown-item v-if="canChangeSite" @click.native="$router.replace({path:'/accounts'})">切换账号</el-dropdown-item> -->
         <el-dropdown-item v-for="item in accountList" :key="item.index" divided @click.native="selectAccount(item)">
           <div class="flex-align-center flex-between">

src/template/menber/index.vue

@@ -51,7 +51,7 @@
 
 <script>
 export default {
-	props:['param','radio','checked'],
+	props:['param','radio','checked','implement'],
   data () {
     return {
       search:'',
@@ -69,12 +69,17 @@ export default {
       const res = await this.$api.requested(this.param)
       if (!this.radio) {
         res.data = res.data.filter(e=>{
-          if (e.isteamleader !== 1)
+          if (e.isteamleader !== 1 && e.userid !== this.implement)
             return e
         })
       }
       this.tableData = res.data
-      this.total = res.total
+      console.log(this.implement)
+      if (this.implement !== undefined && this.implement !== ''){
+        this.total = res.total -1
+      }else {
+        this.total = res.total
+      }
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {