代码更新

src/Form/QuotedPrice/edit.vue

@@ -430,7 +430,7 @@ export default {
         billdate:"",
         enddate:'',
         begdate:'',
-        saler_userid:'',
+        saler_hrid:'',
         salername:'',
         date:[],
         itemtype:[],
@@ -746,7 +746,7 @@ export default {
     },
     salesmanChange(data){
       console.log(data,"业务员")
-      this.form.saler_userid = data[0].userid
+      this.form.saler_hrid = data[0].hrid
       this.form.salername = data[0].name
       this.form.name = data[0].name
       this.salesmanVisible = false
@@ -759,7 +759,7 @@ export default {
       const res = await this.$api.requested(this.salerParam)
       this.form.salername = res.data[0].name
       this.form.name = data[0].name
-      this.form.saler_userid = res.data[0].userid
+      this.form.saler_hrid = res.data[0].hrid
     }
    /* async mainData(val) {
       const res = await this.$api.requested({

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>

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

@@ -590,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

@@ -507,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/modules/ProjectQuotationAdd.vue

@@ -421,7 +421,7 @@ export default {
         billdate:"",
         enddate:'',
         begdate:'',
-        saler_userid:'',
+        saler_hrid:'',
         salername:'',
         itemtype:[],
         quotedpricenotes: [
@@ -692,7 +692,7 @@ export default {
     },
     salesmanChange(data){
       console.log(data,"业务员")
-      this.form.saler_userid = data[0].userid
+      this.form.saler_hrid = data[0].hrid
       this.form.salername = data[0].name
       this.salesmanVisible = false
 
@@ -703,7 +703,7 @@ export default {
     async querySalesman(){
       const res = await this.$api.requested(this.salerParam)
       this.form.salername = res.data[0].name
-      this.form.saler_userid = res.data[0].userid
+      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>