Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/Form/customer/add.vue → src/Form/salerPrivatecustomer/add.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-button  size="mini" type="primary" @click="show">新 增</el-button>
+  <div v-if="dataToForm === '1'">
+    <el-button size="mini" type="primary" @click="show">新 增</el-button>
     <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="900px">
       <div slot="title" style="font-size: 15px">
         新增客户
@@ -107,6 +107,7 @@
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
 export default {
   name: "add",
   data(){
@@ -144,6 +145,11 @@ export default {
       }
     }
   },
+  computed:{
+    ...mapGetters({
+      dataToForm:'dataToForm'
+    })
+  },
   methods:{
     show(){
       this.dialogFormVisible = true

src/Form/salerPrivatecustomer/edit.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="inline-16">
+    <el-button size="mini" :disabled="dataToForm.datastatus === 2" :type="btnType?btnType:'text'"   @click="show" >编 辑</el-button>
+    <el-dialog title="编 辑" :visible.sync="dialogFormVisible" width="600px">
+      <div slot="title" style="font-size: 15px">
+        编辑客户
+      </div>
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
+          <el-col :span="20">
+            <el-form-item label="客户名称" prop="enterprisename">
+              <el-input v-model="form.enterprisename" placeholder="请输入客户名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="客户类型" >
+              <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 345px">
+                <el-option
+                    v-for="item in options.type"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="客户来源" >
+              <el-input v-model="form.source" placeholder="请输入客户来源"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="上级客户" >
+              <el-select v-model="form.parentid" placeholder="请选择上级客户" style="width: 345px">
+                <el-option
+                    v-for="item in options.parentCustomers"
+                    :key="item.sa_customersid"
+                    :label="item.enterprisename"
+                    :value="item.sa_customersid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="15">
+            <el-form-item label="省市县" >
+              <el-cascader
+                  style="width: 345px"
+                  v-model="form.value"
+                  :options="basicData.data().areaData"
+                  @change="cascaderChange" clearable>
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="企业地址" >
+              <el-input v-model="form.address" placeholder="请输入企业简称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="企业简称" >
+              <el-input v-model="form.abbreviation" placeholder="请输入企业简称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="企业税号" >
+              <el-input v-model="form.taxno" placeholder="请输入企业税号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="客户等级" >
+              <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 345px">
+                <el-option
+                    v-for="item in options.gradeData"
+                    :key="item.rowindex"
+                    :label="item.value"
+                    :value="item.rowindex">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="所属行业" >
+              <el-select v-model="form.industry" placeholder="请选择所属行业" style="width: 345px">
+                <el-option
+                    v-for="item in options.industryData"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="联系方式" >
+              <el-input v-model="form.phonenumber" placeholder="请输入联系方式"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from 'vuex'
+export default {
+  name: "edit",
+  props:['data','btnType'],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        value:[],
+        sa_customersid:0,
+        sys_enterpriseid:0,
+        enterprisename:'',
+        type:'',
+        source:'',
+        parentid:'',
+        abbreviation:'',
+        taxno:'',
+        grade:'',
+        industry:'',
+        phonenumber:'',
+        province:'',
+        city:'',
+        county:'',
+        address:'',
+        datastatus:''
+      },
+      value:'',
+      options:{
+        type:[],
+        parentCustomers:[],
+        gradeData:[],
+        industryData:[]
+      },
+      rules:{
+        enterprisename: [
+          { required: true, message: '输入客户', trigger: 'blur' },
+        ],
+      }
+    }
+  },
+  computed:{
+    ...mapGetters ({
+      dataToForm:'dataToForm'
+    })
+  },
+  methods:{
+    show(){
+      this.dialogFormVisible = true
+      this.typeList()
+      this.parentCustomer()
+      this.gradeList()
+      this.industryList()
+      let arr = ['province','city','county']
+      arr.forEach(e=>{
+        this.data[e] !== '' ?this.form.value.push(this.data[e]):''
+      })
+      this.form = Object.assign({},this.form,this.data)
+      if (this.form.parentid === 0){
+        this.form.parentid = '未选择'
+      }
+    },
+    onSubmit(){
+      if (this.form.parentid === '未选择'){
+        this.form.parentid = 0
+      }
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221012163902,
+          "content": this.form
+        })
+        this.tool.showMessage(res, ()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+
+    },
+    /*客户类型列表*/
+    async typeList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "customertypemx",
+          "parameter": {
+            "siteid": "YOSTEST2"
+          }
+        }
+      })
+      this.options.type = res.data
+    },
+
+    /*上级客户*/
+    async parentCustomer(){
+      const res = await this.$api.requested({
+        "id": 20221014101002,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        }
+      })
+      console.log(res)
+      this.options.parentCustomers = res.data
+    },
+    /*省市县*/
+    cascaderChange (val) {
+      if (val.length === 1)
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
+
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+
+    },
+    /*客户等级*/
+    async gradeList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "customergrade",
+          "parameter": {
+            "siteid": "YOSTEST2"
+          }
+        }
+      })
+      this.options.gradeData = res.data
+    },
+    /*行业列表*/
+    async industryList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "industry",
+          "parameter": {
+            "siteid": "YOSTEST2"
+          }
+        }
+      })
+      this.options.industryData = res.data
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/Form/customer/edit.vue → src/Form/salerPublicCustomer/edit.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
-    <el-button size="mini" :type="btnType?btnType:'text'"  type="text" @click="show">编 辑</el-button>
-    <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="900px">
+  <div class="inline-16" >
+    <el-button size="mini" :disabled="dataToForm.datastatus === 2" :type="btnType?btnType:'text'"   @click="show" v-show="form.datastatus !== 2">编 辑</el-button>
+    <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="600px">
       <div slot="title" style="font-size: 15px">
         新增客户
       </div>
@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="20">
             <el-form-item label="客户类型" >
-              <el-select v-model="form.type" placeholder="请选择客户类型">
+              <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 345px">
                 <el-option
                     v-for="item in options.type"
                     :key="item.value"
@@ -31,20 +31,20 @@
           </el-col>
           <el-col :span="20">
             <el-form-item label="上级客户" >
-                <el-select v-model="form.parentid" placeholder="请选择上级客户">
-                  <el-option
-                      v-for="item in options.parentCustomers"
-                      :key="item.sa_customersid"
-                      :label="item.enterprisename"
-                      :value="item.sa_customersid">
-                  </el-option>
-                </el-select>
+              <el-select v-model="form.parentid" placeholder="请选择上级客户" style="width: 345px">
+                <el-option
+                    v-for="item in options.parentCustomers"
+                    :key="item.sa_customersid"
+                    :label="item.enterprisename"
+                    :value="item.sa_customersid">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="15">
             <el-form-item label="省市县" >
               <el-cascader
-                  style="width:100%"
+                  style="width: 345px"
                   v-model="form.value"
                   :options="basicData.data().areaData"
                   @change="cascaderChange" clearable>
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="20">
             <el-form-item label="客户等级" >
-              <el-select v-model="form.grade" placeholder="请选择客户等级">
+              <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 345px">
                 <el-option
                     v-for="item in options.gradeData"
                     :key="item.rowindex"
@@ -80,7 +80,7 @@
           </el-col>
           <el-col :span="20">
             <el-form-item label="所属行业" >
-              <el-select v-model="form.industry" placeholder="请选择所属行业">
+              <el-select v-model="form.industry" placeholder="请选择所属行业" style="width: 345px">
                 <el-option
                     v-for="item in options.industryData"
                     :key="item.value"
@@ -147,7 +147,8 @@ export default {
   },
   computed:{
     ...mapGetters ({
-      arealist:'arealist'
+      arealist:'arealist',
+      dataToForm:'dataToForm'
     })
   },
   methods:{

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <basicDetails
+        ref="details"
+        :titleText="mainData.enterprisename"
+        formPath="salerPrivatecustomer"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20221012164402"
+        idname="sa_customersid"
+        :tags="[]"
+        :tabs="['详细信息','联系人信息','客户地址','客户财务信息','工商信息','项目商机','报价单','合同信息','订单记录','出货记录','开票记录','回款记录','工单记录']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+        <!-- 使用此插槽可不传[tags] -->
+        <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
+      </div>
+      <div slot="customOperation" style="float: right">
+        <!-- 此区域提供了自定义操作按钮 -->
+        <el-popover
+            placement="bottom"
+            width="50">
+          <div class="normal-margin">
+            <el-button style="width:100%" size="mini"  block>更换负责人</el-button>
+          </div>
+          <div class="normal-margin">
+            <el-button style="width:100%" size="mini" block @click="transactionStatusShow">更改成交状态</el-button>
+          </div>
+          <div class="normal-margin" v-show="mainData.datastatus === 0">
+            <el-button style="width:100%" size="mini" block @click="dataStatus(2)">锁定</el-button>
+          </div>
+          <div class="normal-margin" v-show="mainData.datastatus === 2">
+            <el-button style="width:100%" size="mini" block @click="dataStatus(0)">解锁</el-button>
+          </div>
+          <div class="normal-margin">
+            <el-button style="width:100%" size="mini" block @click="transfer">转移</el-button>
+          </div>
+          <div class="normal-margin">
+            <el-button style="width:100%" size="mini" block @click="goBack">退回</el-button>
+          </div>
+          <div class="normal-margin" v-show="mainData.datastatus !== 1">
+            <el-button style="width:100%" size="mini" block @click="dataStatus(1)">作废</el-button>
+          </div>
+          <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
+        </el-popover>
+      </div>
+    </basicDetails>
+    <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="500px">
+      <div slot="title" style="font-size: 15px">
+        新增客户
+      </div>
+      <el-row :gutter="20">
+        <el-form :model="form"  ref="form" label-width="120px" label-position="left" size="mini">
+          <el-col :span="20">
+            <el-form-item label="客户类型" >
+              <el-select v-model="form.status" placeholder="请选择客户类型">
+                <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="transactionStatus" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  data() {
+    return {
+      mainData:{},
+      mainAreaData:[],
+      tags:[],
+      dialogFormVisible:false,
+      form:{
+        status
+      },
+      options:[
+        {
+          label:'未成交',
+          value:'未成交'
+        },
+        {
+          label:'已成交',
+          value:'已成交'
+        },
+        {
+          label:'多次成交',
+          value:'多次成交'
+        }
+      ]
+    }
+  },
+  components:{
+
+  },
+  methods:{
+    async queryMainData(id) {
+      const res = await this.$api.requested({
+        "id": 20221012164302,
+        "content": {
+          "sa_customersid": this.$route.query.id
+        },
+      })
+      this.mainData = res.data
+      this.$refs['details'].param.content.type = this.$route.query.tabIndex
+      this.$store.dispatch('sendDataToForm',this.mainData)
+      this.changeDataStructure()
+    },
+    changeDataStructure() {
+      this.mainAreaData = [
+        {
+          label:'客户编号',
+          value:this.mainData.sa_customersid
+        },
+        {
+          label:'客户级别',
+          value:this.mainData.grade
+        },
+        {
+          label:'客户类型',
+          value:this.mainData.type
+        },
+        {
+          label:'上级企业',
+          value:this.mainData.parentid
+        },
+        {
+          label:'成交状态',
+          value:this.mainData.tradingstatus
+        },
+        {
+          label:'负责人',
+          value:this.mainData.createby
+        },
+        {
+          label:'最近跟近时间',
+          value:''
+        },
+        {
+          label:'所属公海',
+          value:this.mainData.poolname
+        }
+      ]
+    },
+    // 监听切换数据,上一页,下一页
+    pageChange (id,rowindex) {
+      console.log(id)
+      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex}})
+      this.queryMainData(id)
+    },
+    async queryTags(data){
+      const res = await this.$api.requested({
+        "id": 20220929085401,
+        "content": {
+          "ownertable":data[0].ownertable,
+          "ownerid":data[0].ownerid
+        }
+      })
+      this.tags = res.data.datatag
+    },
+    /*转移*/
+    async transfer(){
+      const res = await this.$api.requested({
+        "id": 20221014102502,
+        "content": {
+          "sa_customerpoolid":this.mainData.sa_customerpoolid,//公海池id
+          "sa_customersids":this.mainData.sa_customersids//客户id
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    },
+    /*退回*/
+    async goBack(){
+      const res = await this.$api.requested({
+        "id": 20221014102602,
+        "content": {
+          "sa_customerpoolid": [this.mainData.sa_customerpoolid],
+          "sa_customersids": this.mainData.sa_customersids
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    },
+    transactionStatusShow(){
+      this.dialogFormVisible = true
+    },
+    /*更改成交状态*/
+    async transactionStatus(){
+      const res = await this.$api.requested({
+        "id": 20221012164102,
+        "content": {
+          "sa_customersids": [this.mainData.sa_customersid],
+          "tradingstatus": this.form.status//（未成交、已成交、多次成交）
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogFormVisible = false
+        this.$emit('onSuccess')
+      })
+    },
+    /*数据状态变更*/
+    async dataStatus(status){
+      const res = await this.$api.requested({
+        "id": 20221012164002,
+        "content": {
+          "sa_customersids": [this.mainData.sa_customersid],
+          "datastatus": status//（0:正常；1:作废；2:锁定）
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogFormVisible = false
+        this.$emit('onSuccess')
+      })
+    }
+  },
+  mounted () {
+    this.queryMainData(this.$route.query.id)
+    this.queryTags(this.$route.query.tag)
+
+
+  },
+  created() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/customer/index.vue → src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -11,17 +11,16 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <basicLayout style="margin-top:-16px" ref="list" formPath="customer" tableName="customerTable" idName="sa_customersid" :apiId="{query:20221012164402,del:''}" :options="options">
+    <basicLayout style="margin-top:-16px" ref="list" formPath="salerPrivatecustomer" tableName="salerPrivatecustomerTable" idName="sa_customersid" :apiId="{query:20221012164402,del:''}" :options="options" :autoQuery="false">
       <template v-slot:tbList="scope">
-        <div v-if="scope.data.column.columnname === 'leader'">
+        <div v-if="scope.data.column.columnname === 'isleader'">
           <span>已分配</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'contact'">
-          <p>{{scope.data.column.data.createby}}</p>
+          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:''}}</span>
         </div>
-        <div v-else-if="scope.data.column.columnname === 'followdate'">
-          <p>{{scope.data.column.data.createdate}}</p>
-<!--          <span>{{scope.data.column.data.leader[0].changedate}}</span>-->
+        <div v-else-if="scope.data.column.columnname === 'leader'">
+          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].changedate:''}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'grade'">
           <p v-if="scope.data.column.data.grade === 2">B级</p>
@@ -33,6 +32,7 @@
         </div>
       </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,tag:scope.data.data.leader,tabIndex:tabIndex}})">详 情</el-button>
       </template>
     </basicLayout>
 
@@ -69,12 +69,15 @@ export default {
     queryData(id){
       console.log("执行")
       this.$refs['list'].param.content.type = id
+      this.$refs['list'].param.content.isExport = false
       this.$refs['list'].listData()
     },
     onChange (val) {
       console.log(val)
       this.$refs['list'].param.content.type = val.name
+      this.$refs['list'].param.content.isExport = 0
       this.$refs['list'].listData()
+      this.$store.dispatch('sendDataToForm',val.name)
     }
   }
 }

src/SDrpManagement/salerPublicCustomer/detail/index.vue

@@ -0,0 +1,252 @@
+<template>
+  <div>
+  <basicDetails
+      ref="details"
+      :titleText="mainData.enterprisename"
+      formPath="salerPublicCustomer"
+      :editData="mainData"
+      :mainAreaData="mainAreaData"
+      turnPageId="20221014164702"
+      idname="sa_customersid"
+      :tags="[]"
+      :tabs="['详细信息','联系人信息','客户地址','客户财务信息','工商信息','项目商机','报价单','合同信息','订单记录','出货记录','开票记录','回款记录','工单记录']"
+      @pageChange="pageChange"
+      @onEditSuccess="queryMainData($route.query.id)">
+    <div slot="tags">
+      <!-- 使用此插槽可不传[tags] -->
+      <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
+    </div>
+    <div slot="customOperation" style="float: right">
+      <!-- 此区域提供了自定义操作按钮 -->
+      <el-popover
+          placement="bottom"
+          width="50">
+        <div class="normal-margin">
+          <el-button style="width:100%" size="mini"  block>更换负责人</el-button>
+        </div>
+        <div class="normal-margin">
+          <el-button style="width:100%" size="mini" block @click="transactionStatusShow">更改成交状态</el-button>
+        </div>
+        <div class="normal-margin">
+          <el-button style="width:100%" size="mini" block @click="receive">领取</el-button>
+        </div>
+        <div class="normal-margin" v-show="mainData.datastatus === 0">
+          <el-button style="width:100%" size="mini" block @click="dataStatus(2)">锁定</el-button>
+        </div>
+        <div class="normal-margin" v-show="mainData.datastatus === 2">
+          <el-button style="width:100%" size="mini" block @click="dataStatus(0)">解锁</el-button>
+        </div>
+        <div class="normal-margin">
+          <el-button style="width:100%" size="mini" block @click="transfer">转移</el-button>
+        </div>
+        <div class="normal-margin">
+          <el-button style="width:100%" size="mini" block @click="goBack">退回</el-button>
+        </div>
+        <div class="normal-margin" v-show="mainData.datastatus !== 1">
+          <el-button style="width:100%" size="mini" block @click="dataStatus(1)">作废</el-button>
+        </div>
+        <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
+      </el-popover>
+    </div>
+  </basicDetails>
+  <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="500px">
+    <div slot="title" style="font-size: 15px">
+      新增客户
+    </div>
+    <el-row :gutter="20">
+      <el-form :model="form"  ref="form" label-width="120px" label-position="left" size="mini">
+        <el-col :span="20">
+          <el-form-item label="客户类型" >
+            <el-select v-model="form.status" placeholder="请选择客户类型">
+              <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <div class="dialog-footer">
+      <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+      <el-button size="small" type="warning" @click="transactionStatus" class="normal-btn-width btn-warning">确 定</el-button>
+    </div>
+  </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {
+      mainData:{},
+      mainAreaData:[],
+      tags:[],
+      dialogFormVisible:false,
+      form:{
+        status
+      },
+      options:[
+        {
+          label:'未成交',
+          value:'未成交'
+        },
+        {
+          label:'已成交',
+          value:'已成交'
+        },
+        {
+          label:'多次成交',
+          value:'多次成交'
+        }
+      ]
+    }
+  },
+  methods:{
+    async queryMainData (id) {
+      const res = await this.$api.requested({
+        "id": 20221012164302,
+        "content": {
+          "sa_customersid": this.$route.query.id
+        },
+      })
+      this.mainData = res.data
+      this.$store.dispatch('sendDataToForm',this.mainData)
+      this.changeDataStructure()
+    },
+    pageChange (id,rowindex) {
+      this.$router.replace({path:'/salerPublicCustomerDetail',query:{id:id,rowindex:rowindex}})
+      this.queryMainData(id)
+    },
+    changeDataStructure() {
+      this.mainAreaData = [
+        {
+          label:'客户编号',
+          value:this.mainData.sa_customersid
+        },
+        {
+          label:'客户级别',
+          value:this.mainData.grade
+        },
+        {
+          label:'客户类型',
+          value:this.mainData.type
+        },
+        {
+          label:'上级企业',
+          value:this.mainData.parentid
+        },
+        {
+          label:'成交状态',
+          value:this.mainData.tradingstatus
+        },
+        {
+          label:'负责人',
+          value:this.mainData.createby
+        },
+        {
+          label:'最近跟近时间',
+          value:''
+        },
+        {
+          label:'所属公海',
+          value:this.mainData.poolname
+        }
+      ]
+    },
+    /*查询标签*/
+    async queryTags(data){
+      const res = await this.$api.requested({
+        "id": 20220929085401,
+        "content": {
+          "ownertable":data[0].ownertable,
+          "ownerid":data[0].ownerid
+        }
+      })
+      this.tags = res.data.datatag
+    },
+    /*领取*/
+    async receive(){
+      console.log(this.mainData)
+      const res = await this.$api.requested({
+        "id": 20221014160202,
+        "content": {
+          "sa_customersid":this.mainData.sa_customersid
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    },
+    /*转移*/
+    async transfer(){
+      const res = await this.$api.requested({
+        "id": 20221014102502,
+        "content": {
+          "sa_customerpoolid":this.mainData.sa_customerpoolid,//公海池id
+          "sa_customersids":this.mainData.sa_customersids//客户id
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    },
+    /*退回*/
+    async goBack(){
+      const res = await this.$api.requested({
+        "id": 20221014102602,
+        "content": {
+          "sa_customerpoolid": this.mainData.sa_customerpoolid,
+          "sa_customersids": this.mainData.sa_customersids
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    },
+    transactionStatusShow(){
+      this.dialogFormVisible = true
+    },
+    /*更改成交状态*/
+    async transactionStatus(){
+      const res = await this.$api.requested({
+        "id": 20221012164102,
+        "content": {
+          "sa_customersids": [this.mainData.sa_customersid],
+          "tradingstatus": this.form.status//（未成交、已成交、多次成交）
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogFormVisible = false
+        this.$emit('onSuccess')
+      })
+    },
+    /*数据状态变更*/
+    async dataStatus(status){
+      const res = await this.$api.requested({
+        "id": 20221012164002,
+        "content": {
+          "sa_customersids": [this.mainData.sa_customersid],
+          "datastatus": status//（0:正常；1:作废；2:锁定）
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogFormVisible = false
+        this.$emit('onSuccess')
+      })
+
+    }
+  },
+  mounted () {
+    this.queryMainData(this.$route.query.id)
+    this.queryTags(this.$route.query.tag)
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/salerPublicCustomer/index.vue

@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <basicLayout ref="list" formPath="salerPublicCustomer" tableName="salerPublicCustomer" idName="sa_customersid" :apiId="{query:20221014164702,del:''}" :options="options" :autoQuery="false">
+      <div slot="custom"></div>
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.columnname === 'parentid'">
+          <p v-if="scope.data.column.data.parentid === 0">无</p>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'contacts'">
+          <p v-if="scope.data.column.data.leader">无</p>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'leader'">
+          <p v-if="scope.data.column.data.leader">无</p>
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+          <el-button size="mini" type="text" @click="$router.push({path:'/salerPublicCustomerDetail',query:{id:scope.data.data.sa_customersid,rowindex:scope.data.data.rowindex,tag:scope.data.data.leader}})">详 情</el-button>
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data () {
+    return {
+      options:[]
+    }
+  },
+  methods:{
+  },
+  mounted() {
+    this.$refs['list'].param.content.isExport = false
+    this.$refs['list'].listData()
+  },
+  created() {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/normal-basic-layout/details/index.vue

@@ -67,6 +67,7 @@ export default {
       param:{
         "id": '',
         "content": {
+          "isExport":false,
           "pageNumber": 1,
           "pageSize": 1,
           "where": {
@@ -87,7 +88,6 @@ export default {
       this.param.content.pageNumber = pageNumber
       const res = await this.$api.requested(this.param)
       this.total = res.total
-      console.log(res.data[0][this.idname],res.data[0].rowindex)
       this.$emit('pageChange',res.data[0][this.idname],res.data[0].rowindex)
     },
     next () {

src/detailDemo.vue

@@ -36,9 +36,9 @@
 </template>
 
 <script>
-import salescope from './modules/salescope/list'
-import SaleClass from './modules/saleclass/index'
-import accountMoney from './modules/accountMoney/index'
+import salescope from './detail/salescope/list'
+import SaleClass from './detail/saleclass/index'
+import accountMoney from './detail/accountMoney/index'
 export default {
   data () {
     return {

src/router/SDrpManagement.js

@@ -49,14 +49,44 @@ const SDrpManagement = [
     component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail')
   },
   {
-    path: '/customer',
-    name: 'customer',
+    path: '/salerPrivatecustomer',
+    name: 'salerPrivatecustomer',
     meta: {
-      title: '客户',
+      title: '业务员私域客户',
       ast_nav:true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/customer/index')
+    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerPrivatecustomer/index')
+  },
+  {
+    path: '/customerDetail',
+    name: 'salerPrivatecustomer',
+    meta: {
+      title: '业务员私域客户详情',
+      ast_nav:true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerPrivatecustomer/detail/customerDetail')
+  },
+  {
+    path: '/salerPublicCustomer',
+    name: 'salerPublicCustomer',
+    meta: {
+      title: "业务员公海客户",
+      ast_nav:true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerPublicCustomer/index')
+  },
+  {
+    path: '/salerPublicCustomerDetail',
+    name: 'salerPublicCustomer',
+    meta: {
+      title: "业务员公海客户详情",
+      ast_nav:true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerPublicCustomer/detail/index')
   }
 ]
 export default SDrpManagement