合同、报价单业务员

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

@@ -387,7 +387,7 @@ export default {
         "type": "", //可选
         "discountrate": '', //可选
         /*"saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选*/
-        "saler_hrid":this.data.leader[0].userid || '',
+        "saler_hrid":this.data.leader[0].hr.hrid || '',
         "signdate": "", //可选
         "signby": "", //可选
         "remarks": "", //可选
@@ -568,6 +568,13 @@ export default {
               this.tool.showMessage(res,() => {
                 this.$emit('onSuccess')
                 this.drawer = false
+                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}})
               })
           } else {
             /* 其它新建 */

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

@@ -404,7 +404,7 @@ export default {
         enddate:'',
         begdate:'',
         itemtype:[],
-        saler_userid:this.data.leader[0].userid || '',
+        saler_userid:this.data.leader[0].hr.hrid || '',
         salername:this.data.leader[0].name || '',
         quotedpricenotes: [
           "1、报价为含税13%税率,含运费",

src/HDrpManagement/publicCustomer/index.vue

@@ -9,6 +9,7 @@
       :options="options"
       :autoQuery="false"
       @checkboxCallBack="checkboxCallBack"
+      :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null},{key:'industry',value:null}]"
       :detailPath="{
         path:'/PublicCustomerDetail'
       }"

src/SDrpManagement/QuotedPrice/index.vue

@@ -8,6 +8,7 @@
         :apiId="{query:20221020165103,del:20221020165503}"
         :options="options"
         :autoQuery="false"
+        :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null},{key:'industry',value:null}]"
         :detail-path="{path:'/quotedPriceDetail'}"
       >
       <div slot="titleRight">
@@ -86,7 +87,7 @@
           </div>
 
         </div>
-        <div v-else-if="scope.data.column.columnname === 'name'">
+        <div v-else-if="scope.data.column.columnname === 'leader'">
           <span>{{scope.data.column.data.leader.length !== 0?scope.data.column.data.leader[0].name:'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
@@ -98,7 +99,8 @@
           <p>{{scope.data.column.data.begdate?scope.data.column.data.begdate+ '至' + scope.data.column.data.enddate:'--'}}</p>
         </div>
         <div v-else-if="scope.data.column.columnname === 'salesman'">
-          {{issaler?'--':scope.data.column.data.createby}}
+<!--          {{issaler?'&#45;&#45;':scope.data.column.data.createby}}-->
+          <span>{{scope.data.column.data.leader.length !== 0?scope.data.column.data.leader[0].name:'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'distributor'">
           {{issaler?scope.data.column.data.enterprisename:'--'}}

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -149,7 +149,7 @@
           <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
-        <div v-else-if="scope.data.column.columnname === 'contact'">
+        <div v-else-if="scope.data.column.columnname === 'leader'">
           <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:'--'}}</span>
         </div>
         <div v-else>

src/components/export_excel/index.vue

@@ -39,9 +39,9 @@ export default {
         }else if(e.title === '标签'){
           res.data.forEach(e => {
             if (e.tag.length !== 0){
-              e.tag_sys = e.tag_sys + ',' + e.tag
+              e.tag = e.tag_sys + ',' + e.tag
             }else {
-              e.tag_sys = e.tag_sys
+              e.tag = e.tag_sys
             }
           })
         }else if(e.title === '项目类型'){
@@ -52,7 +52,12 @@ export default {
           res.data.forEach(e => {
             e.roleName = e.userrole.map(item => item.remarks).join(',')
           })
-          console.log(res.data,'结果');
+        } else if (e.title === '业务员') {
+          res.data.forEach(e => {
+            e.salesman = e.leader?e.leader.length !== 0?e.leader[0].name:'':''
+            console.log(e.salesman = '111')
+          })
+
         }
       });
       let hd = table.map(e=>{