代码上传

src/HManagement/accountManage/index.vue

@@ -4,15 +4,14 @@
     <basicLayout 
       ref="basicLayout" 
       :oldFormPath="{
-        add:'HManagement/accountManage/modules',
-        edit:'HManagement/accountManage/modules/account_edit'
+        add:'HManagement/accountManage/modules'
       }"
       tableName="accountTable" 
       idName="userid" 
       :apiId="{query:20221031141102,del:20221031141102}"
       :options="options"
       :detailPath="{
-        path:'/EnterpriseArchivesDetail'
+        path:'/account_details'
       }">
       <div slot="custom">
         <el-select

src/HManagement/accountManage/modules/account_detail copy.vue

@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <div class="container normal-panel normal-margin">
+      <el-descriptions title="用户信息">
+          <el-descriptions-item label="账号">{{minaInfo.accountno}}</el-descriptions-item>
+          <el-descriptions-item label="账号类型">{{minaInfo.usertypename}}</el-descriptions-item>
+          <el-descriptions-item label="状态">
+            <span :style="minaInfo.status === 'ACTIVE'?'color:#52C41A':'color:#FF3B30'">{{minaInfo.status === 'ACTIVE'?'启用':minaInfo.status === 'INACTIVE'?'停用':'其他'}}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="手机号">{{minaInfo.phonenumber}}</el-descriptions-item>
+          <el-descriptions-item label="账号密码">
+            ********
+          </el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <div class="container normal-panel normal-margin">
+      <el-descriptions title="员工信息" :column="6">
+          <el-descriptions-item label="编号">{{minaInfo.hrmsg.hrcode?minaInfo.hrmsg.hrcode:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="身份证号">{{minaInfo.hrmsg.idcard?minaInfo.hrmsg.idcard:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="部门">{{minaInfo.hrmsg.depname?minaInfo.hrmsg.depname:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="是否部门负责人">{{minaInfo.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
+          <el-descriptions-item label="职位">{{minaInfo.hrmsg.position?minaInfo.hrmsg.position:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="办公电话">{{minaInfo.hrmsg.officetelephone?minaInfo.hrmsg.officetelephone:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="姓名">{{minaInfo.hrmsg.name?minaInfo.hrmsg.name:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="电话">{{minaInfo.hrmsg.phonenumber?minaInfo.hrmsg.phonenumber:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="性别">{{minaInfo.hrmsg.sex?minaInfo.hrmsg.sex:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="电子邮箱">{{minaInfo.hrmsg.email?minaInfo.hrmsg.email:'--'}}</el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <div class="container normal-panel normal-margin">
+      <el-descriptions title="角色信息"></el-descriptions>
+      <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
+        <template v-slot:opreation="scope">
+          <el-button type="text" size="small" @click="$router.push({path:'/roleDetail',query:{id:scope.data.roleid}})">详 情</el-button>
+        </template>
+      </tableLayout>
+    </div>
+  </div>
+</template>
+
+<script>
+import tableLayout from '../../../components/dynamic-table'
+
+export default {
+  components:{
+    tableLayout
+  },
+  data () {
+    return {
+      minaInfo:{},
+      table_userinfo:[],
+      table_hrinfo:[],
+      table_roleinfo:[],
+      list:[],
+      hrmsg:[],
+      roleData:[]
+    }
+  },
+  methods:{
+    async userMian () {
+      const res = await this.$api.requested({
+        "classname": "webmanage.users.users",
+        "method": "query_userMain",
+        "content": {
+            "userid": this.$route.query.id
+        }
+      })
+      this.minaInfo = res.data
+      // 插入用户数据
+      let arr = [{
+        accountno:res.data.accountno,
+        phonenumber:res.data.phonenumber,
+        usertypename:res.data.usertypename,
+        status:res.data.status
+      }]
+      this.list = arr
+      // 插入人员数据
+      if (typeof(res.data.hrmsg) === 'object'){
+        res.data.hrmsg.systemname = res.data.name
+        let hrmsg = [res.data.hrmsg]
+        this.hrmsg = hrmsg
+      }
+      // 插入角色数据
+      this.roleData = res.data.userrole
+    }
+  },
+  mounted () {
+    this.userMian()
+    // 获取用户信息表结构
+    this.table_userinfo = this.tool.tabelCol(this.$route.name).detailUserinfo.tablecols
+    // 获取人员表结构
+    this.table_hrinfo = this.tool.tabelCol(this.$route.name).detailHrInfo.tablecols
+    // 获取角色表结构
+    this.table_roleinfo = this.tool.tabelCol(this.$route.name).detailRoleInfo.tablecols
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.title{
+  height: 20px;
+  line-height: 20px;
+  font-size: 14px;
+  text-indent: 7px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 20px;
+  border-left: .3rem solid #3874F6;
+}
+.mb-40{
+  margin-bottom:40px
+}
+</style>

src/HManagement/accountManage/modules/account_detail.vue

@@ -1,115 +1,109 @@
 <template>
   <div>
-    <div class="container normal-panel normal-margin">
-      <el-descriptions title="用户信息">
-          <el-descriptions-item label="账号">{{minaInfo.accountno}}</el-descriptions-item>
-          <el-descriptions-item label="账号类型">{{minaInfo.usertypename}}</el-descriptions-item>
-          <el-descriptions-item label="状态">
-            <span :style="minaInfo.status === 'ACTIVE'?'color:#52C41A':'color:#FF3B30'">{{minaInfo.status === 'ACTIVE'?'启用':minaInfo.status === 'INACTIVE'?'停用':'其他'}}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="手机号">{{minaInfo.phonenumber}}</el-descriptions-item>
-          <el-descriptions-item label="账号密码">
-            ********
-          </el-descriptions-item>
-      </el-descriptions>
-    </div>
-    <div class="container normal-panel normal-margin">
-      <el-descriptions title="员工信息" :column="6">
-          <el-descriptions-item label="编号">{{minaInfo.hrmsg.hrcode?minaInfo.hrmsg.hrcode:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="身份证号">{{minaInfo.hrmsg.idcard?minaInfo.hrmsg.idcard:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="部门">{{minaInfo.hrmsg.depname?minaInfo.hrmsg.depname:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="是否部门负责人">{{minaInfo.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
-          <el-descriptions-item label="职位">{{minaInfo.hrmsg.position?minaInfo.hrmsg.position:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="办公电话">{{minaInfo.hrmsg.officetelephone?minaInfo.hrmsg.officetelephone:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="姓名">{{minaInfo.hrmsg.name?minaInfo.hrmsg.name:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="电话">{{minaInfo.hrmsg.phonenumber?minaInfo.hrmsg.phonenumber:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="性别">{{minaInfo.hrmsg.sex?minaInfo.hrmsg.sex:'--'}}</el-descriptions-item>
-          <el-descriptions-item label="电子邮箱">{{minaInfo.hrmsg.email?minaInfo.hrmsg.email:'--'}}</el-descriptions-item>
-      </el-descriptions>
-    </div>
-    <div class="container normal-panel normal-margin">
-      <el-descriptions title="角色信息"></el-descriptions>
-      <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
-        <template v-slot:opreation="scope">
-          <el-button type="text" size="small" @click="$router.push({path:'/roleDetail',query:{id:scope.data.roleid}})">详 情</el-button>
-        </template>
-      </tableLayout>
-    </div>
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.accountno}-${mainData.name}`"
+        :oldFormPath="{edit:'HManagement/accountManage/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20221031141102"
+        idname="userid"
+        ownertable="sys_users"
+        tags=""
+        :tabs="['员工信息','角色信息']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation" >
+      </div>
+      <div slot="slot0" >
+      </div>
+      <div slot="slot1" >
+      </div>
+    </basicDetails>
   </div>
 </template>
 
 <script>
-import tableLayout from '../../../components/dynamic-table'
-
 export default {
-  components:{
-    tableLayout
-  },
-  data () {
+  name: "detail",
+  data() {
     return {
-      minaInfo:{},
-      table_userinfo:[],
-      table_hrinfo:[],
-      table_roleinfo:[],
-      list:[],
-      hrmsg:[],
-      roleData:[]
+      mainData:{},
+      mainAreaData:{}
     }
   },
+  components:{
+  },
   methods:{
-    async userMian () {
+    async queryMainData(id) {
       const res = await this.$api.requested({
         "classname": "webmanage.users.users",
         "method": "query_userMain",
         "content": {
-            "userid": this.$route.query.id
+          "userid": this.$route.query.id
         }
       })
-      this.minaInfo = res.data
-      // 插入用户数据
-      let arr = [{
-        accountno:res.data.accountno,
-        phonenumber:res.data.phonenumber,
-        usertypename:res.data.usertypename,
-        status:res.data.status
-      }]
-      this.list = arr
-      // 插入人员数据
-      if (typeof(res.data.hrmsg) === 'object'){
-        res.data.hrmsg.systemname = res.data.name
-        let hrmsg = [res.data.hrmsg]
-        this.hrmsg = hrmsg
-      }
-      // 插入角色数据
-      this.roleData = res.data.userrole
+      this.mainData = res.data
+    },
+    changeDataStructure() {
+      this.mainAreaData = [
+        {
+          label:'账号类型',
+          value:this.mainData.usertypename
+        },
+        {
+          label:'状态',
+          value:this.minaInfo.status === 'ACTIVE'?'启用':this.minaInfo.status === 'INACTIVE'?'停用':'其他'
+        },
+        {
+          label:'联系方式',
+          value:this.mainData.phonenumber
+        },
+        {
+          label:'上级企业',
+          value:this.mainData.superiorenterprisename
+        },
+        {
+          label:'成交状态',
+          value:this.mainData.tradingstatus
+        },
+        {
+          label:'负责人',
+          value:this.mainData.leader[0]?this.mainData.leader[0].name:""
+        },
+        {
+          label:'最近跟近时间',
+          value:''
+        },
+        {
+          label:'所属公海',
+          value:this.mainData.poolname
+        }
+      ]
+    },
+    // 监听切换数据,上一页,下一页
+    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)
+    },
+    onSuccess(){
+      this.visible = false
+      this.queryMainData(this.$route.query.id)
+      this.$emit('onSuccess')
     }
   },
   mounted () {
-    this.userMian()
-    // 获取用户信息表结构
-    this.table_userinfo = this.tool.tabelCol(this.$route.name).detailUserinfo.tablecols
-    // 获取人员表结构
-    this.table_hrinfo = this.tool.tabelCol(this.$route.name).detailHrInfo.tablecols
-    // 获取角色表结构
-    this.table_roleinfo = this.tool.tabelCol(this.$route.name).detailRoleInfo.tablecols
+    this.queryMainData(this.$route.query.id)
+  },
+  created() {
   }
 }
-
 </script>
-<style>
-</style>
+
 <style scoped>
-.title{
-  height: 20px;
-  line-height: 20px;
-  font-size: 14px;
-  text-indent: 7px;
-  font-weight: bold;
-  color: #333333;
-  margin-bottom: 20px;
-  border-left: .3rem solid #3874F6;
-}
-.mb-40{
-  margin-bottom:40px
-}
+
 </style>

src/HManagement/accountManage/modules/edit.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="inline-16">
     <el-button size="small" type="text" @click="onShow">编 辑</el-button>
-    <el-dialog
+    <el-drawer
       title="编辑用户"
       :visible.sync="drawer"
-      width="864px">
+      width="864px"
+      direction="rtl"
+      append-to-body>
       <div>
         <el-row :gutter="50">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="left">
@@ -48,7 +50,7 @@
         <el-button size="small" @click="drawer = 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>
+    </el-drawer>
   </div>
 </template>
 

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

@@ -4,10 +4,10 @@
       <div class="flex-align-center flex-between normal-margin">
         <div class="flex-align-center" style="flex:1 0 auto">
           <p style="font-size:30px;font-weight:300">{{titleText?titleText:'##'}}</p>
-          &nbsp;<tagTemp style="flex:1" ref="tag" :onwertable="idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
+          &nbsp;<tagTemp style="flex:1" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
         </div>
         <div class="flex-align-center">
-          <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
+          <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
           <div class="inline-16">
             <slot name="customOperation"></slot>
           </div>
@@ -34,8 +34,8 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col :span="5">
-          <group class="normal-margin" style="margin-top:38px" :ownertable="idname"></group>
-          <follow-up :ownertable="idname"></follow-up>
+          <group class="normal-margin" style="margin-top:38px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></group>
+          <follow-up :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
         </el-col>
         
       </el-row>
@@ -53,7 +53,7 @@ import tabTemp from './modules/tabs/tab.vue'
 import group from './modules/group/group.vue'
 
 export default {
-  props:['titleText','mainAreaData','turnPageId','idname','formPath','editData','tags','tabs'],
+  props:['titleText','mainAreaData','turnPageId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs'],
   data () {
     return {
       routerName:'',

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -27,7 +27,7 @@
 
 <script>
 export default {
-  props:['onwertable'],
+  props:['ownertable'],
   data () {
     return {
       datatag:[],
@@ -41,7 +41,7 @@ export default {
       const res  = await this.$api.requested({
         "id": 20220929085401,
         "content": {
-          "ownertable":this.onwertable,
+          "ownertable":this.ownertable,
           "ownerid":this.$route.query.id
         }
       })
@@ -59,7 +59,7 @@ export default {
         const res  = await this.$api.requested({
           "id": 20220929090901,
           "content": {
-            "ownertable":this.onwertable,
+            "ownertable":this.ownertable,
             "ownerid":this.$route.query.id,
             "datatag":this.datatag
           }

src/components/normal-basic-layout/modules/cpEdit.vue

@@ -6,14 +6,18 @@
 
 <script>
 export default {
-  props:['formPath','data','btnType'],
+  props:['formPath','oldFormPath','data','btnType'],
   data () {
     return {
     }
   },
   computed:{
 		formComponent(){
-      return ()=>import(`@/Form/${this.formPath}/edit.vue`)
+      if (this.oldFormPath) {
+        return ()=>import(`@/${this.oldFormPath.edit}/edit.vue`)
+      } else {
+        return ()=>import(`@/Form/${this.formPath}/edit.vue`)
+      }
 		}
 	},
   methods:{

src/detailDemo.vue

@@ -1,146 +1,109 @@
-
 <template>
-  <basicDetails 
-    ref="details"
-    :titleText="mainData.enterprisename"
-    formPath="marketing2/agent"
-    :editData="mainData"
-    :mainAreaData="mainAreaData" 
-    turnPageId="20221011144903" 
-    idname="sa_agentsid"
-    :tags="[]"
-    :tabs="['经销商团队','代理区域','营销类别','账户余额查询','地址管理','联系人管理']"
-    @pageChange="pageChange"
-    @onEditSuccess="queryMainData($route.query.id)">
-    <div slot="tags">
-      <!-- 使用此插槽可不传[tags] -->
-      <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
-    </div>
-    <div slot="customOperation">
-      <!-- 此区域提供了自定义操作按钮 -->
-    </div>
-    <div slot="slot0" class="container normal-panel">
-      <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
-      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="300px"></tableLayout>
-    </div>
-    <div slot="slot1" class="container normal-panel">
-      <salescope :data="mainData"></salescope>
-    </div>
-    <div slot="slot2" class="container normal-panel">
-      <SaleClass :data="mainData"></SaleClass>
-    </div>
-    <div slot="slot3" class="container normal-panel">
-      <accountMoney :mainData="mainData"></accountMoney>
-    </div>
-  </basicDetails>
+  <div>
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.accountno}-${mainData.name}`"
+        :oldFormPath="{edit:'HManagement/accountManage/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20221031141102"
+        idname="userid"
+        ownertable="sys_users"
+        tags=""
+        :tabs="['员工信息','角色信息']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation" >
+      </div>
+      <div slot="slot0" >
+      </div>
+      <div slot="slot1" >
+      </div>
+    </basicDetails>
+  </div>
 </template>
 
 <script>
-import salescope from './detail/salescope/list'
-import SaleClass from './detail/saleclass/index'
-import accountMoney from './detail/accountMoney/index'
 export default {
-  data () {
+  name: "detail",
+  data() {
     return {
       mainData:{},
-      mainAreaData:[],
+      mainAreaData:{}
     }
   },
   components:{
-    salescope,
-    SaleClass,
-    accountMoney
   },
   methods:{
-    async queryMainData (id) {
+    async queryMainData(id) {
       const res = await this.$api.requested({
-        "classname": "webmanage.sale.agents.agents",
-        "method": "query_agentMain",
+        "classname": "webmanage.users.users",
+        "method": "query_userMain",
         "content": {
-          "sa_agentsid": this.$route.query.id
+          "userid": this.$route.query.id
         }
       })
       this.mainData = res.data
-      this.$refs['details'].param.content.containssub = 1
-      this.$refs['details'].param.content.sa_saleareaids = [this.mainData.sa_saleareaid]
-      this.changeDataStructure()
-    },
-    // 监听切换数据,上一页,下一页
-    pageChange (id,rowindex) {
-      this.$router.replace({path:'/agent_detail',query:{id:id,rowindex:rowindex}})
-      this.queryMainData(id)
     },
-    changeDataStructure () {
+    changeDataStructure() {
       this.mainAreaData = [
         {
-          label:'经销商编号',
-          value: this.mainData.agentnum
-        },
-        {
-          label:'签约日期',
-          value: this.mainData.signdate
-        },
-        {
-          label:'经销商类型',
-          value: this.mainData.type
-        },
-        {
-          label:'上级经销商',
-          value: this.mainData.parent_enterprisename
-        },
-        {
-          label:'经销商等级',
-          value: this.mainData.grade
-        },
-        {
-          label:'营销区域',
-          value: this.mainData.areaname
-        },
-        {
-          label:'企业名称',
-          value: this.mainData.enterprisename
+          label:'账号类型',
+          value:this.mainData.usertypename
         },
-        
         {
-          label:'省市县',
-          value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`
+          label:'状态',
+          value:this.minaInfo.status === 'ACTIVE'?'启用':this.minaInfo.status === 'INACTIVE'?'停用':'其他'
         },
         {
-          label:'详细地址',
-          value: this.mainData.address
+          label:'联系方式',
+          value:this.mainData.phonenumber
         },
         {
-          label:'企业联系人',
-          value: this.mainData.contact
+          label:'上级企业',
+          value:this.mainData.superiorenterprisename
         },
         {
-          label:'联系电话',
-          value: this.mainData.phonenumber
+          label:'成交状态',
+          value:this.mainData.tradingstatus
         },
         {
-          label:'税号',
-          value: this.mainData.taxno
+          label:'负责人',
+          value:this.mainData.leader[0]?this.mainData.leader[0].name:""
         },
         {
-          label:'创建人',
-          value: this.mainData.createby
+          label:'最近跟近时间',
+          value:''
         },
         {
-          label:'创建时间',
-          value: this.mainData.createdate
-        },
+          label:'所属公海',
+          value:this.mainData.poolname
+        }
       ]
+    },
+    // 监听切换数据,上一页,下一页
+    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)
+    },
+    onSuccess(){
+      this.visible = false
+      this.queryMainData(this.$route.query.id)
+      this.$emit('onSuccess')
     }
   },
   mounted () {
     this.queryMainData(this.$route.query.id)
   },
-  created () {
-    // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
-  },
+  created() {
+  }
 }
-
 </script>
-<style>
+
+<style scoped>
+
 </style>

src/router/HManagement.js

@@ -58,16 +58,17 @@ const HManagement = [
       title: '账号管理',
       ast_nav: true
     },
-    component: resolve => require(['@/HManagement/accountManage/index'], resolve)
-  }, {
-    path: '/account_details',
-    name: 'users',
-    meta: {
-      title: '账号详情',
-      ast_nav: true,
-      keeproute: true
-    },
-    component: resolve => require(['@/HManagement/accountManage/modules/account_detail'], resolve)
+    component: resolve => require(['@/HManagement/accountManage/index'], resolve),
+    children:[{
+      path: '/account_details',
+      name: 'users',
+      meta: {
+        title: '账号详情',
+        ast_nav: true,
+        keeproute: true
+      },
+      component: resolve => require(['@/HManagement/accountManage/modules/account_detail'], resolve)
+    }]
   }, {
     path: '/depManage',
     name: 'depManage',