Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/api/customerManagement.js

@@ -1,11 +1,11 @@
 import request, { postBlob, getBlob, handleImport } from '@/utils/request'
 
 // 获取师傅列表
-export function memberListPageV2(params) {
+export function memberListPageV2(data) {
   return request({
-    url: `/member/wx/list`,
-    method: 'get',
-    params
+    url: `/member/list/customer?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
   })
 }
 
@@ -17,48 +17,20 @@ export function memberPageExport(data, name) {
   })
 }
 
-
-// 获取仓储列表
-export function getList(params) {
+// 设置取消分销员
+export function memberInner(params) {
   return request({
-    url: '/member/list',
-    method: 'get',
-    params
-  })
-}
-
-// 删除仓储
-export function deleteMember(params) {
-  return request({
-    url: '/member/delete',
+    url: '/member/batch/type',
     method: 'post',
     params
   })
 }
 
-// 新增仓储
-export function addMember(params) {
+// 入驻网点
+export function getWebsit(params) {
   return request({
-    url: '/member/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑仓储
-export function editMember(params) {
-  return request({
-    url: '/member/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取仓储详情
-export function getMemberDetail(params) {
-  return request({
-    url: '/member/detail',
+    url: '/admin/websit/list',
     method: 'get',
     params
   })
-}
+}

src/views/userManagement/customerManagement/index.vue

@@ -1,7 +1,8 @@
 <template>
-  <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
+  <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="200"
     :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-    :operation="operation" :exportList="exportList">
+    :operation="operation">
+	 <!-- :exportList="exportList" -->
     <el-dialog title="" width="500px" custom-class="diy-dialog" append-to-body :modal="true" :visible.sync="formDialog"
       :show-close="true" :close-on-click-modal="false" :modal-append-to-body="false" :before-close="formCancel">
       <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
@@ -14,6 +15,29 @@
         <el-button size="mini" @click="formConfirm" type="primary">确 定</el-button>
       </div>
     </el-dialog>
+	<!-- 入驻网点 -->
+	<el-dialog title="设为工程师" :visible.sync="dialogVisible" @close="websitList = []" width="40%" :close-on-click-modal="false" :modal-append-to-body="false">
+		<el-form ref="workerForm" :model="workerForm" label-width="110px" size="small" label-position="left">
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<el-form-item label="入驻网点" :required="true">
+						<el-select v-model="workerForm.websitId" placeholder="请选择" style="width: 100%;">
+						    <el-option
+						      v-for="item in websitList"
+						      :key="item.websitId"
+						      :label="item.name"
+						      :value="item.websitId">
+						    </el-option>
+						  </el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<div slot="footer" class="dialog-footer">
+			<el-button @click="dialogVisible = false">取 消</el-button>
+			<el-button type="primary" @click="memberInner()">确定</el-button>
+		</div>
+	</el-dialog>
   </template-page>
 </template>
 
@@ -21,24 +45,14 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
-import { memberListPageV2,memberPageExport, addMember, deleteMember, editMember, getMemberDetail } from "@/api/customerManagement";
+import { memberListPageV2,memberPageExport, memberAudit, memberInner, getWebsit } from "@/api/customerManagement";
 export default {
   components: { TemplatePage },
   mixins: [import_mixin],
   data() {
     return {
       // 事件组合
-      optionsEvensGroup: [
-        [
-          [
-            {
-              name: '新建',
-              isRole: true,
-              click: this.addData
-            }
-          ],
-        ],
-      ],
+      optionsEvensGroup: [],
       // 表格属性
       tableAttributes: {
         // 启用勾选列
@@ -52,13 +66,19 @@ export default {
       recordSelected: [],
       /** 表单变量 */
       formDialogType: 0,
-      formDialogTitles: ["新增", "编辑"],
+      formDialogTitles: [],
       formDialog: false,
+	  dialogVisible: false,
       formData: {
         storageName: '',
         storageMobile: '',
         storageAddress: '',
       },
+	  websitList: [],
+	  workerForm: {
+	  		  websitId: '',
+	  		  userId: '',
+	  }
     }
   },
   computed: {
@@ -67,37 +87,7 @@ export default {
       return []
     },
     formItems() {
-      return [{
-        md: 24,
-        isShow: true,
-        name: 'el-input',
-        attributes: { placeholder: '请输入' },
-        formItemAttributes: {
-          label: '仓储名称',
-          prop: 'storageName',
-          rules: [...required]
-        }
-      }, {
-        md: 24,
-        isShow: true,
-        name: 'el-input',
-        attributes: { placeholder: '请输入' },
-        formItemAttributes: {
-          label: '仓储电话',
-          prop: 'storageMobile',
-          rules: [...mobile]
-        }
-      }, {
-        md: 24,
-        isShow: true,
-        name: 'el-input',
-        attributes: { placeholder: '请输入' },
-        formItemAttributes: {
-          label: '仓储地址',
-          prop: 'storageAddress',
-          rules: []
-        }
-      }]
+      
     }
   },
   methods: {
@@ -117,24 +107,35 @@ export default {
     operation(h, { row, index, column }) {
       return (
         <div class='operation-btns'>
-          <el-button type="text" onClick={() => {
-            getMemberDetail({ id: row.storageId }).then(res => {
-              Object.assign(this.formData, res.data)
-              this.formDialogType = 1
-              this.openForm()
-            })
-          }}>编辑</el-button>
-          <el-popconfirm
-            title="确定删除吗？"
-            onConfirm={() => {
-              deleteMember({ storageId: row.storageId }).then(() => {
-                this.$message({ type: 'success', message: '删除成功!' })
-                this.$refs.pageRef.refreshList()
-              })
-            }}
-          >
-            <el-button type="text" slot="reference">删除</el-button>
-          </el-popconfirm>
+			<el-button type="text" onClick={() => {
+			  
+			}}>详情</el-button>
+          {row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
+          this.workerForm.userId = row.userId
+          getWebsit().then(res => {
+                   this.websitList = res.data
+             this.dialogVisible = true
+                })
+          }}>设为工程师</el-button>:null}
+          {row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
+				this.$confirm('请确认是否设为分销员, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					memberInner({
+						type: 'SERVICE',
+						userIds: row.userId
+					}).then(res => {
+						if (res.code == 200) {
+							this.$message({ type: 'success', message: '设为分销员成功!' })
+							this.$refs.pageRef.refreshList()
+						} else {
+							this.$message.error(res.msg);
+						}
+					})
+				});
+			}}>设为分销员</el-button>:null}
         </div>
       )
     },
@@ -150,6 +151,20 @@ export default {
       this.$data.formData = this.$options.data().formData
       this.formDialog = false
     },
+	memberInner(){
+		if(!this.workerForm.websitId){
+			return this.$message({ type: 'danger', message: '请选择入驻网点!' })
+		}
+		memberInner({
+			type: 'WORKER',
+			userIds: this.workerForm.userId,
+			websitId: this.workerForm.websitId
+		}).then(res => {
+			this.dialogVisible = false
+			this.$message({ type: 'success', message: '设置工程师成功!' })
+			this.$refs.pageRef.refreshList()
+		})
+	},
     formConfirm() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {

src/views/userManagement/distributorManagement/index.vue

@@ -1,7 +1,8 @@
 <template>
   <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="200"
     :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-    :operation="operation" :exportList="exportList">
+    :operation="operation">
+	<!-- :exportList="exportList" -->
 	<div slot="moreSearch">
 	  <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
 	  	<el-radio-button label="">全部</el-radio-button>
@@ -226,14 +227,14 @@ export default {
               this.openForm()
             })
           }}>详情</el-button>
-		  {row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
+			{row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
 			this.workerForm.userId = row.userId
 			getWebsit().then(res => {
-               this.websitList = res.data
-			   this.dialogVisible = true
-            })
-		  }}>设为工程师</el-button>:null}
-		  {row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
+							this.websitList = res.data
+				this.dialogVisible = true
+						})
+			}}>设为工程师</el-button>:null}
+			{row.examineStatus != 'WAIT' ?<el-button type="text" onClick={() => {
 			this.$confirm('请确认是否设为客户, 是否继续?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -243,7 +244,7 @@ export default {
 					type: 'GENERAL',
 					userIds: row.userId
 				}).then(res => {
-					if (res.code == 1) {
+					if (res.code == 200) {
 						this.$message({ type: 'success', message: '设为客户成功!' })
 						this.$refs.pageRef.refreshList()
 					} else {
@@ -251,7 +252,7 @@ export default {
 					}
 				})
 			});
-		  }}>设为客户</el-button>:null}
+			}}>设为客户</el-button>:null}
         </div>
       )
     },

src/views/userManagement/masterManagement/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="200"
 	  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-	  :operation="operation" :exportList="exportList">
+	  :operation="operation">
+		<!-- :exportList="exportList" -->
 	  <div slot="moreSearch">
 	    <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
 	    	<el-radio-button label="">全部</el-radio-button>
@@ -216,7 +217,7 @@ export default {
 					type: 'SERVICE',
 					userIds: row.userId
 				}).then(res => {
-					if (res.code == 1) {
+					if (res.code == 200) {
 						this.$message({ type: 'success', message: '设为分销员成功!' })
 						this.$refs.pageRef.refreshList()
 					} else {
@@ -235,7 +236,7 @@ export default {
 					type: 'GENERAL',
 					userIds: row.userId
 				}).then(res => {
-					if (res.code == 1) {
+					if (res.code == 200) {
 						this.$message({ type: 'success', message: '设为客户成功!' })
 						this.$refs.pageRef.refreshList()
 					} else {