qymljy 3 年之前
父節點
當前提交
142d143dd0

+ 1 - 1
src/Form/salerPrivatecustomer/edit.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <div>
+  <div >
     <el-button size="mini" :disabled="data.datastatus === 2" :type="btnType?btnType:'text'"   @click="show" >编 辑</el-button>
     <el-button size="mini" :disabled="data.datastatus === 2" :type="btnType?btnType:'text'"   @click="show" >编 辑</el-button>
     <el-dialog title="编 辑" :visible.sync="dialogFormVisible" width="600px">
     <el-dialog title="编 辑" :visible.sync="dialogFormVisible" width="600px">
       <div slot="title" style="font-size: 15px">
       <div slot="title" style="font-size: 15px">

+ 56 - 2
src/HDrpManagement/publicCustomer/index.vue

@@ -1,4 +1,3 @@
-
 <template>
 <template>
   <div>
   <div>
     <basicLayout 
     <basicLayout 
@@ -8,6 +7,17 @@
       idName="userid" 
       idName="userid" 
       :apiId="{query:20221011133602,del:''}"
       :apiId="{query:20221011133602,del:''}"
       :options="options">
       :options="options">
+      <template v-slot:titleRight="scope">
+        <el-divider direction="vertical"></el-divider>
+        <el-dropdown size="medium" @command="handleCommand">
+          <span class="el-dropdown-link">
+            {{poolValue}}<i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-for="(item,index) in poolList" :key="index" :command="item">{{item.poolname}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </template>
       <template v-slot:tbList="scope">
       <template v-slot:tbList="scope">
 <!--        <div v-if="scope.data.column.columnname == 'leader'">-->
 <!--        <div v-if="scope.data.column.columnname == 'leader'">-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]].length > 0 ? scope.data.column.data[[scope.data.column.columnname]].name : '&#45;&#45;'}}-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]].length > 0 ? scope.data.column.data[[scope.data.column.columnname]].name : '&#45;&#45;'}}-->
@@ -57,7 +67,10 @@ export default {
       customerType:'',
       customerType:'',
       customerLead:'',
       customerLead:'',
       publicList:'',
       publicList:'',
-      arealist:[]
+      arealist:[],
+      poolList:[],
+      poolValue:'全部',
+      tabIndex:""
     }
     }
   },
   },
   provide () {
   provide () {
@@ -104,11 +117,41 @@ export default {
       })
       })
       this.arealist = this.tool.createMenu(res.data)
       this.arealist = this.tool.createMenu(res.data)
     },
     },
+    /*获取公海列表*/
+    async queryPool(){
+      const res = await this.$api.requested({
+        "id": 20221009100702,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 99,
+          "where": {
+            "condition": "",
+            "startdate": "",
+            "enddate": ""
+          }
+        },
+      })
+      this.poolList = res.data
+    },
+    handleCommand(command){
+      console.log(command)
+      this.tabIndex = command.sa_customerpoolid
+      this.poolValue = command.poolname
+      this.$refs['basicLayout'].param.content.where.sa_customerpoolid = command.sa_customerpoolid
+      this.$refs['basicLayout'].listData()
+      // this.tabIndex = command.name
+      // this.editableTabsValue = command.title
+      // this.$refs['list'].param.content.type = command.name
+      // this.$refs['list'].param.content.isExport = 0
+      // this.$refs['list'].listData()
+      // this.$store.dispatch('sendDataToForm',)
+    }
   },
   },
   created() {
   created() {
     this.getSysOption()
     this.getSysOption()
     this.getPublicList()
     this.getPublicList()
     this.query_arealist()
     this.query_arealist()
+    this.queryPool()
   }
   }
 }
 }
 
 
@@ -118,4 +161,15 @@ export default {
   display: flex;
   display: flex;
   justify-content: s;
   justify-content: s;
 } */
 } */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #151515;
+  font-size: 16px;
+}
+.el-divider--vertical{
+  margin: 0 16px;
+}
+.el-icon-arrow-down {
+  font-size: 16px;
+}
 </style>
 </style>

+ 30 - 0
src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -19,6 +19,35 @@
     </div>
     </div>
     <div slot="customOperation">
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
       <!-- 此区域提供了自定义操作按钮 -->
+      <el-popover
+          placement="bottom"
+          width="50"
+          trigger="focus"
+          v-model="visible"
+      >
+<!--        <div class="normal-margin">-->
+<!--          <transactionUser v-if="tool.checkAuth($route.name,'responsible')" @onshow="show"></transactionUser>-->
+<!--        </div>-->
+<!--        <div class="normal-margin">-->
+<!--          <transaction_status v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>-->
+<!--        </div>-->
+<!--        <div class="normal-margin" v-show="mainData.datastatus === 0">-->
+<!--          <lock v-if="tool.checkAuth($route.name,'lock')"  :id="mainData.sa_customersid" @onshow="onSuccess"></lock>-->
+<!--        </div>-->
+<!--        <div class="normal-margin" v-show="mainData.datastatus === 2">-->
+<!--          <unlock v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock>-->
+<!--        </div>-->
+<!--        <div class="normal-margin">-->
+<!--          <share v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>-->
+<!--        </div>-->
+<!--        <div class="normal-margin">-->
+<!--          <send_back v-if="tool.checkAuth($route.name,'back')" :id="mainData.sa_customersid" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>-->
+<!--        </div>-->
+<!--        <div class="normal-margin" v-show="mainData.datastatus !== 1">-->
+<!--          <to_void v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>-->
+<!--        </div>-->
+        <el-button size="mini" slot="reference" icon="el-icon-more" @click="visible = !visible"></el-button>
+      </el-popover>
     </div>
     </div>
     <div slot="slot0" >
     <div slot="slot0" >
       <detailed :data="this.$route.query.id"></detailed>
       <detailed :data="this.$route.query.id"></detailed>
@@ -59,6 +88,7 @@ export default {
       arealist:[],
       arealist:[],
       publicList:[],
       publicList:[],
       tagObj:{},
       tagObj:{},
+      visible:false
     }
     }
   },
   },
   provide () {
   provide () {

+ 1 - 1
src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <div>
+  <div class="inline-16">
     <basicDetails
     <basicDetails
         ref="details"
         ref="details"
         :titleText="mainData.enterprisename"
         :titleText="mainData.enterprisename"

+ 17 - 21
src/SDrpManagement/salerPrivatecustomer/detail/index.vue

@@ -33,7 +33,7 @@
             <transaction_status v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>
             <transaction_status v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>
           </div>
           </div>
           <div class="normal-margin" v-show="mainData.datastatus === 0">
           <div class="normal-margin" v-show="mainData.datastatus === 0">
-            <lock v-if="tool.checkAuth($route.name,'lock')"  :id="mainData.sa_customersid" @onshow="onSuccess"></lock>
+            <lock v-if="tool.checkAuth($route.name,'lock')"   :id="mainData.sa_customersid" @onshow="onSuccess"></lock>
           </div>
           </div>
           <div class="normal-margin" v-show="mainData.datastatus === 2">
           <div class="normal-margin" v-show="mainData.datastatus === 2">
             <unlock v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock>
             <unlock v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock>
@@ -41,8 +41,8 @@
           <div class="normal-margin">
           <div class="normal-margin">
             <share v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
             <share v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
           </div>
           </div>
-          <div class="normal-margin">
-            <send_back v-if="tool.checkAuth($route.name,'back')" :id="mainData.sa_customersid" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>
+          <div class="normal-margin" >
+            <send_back v-if="tool.checkAuth($route.name,'back') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>
           </div>
           </div>
           <div class="normal-margin" v-show="mainData.datastatus !== 1">
           <div class="normal-margin" v-show="mainData.datastatus !== 1">
             <to_void v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
             <to_void v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
@@ -51,13 +51,13 @@
         </el-popover>
         </el-popover>
       </div>
       </div>
       <div slot="slot0" >
       <div slot="slot0" >
-        <detailed :data="this.$route.query.id"></detailed>
+        <detailed ref="detailed"></detailed>
       </div>
       </div>
-      <div slot="slot1" class="container normal-panel">
-        <contacts :data="this.$route.query.data"></contacts>
+      <div slot="slot1" class="container normal-panel"  >
+        <contacts :data="mainData"  @onSuccess="onSuccess" v-if="flag"></contacts>
       </div>
       </div>
       <div slot="slot2" class="container normal-panel">
       <div slot="slot2" class="container normal-panel">
-        <address_manage :data="this.$route.query.data"></address_manage>
+        <address_manage :data="mainData"  v-if="flag"></address_manage>
       </div>
       </div>
     </basicDetails>
     </basicDetails>
   </div>
   </div>
@@ -89,13 +89,14 @@ export default {
         userid:''
         userid:''
       },
       },
       users:[],
       users:[],
+      flag:false
     }
     }
   },
   },
   components:{
   components:{
     detailed,
     detailed,
     contacts,
     contacts,
-    address_manage
-    ,transactionUser,
+    address_manage,
+    transactionUser,
     lock,
     lock,
     unlock,
     unlock,
     share,
     share,
@@ -114,9 +115,9 @@ export default {
       this.mainData = res.data
       this.mainData = res.data
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.isExport = false
       this.$refs['details'].param.content.isExport = false
-      this.$refs['details'].param.content.sa_customersid = [this.mainData.sa_customersid]
       this.changeDataStructure()
       this.changeDataStructure()
-      this.queryTags(this.mainData.sa_customersid)
+      this.$refs.detailed.detailedList(this.mainData)
+      this.flag = true
     },
     },
     show(){
     show(){
       this.visible = false
       this.visible = false
@@ -145,7 +146,7 @@ export default {
         },
         },
         {
         {
           label:'负责人',
           label:'负责人',
-          value:this.mainData.leadername
+          value:this.mainData.leader[0].name
         },
         },
         {
         {
           label:'最近跟近时间',
           label:'最近跟近时间',
@@ -158,8 +159,10 @@ export default {
       ]
       ]
     },
     },
     // 监听切换数据,上一页,下一页
     // 监听切换数据,上一页,下一页
-    pageChange (id,rowindex) {
-      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex}})
+    pageChange (id,rowindex,tabIndex) {
+      this.flag = false
+      tabIndex = this.$route.query.tabIndex
+      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
       this.queryMainData(id)
     },
     },
     async queryTags(id){
     async queryTags(id){
@@ -183,13 +186,6 @@ export default {
   },
   },
   created() {
   created() {
     this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
     this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
-    /*this.tool.checkAuth(this.$route.name,'toVoid')?'':this.$router.go(-1)*/
-    // this.tool.checkAuth(this.$route.name,'responsible')?'':this.$router.go(-1)
-    // this.tool.checkAuth(this.$route.name,'transaction')?'':this.$router.go(-1)
-    // this.tool.checkAuth(this.$route.name,'lock')?'':this.$router.go(-1)
-    // this.tool.checkAuth(this.$route.name,'unlock')?'':this.$router.go(-1)
-    // this.tool.checkAuth(this.$route.name,'share')?'':this.$router.go(-1)
-    // this.tool.checkAuth(this.$route.name,'back')?'':this.$router.go(-1)
   }
   }
 }
 }
 </script>
 </script>

+ 3 - 3
src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -37,9 +37,9 @@
             {{scope.data.column.data[[scope.data.column.columnname]]}}
             {{scope.data.column.data[[scope.data.column.columnname]]}}
           </div>
           </div>
         </template>
         </template>
-        <template v-slot:tbOpreation="scope">
-          <el-button size="mini" type="text" @click="$router.push({path:'/customerDetail',query:{id:scope.data.data.sa_customersid,rowindex:scope.data.data.rowindex,tabIndex:tabIndex}})">详 情</el-button>
-        </template>
+<!--        <template v-slot:tbOpreation="scope">-->
+<!--          <el-button size="mini" type="text" @click="$router.push({path:'/customerDetail',query:{id:scope.data.data.sa_customersid,rowindex:scope.data.data.rowindex,tabIndex:tabIndex}})">详 情</el-button>-->
+<!--        </template>-->
       </basicLayout>
       </basicLayout>
   </div>
   </div>
 </template>
 </template>