Merge branch 'xiaoqin' into mergeBranch

src/Form/Creditbilladj/add.vue

@@ -106,6 +106,7 @@ export default {
           "sys_enterpriseid":this.form.sys_enterpriseid
         }
       })
+      this.form.sa_accountclassid = ''
       this.accountClassData = res.data
       console.log(this.accountClassData);
       

src/Form/Creditbilladj/edit.vue

@@ -103,6 +103,7 @@ export default {
           "sys_enterpriseid":this.form.sys_enterpriseid
         }
       })
+      this.form.sa_accountclassid = ''
       this.accountClassData = res.data
       console.log(this.accountClassData);
       

src/HDrpManagement/AccountMoney/index.vue

@@ -0,0 +1,36 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      formPath="AccountMoney" 
+      tableName="accountMoneyTable" 
+      :apiId="{query:20221008145903}"
+      :options="options">
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.columnname == 'province'">
+          {{`${scope.data.column.data[[scope.data.column.columnname]]}、${scope.data.column.data.city}、${scope.data.column.data.county}`}}
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data () {
+    return {
+      options:[]
+    }
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/Creditbilladj/index.vue

@@ -9,11 +9,13 @@
       :apiId="{query:20221008155103,del:20221008155403}"
       :options="options">
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname == 'status'" :style="scope.data.column.data[[scope.data.column.columnname]] == '审核' ? 'color: rgb(82, 196, 25);' : ''">{{scope.data.column.data[[scope.data.column.columnname]]}}</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="checkBuill(scope.data.data)" v-if="scope.data.data.status == '新建'">审 核</el-button>
         <el-button size="mini" type="text" @click="$router.push({path:'/EnterpriseArchivesDetail',query:{id:scope.data.data.sys_enterpriseid,rowindex:scope.data.data.rowindex}})">详 情</el-button>
       </template>
     </basicLayout>
@@ -29,6 +31,20 @@ export default {
     }
   },
   methods:{
+    async checkBuill(data) {
+      if(data.status != '新建') return
+      let res = this.$api.requested({
+        "id": "20221008155303",
+        "version":1,
+        "content": {
+            "sa_creditbillid":data.sa_creditbillid
+        }
+      })
+      console.log(res);
+      this.showMessage(res,() => {
+        this.$refs.basicLayout.listData()
+      })
+    }
   }
 }
 

src/HManagement/marketing/agent/modules/accountMoney/index.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <!-- <add v-if="tool.checkAuth($route.name,'agent_update') && !detail" class="normal-margin" @onSuccess="onSuccess"></add> -->
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)">
+      <template v-slot:customcol="scope">
+        <p>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+    </tableLayout>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props:['data'],
+  data () {
+    return {
+      list:[]
+    }
+  },
+  inject: ['sys_enterpriseid'],
+  components:{
+  },
+  props:['detail'],
+  methods:{
+    async query_areascope () {
+      const res = await this.$api.requested({
+        "id": "20221009160003",
+        "version":1,
+        "content": {
+            "sys_enterpriseid":this.sys_enterpriseid()
+        }
+      })
+      this.list = res.data
+    },
+  },
+  mounted () {
+  },
+  created () {
+    this.query_areascope()
+    // 获取角色表结构
+    this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyTable'].tablecols
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/marketing/agent/modules/agent_detail.vue

@@ -26,6 +26,8 @@
         <el-tab-pane label="经销商团队" name="first"></el-tab-pane>
         <el-tab-pane label="业绩目标" name="second"></el-tab-pane>
         <el-tab-pane label="代理区域" name="third"></el-tab-pane>
+        <el-tab-pane label="营销类别" name="saleclass"></el-tab-pane>
+        <el-tab-pane label="账户余额查询" name="accountMoney"></el-tab-pane>
       </el-tabs>
     </div>
     <div class="container normal-panel" v-if="activeName === 'first'">
@@ -33,7 +35,13 @@
       <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
     </div>
     <div class="container normal-panel" v-if="activeName === 'third'">
-      <salescope></salescope>
+      <salescope :detail="true"></salescope>
+    </div>
+    <div class="container normal-panel" v-if="activeName === 'saleclass'">
+      <sale-class :detail="true"></sale-class>
+    </div>
+    <div class="container normal-panel" v-if="activeName === 'accountMoney'">
+      <account-money></account-money>
     </div>
   </div>
 </template>
@@ -44,6 +52,10 @@ import arealist from '../../area/list.vue'
 import delAgent from './del_agent.vue'
 import startAgent from './start_agent.vue'
 import salescope from './salescope/list.vue'
+import SaleClass from './saleclass/index'
+import accountMoney from './accountMoney/index'
+
+
 
 export default {
   components:{
@@ -51,7 +63,9 @@ export default {
     arealist,
     delAgent,
     startAgent,
-    salescope
+    salescope,
+    SaleClass,
+    accountMoney
   },
   data () {
     return {
@@ -90,7 +104,14 @@ export default {
       },
       agent_type:[],
       agent_level:[],
-      tablecols:[]
+      tablecols:[],
+      sys_enterpriseid:''
+    }
+  },
+  /* 企业id */
+  provide() {
+    return {
+      sys_enterpriseid: () => this.sys_enterpriseid
     }
   },
   methods:{
@@ -102,6 +123,7 @@ export default {
             "sa_agentsid": this.$route.query.id
         }
       })
+      this.sys_enterpriseid = res.data.sys_enterpriseid
       let arr = ['province','city','county']
       res.data.value = []
       arr.forEach(e=>{

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -90,6 +90,7 @@
         <el-tab-pane label="业绩目标" name="second"></el-tab-pane>
         <el-tab-pane label="代理区域" name="third"></el-tab-pane>
         <el-tab-pane label="营销类别" name="saleclass"></el-tab-pane>
+        <el-tab-pane label="账户余额查询" name="accountMoney"></el-tab-pane>
       </el-tabs>
     </div>
     <div class="container normal-panel" v-if="activeName === 'first'">
@@ -103,12 +104,16 @@
     <div class="container normal-panel" v-if="activeName === 'saleclass'">
       <sale-class></sale-class>
     </div>
+    <div class="container normal-panel" v-if="activeName === 'accountMoney'">
+      <account-money></account-money>
+    </div>
   </div>
 </template>
 
 <script>
 import salescope from './salescope/list.vue'
 import SaleClass from './saleclass/index'
+import accountMoney from './accountMoney/index'
 import selectAgent from '../../../../components/selectAgent/index.vue'
 import arealist from '../../area/list.vue'
 export default {
@@ -116,7 +121,8 @@ export default {
     selectAgent,
     arealist,
     salescope,
-    SaleClass
+    SaleClass,
+    accountMoney
   },
   data () {
     return {

src/HManagement/marketing/agent/modules/saleclass/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add-sale-class class="normal-margin" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'add_saleClass')"/>
+    <add-sale-class class="normal-margin" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'add_saleClass') && !detail"/>
     <tableLayout v-if="saleClassList" :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 495px)" fixedName="operation">
       <template v-slot:opreation="scope">
         <Del v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
@@ -21,6 +21,7 @@ export default {
       tablecols:[]
     };
   },
+  props:['detail'],
   components:{addSaleClass,Del},
   computed:{
   },
@@ -29,6 +30,7 @@ export default {
   created() {
     this.getClassList()
     this.tablecols = this.tool.tabelCol(this.$route.name)['saleClassTable'].tablecols
+    if(this.detail) this.tablecols.pop()
   },
   methods: {
     /* 获取类别数据 */

src/HManagement/marketing/agent/modules/salescope/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add v-if="tool.checkAuth($route.name,'agent_update')" class="normal-margin" @onSuccess="onSuccess"></add>
+    <add v-if="tool.checkAuth($route.name,'agent_update') && !detail" class="normal-margin" @onSuccess="onSuccess"></add>
     <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)">
       <template v-slot:customcol="scope">
         <p>{{scope.column.data[scope.column.columnname]}}</p>
@@ -30,6 +30,7 @@ export default {
     ondel,
     edit
   },
+  props:['detail'],
   methods:{
     async query_areascope () {
       const res = await this.$api.requested({
@@ -51,6 +52,7 @@ export default {
   created () {
     // 获取角色表结构
     this.tablecols = this.tool.tabelCol(this.$route.name)['saleScopeTable'].tablecols
+    if(this.detail) this.tablecols.pop()
   }
 }
 

src/router/HDrpManagement.js

@@ -100,6 +100,15 @@ const HDrpManagement = [
       keeproute: true,
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/index')
+  },{
+    path: '/accountmoney',
+    name:'accountmoney',
+    meta: {
+      title: '营销账户余额',
+      ast_nav: true,
+      keeproute: true,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/AccountMoney/index')
   }
 
 ];