会员管理、商品管理

CallCenterWeb.UI/src/api/commodityManagement/commodityList.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+// 获取工单列表数据
+export function getOrderLists(params) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取工单数据
+export function getOrder(ordercode) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/getsingle',
+    method: 'get',
+    params: {
+      ordercode
+    }
+  })
+}
+
+// 添加工单数据
+export function addOrder(data) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑工单数据
+export function editOrder(data) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除工单数据
+export function deleteOrder(ids) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/delete',
+    method: 'post',
+    data: {
+      ids
+    }
+  })
+}

CallCenterWeb.UI/src/api/memberManagement/memberList.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+// 获取工单列表数据
+export function getOrderLists(params) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取工单数据
+export function getOrder(ordercode) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/getsingle',
+    method: 'get',
+    params: {
+      ordercode
+    }
+  })
+}
+
+// 添加工单数据
+export function addOrder(data) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑工单数据
+export function editOrder(data) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除工单数据
+export function deleteOrder(ids) {
+  return request({
+    url: 'callcenterapi/api/BusOrder/delete',
+    method: 'post',
+    data: {
+      ids
+    }
+  })
+}

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/addOrEdit.vue

@@ -1,11 +1,17 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
+      <el-form-item label="商品类型" prop="productType">
+        <el-input v-model="ruleForm.productType" placeholder="请输入商品类型"/>
       </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="商品名称" prop="productName">
+        <el-input v-model="ruleForm.productName" placeholder="请输入商品名称"/>
+      </el-form-item>
+      <el-form-item label="商品数量" prop="productNumber">
+        <el-input v-model="ruleForm.productNumber" placeholder="请输入商品数量"/>
+      </el-form-item>
+      <el-form-item label="商品单价" prop="commodityPrice">
+        <el-input v-model="ruleForm.commodityPrice" placeholder="请输入商品单价"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -48,14 +54,16 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        labelName: '',
-        labelDescription: '',
+        productType: '', //商品类型
+        productName: '', //商品名称
+        productNumber: '', //商品数量
+        commodityPrice: '', //商品单价
       },
       rules: {
-        labelName: [{
+        productType: [{
           required: true,
           trigger: 'blur',
-          message: '请输入标签姓名',
+          message: '请输入商品类型',
         }]
       },
       loading: false

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -0,0 +1,184 @@
+<template>
+    <div class="filter-container">
+      <el-select v-model="searchDatas.productType" placeholder="请选择商品类型">
+        <!-- <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option> -->
+        <el-option label="一" value="1"></el-option>
+        <el-option label="二" value="2"></el-option>
+      </el-select>
+      <el-input v-model="searchDatas.dateAdded" placeholder="上架日期" class="filter-item"/>
+      <el-input v-model="searchDatas.warehouseName" placeholder="仓库名称" class="filter-item"/>
+      <el-input v-model="searchDatas.productName" placeholder="商品名称" class="filter-item"/>
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button v-permission="'HY_change_product_category'" type="primary" class="filter-item" @click="btn_change_product_category">更改商品分类</el-button>
+      <el-button v-permission="'HY_change_shipping_template'" type="primary" class="filter-item" @click="btn_change_shipping_template">更改运费模板</el-button>
+      <el-button v-permission="'HY_label'" type="primary" class="filter-item" @click="btn_label">打标签</el-button>
+      <el-button v-permission="'HY_unified_inventory'" type="primary" class="filter-item" @click="btn_unified_inventory">统一库存</el-button>
+      <el-button v-permission="'HY_bulk_listing'" type="primary" class="filter-item" @click="btn_bulk_listing">批量上架</el-button>
+      <el-button v-permission="'HY_bulk_removal'" type="primary" class="filter-item" @click="btn_bulk_removal">批量下架</el-button>
+      <el-button type="primary" class="filter-item" @click="btn_import"><svg-icon icon-class="daoru" />导入</el-button>
+      <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
+    </div>
+</template>
+
+<script>
+import { getProviceCity, getDictionary } from '@/api/commonAPI'
+import { pickerOptions } from '@/utils'
+import addOrEdit from './addOrEdit'
+import changeProductCategory from './changeProductCategory'
+import changeShippingTemplate from './changeShippingTemplate'
+import editLabel from './editLabel'
+import unifiedInventory from './unifiedInventory'
+import bulkListing from './bulkListing'
+import bulkRemoval from './bulkRemoval'
+
+
+export default {
+  name: 'SearchFilter',
+  props: {
+    searchDatas: {
+      required: true,
+      type: Object,
+      default() {
+        return {
+          productType: '', //商品类型
+          dateAdded: '', //上架日期
+          warehouseName: '', //仓库名称
+          productName: '', //商品名称
+        }
+      }
+    },
+  },
+  data() {
+    return {
+      provinceCityDatas: [], // 省市下拉数据
+      props: {
+        // 自定义省市下拉数据的key值
+        value: 'code',
+        label: 'name',
+        children: 'entityJson'
+      },
+      pickerOptions // 日期数据
+    }
+  },
+  created() {
+    this.getProCity()
+  },
+  methods: {
+    btn_search() {
+      this.$emit('search', this.searchDatas)
+    },
+    btn_export() {
+      this.$emit('export', this.searchDatas)
+    },
+    btn_deletes() {
+      this.$emit('delorders')
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['80%', '90%'],
+        title: '添加工单'
+      })
+    },
+    btn_change_product_category(editId) {
+      this.$layer.iframe({
+        content: {
+          content: changeProductCategory, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '更改商品分类'
+      })
+    },
+    btn_change_shipping_template(editId) {
+      this.$layer.iframe({
+        content: {
+          content: changeShippingTemplate, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '更改运费模板'
+      })
+    },
+    btn_label() {
+      this.$layer.iframe({
+        content: {
+          content: editLabel,
+          parent: this,
+          data: { 'rowid': '' }
+        },
+        area: ['80%', '90%'],
+        title: '打标签'
+      })
+    },
+    btn_unified_inventory(editId) {
+      this.$layer.iframe({
+        content: {
+          content: unifiedInventory, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '统一库存'
+      })
+    },
+    btn_bulk_listing(editId) {
+      this.$layer.iframe({
+        content: {
+          content: bulkListing, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '批量上架'
+      })
+    },
+    btn_bulk_removal(editId) {
+      this.$layer.iframe({
+        content: {
+          content: bulkRemoval, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '批量下架'
+      })
+    },
+    btn_import() {
+      this.$layer.iframe({
+        content: {
+          content: importTels, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['40%', '380px'],
+        shadeClose: false,
+        title: '导入号码'
+      })
+    },
+    // 获取省市下拉数据
+    getProCity() {
+      return new Promise(resolve => {
+        getProviceCity().then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.provinceCityDatas = response.data
+          }
+        })
+        resolve()
+      })
+    },
+  }
+}
+</script>

CallCenterWeb.UI/src/views/commodityManagement/commodityList/index.vue

@@ -1,47 +1,61 @@
 <template>
   <div class="app-container">
-    <div class="filter-container">
-      <el-input v-model="label_name" placeholder="商品名称" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="商品编号" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="运费模板" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="商品产地" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择状态" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择品牌" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择分类" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择标签" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="商品类型" class="filter-item"/>
-      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
-      <el-button v-permission="'HY_change_product_category'" type="primary" class="filter-item" @click="btn_change_product_category">更改商品分类</el-button>
-      <el-button v-permission="'HY_change_shipping_template'" type="primary" class="filter-item" @click="btn_change_shipping_template">更改运费模板</el-button>
-      <el-button v-permission="'HY_label'" type="primary" class="filter-item" @click="btn_label">打标签</el-button>
-      <el-button v-permission="'HY_unified_inventory'" type="primary" class="filter-item" @click="btn_unified_inventory">统一库存</el-button>
-      <el-button v-permission="'HY_bulk_listing'" type="primary" class="filter-item" @click="btn_bulk_listing">批量上架</el-button>
-      <el-button v-permission="'HY_bulk_removal'" type="primary" class="filter-item" @click="btn_bulk_removal">批量下架</el-button>
-      <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
-    </div>
-
+    <search-filter
+      :search-datas.sync="searchDatas"
+      showadd
+      @search="btn_search"
+      @delorders="btn_search"
+      @export="btn_search">
+    </search-filter>
     <el-table v-loading="loading" :data="dataLists" border stripe>
       <el-table-column
         type="selection"
         width="40">
       </el-table-column>
-      <el-table-column type="index" label="商品ID" align="center" fixed width=""/>
-      <el-table-column type="index" label="排序编号" align="center" fixed width=""/>
-      <el-table-column type="index" label="规格" align="center" fixed width=""/>
-      <el-table-column type="index" label="商品名称" align="center" fixed width=""/>
-      <el-table-column type="index" label="库存" align="center" fixed width=""/>
-      <el-table-column type="index" label="原价" align="center" fixed width=""/>
-      <el-table-column type="index" label="销售价" align="center" fixed width=""/>
-      <el-table-column type="index" label="状态" align="center" fixed width=""/>
-      <el-table-column type="index" label="标签" align="center" fixed width=""/>
-      <el-table-column type="index" label="货号" align="center" fixed width=""/>
-      <el-table-column type="index" label="主类目" align="center" fixed width=""/>
-      <el-table-column type="index" label="商品分类" align="center" fixed width=""/>
-      <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
+      <el-table-column 
+        type="index" 
+        label="商品类型" 
+        align="center" 
+        fixed width="">
+      </el-table-column>
+      <el-table-column 
+        type="index" 
+        label="商品名称" 
+        align="center" 
+        fixed width="">
+      </el-table-column>
+      <el-table-column
+        type="index" 
+        label="商品数量" 
+        align="center" 
+        fixed 
+        width="">
+      </el-table-column>
+      <el-table-column 
+        type="index" 
+        label="商品单价" 
+        align="center" 
+        fixed 
+        width="">
+      </el-table-column>
+      <el-table-column 
+        type="index" 
+        label="商品标签" 
+        align="center" 
+        fixed 
+        width="">
+      </el-table-column>
+      <el-table-column 
+        label="操作" 
+        width="" 
+        align="center" 
+        class-name="oparate_btn" 
+        fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">编辑</el-button>
+          <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">修改</el-button>
           <el-button v-permission="'HY_delete'" size="mini" plain type="danger" @click="btn_delete(scope.row.id)">删除</el-button>
+          <el-button v-permission="'HY_putaway'" size="mini" plain type="primary" @click="btn_putaway(scope.row.ordercode)">上架</el-button>
+          <el-button v-permission="'HY_soldout'" size="mini" plain type="danger" @click="btn_soldout(scope.row.ordercode)">下架</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -57,21 +71,17 @@
 
 <script>
 
-import { getOrderLists, deleteOrder } from '@/api/order/orderSearch'
-import addOrEdit from './components/addOrEdit'
-import changeProductCategory from './components/changeProductCategory'
-import changeShippingTemplate from './components/changeShippingTemplate'
-import editLabel from './components/editLabel'
-import unifiedInventory from './components/unifiedInventory'
-import bulkListing from './components/bulkListing'
-import bulkRemoval from './components/bulkRemoval'
+import { getOrderLists, deleteOrder } from '@/api/commodityManagement/commodityList'
+import SearchFilter from './components/searchFilter'
 import { formatterContent } from '@/utils'
+import addOrEdit from './components/addOrEdit'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 
 export default {
   name: 'commodityList',
   components: {
-    Pagination
+    Pagination,
+    SearchFilter,
   },
   data() {
     return {
@@ -82,7 +92,13 @@ export default {
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
         total: 0 // 总共多少数据
       },
-      dataLists: [] // 列表数据
+      dataLists: [], // 列表数据
+      searchDatas: {
+        productType: '', //商品类型
+        dateAdded: '', //上架日期
+        warehouseName: '', //仓库名称
+        productName: '', //商品名称
+      },
     }
   },
   created() {
@@ -98,6 +114,10 @@ export default {
       this.loading = true
       return new Promise(resolve => {
         const params = {
+          productType: this.searchDatas.productType, //商品类型
+          dateAdded: this.searchDatas.dateAdded, //上架日期
+          warehouseName: this.searchDatas.warehouseName, //仓库名称
+          productName: this.searchDatas.productName, //商品名称
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
         }
@@ -115,84 +135,6 @@ export default {
       this.pageParams.pageindex = 1
       this.getList()
     },
-    btn_add() {
-      this.$layer.iframe({
-        content: {
-          content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-        },
-        area: ['80%', '90%'],
-        title: '添加工单'
-      })
-    },
-    btn_change_product_category(editId) {
-      this.$layer.iframe({
-        content: {
-          content: changeProductCategory, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '更改商品分类'
-      })
-    },
-    btn_change_shipping_template(editId) {
-      this.$layer.iframe({
-        content: {
-          content: changeShippingTemplate, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '更改运费模板'
-      })
-    },
-
-    btn_label() {
-      this.$layer.iframe({
-        content: {
-          content: editLabel,
-          parent: this,
-          data: { 'rowid': '' }
-        },
-        area: ['80%', '90%'],
-        title: '打标签'
-      })
-    },
-    btn_unified_inventory(editId) {
-      this.$layer.iframe({
-        content: {
-          content: unifiedInventory, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '统一库存'
-      })
-    },
-    btn_bulk_listing(editId) {
-      this.$layer.iframe({
-        content: {
-          content: bulkListing, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '批量上架'
-      })
-    },
-    btn_bulk_removal(editId) {
-      this.$layer.iframe({
-        content: {
-          content: bulkRemoval, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '批量下架'
-      })
-    },
     btn_edit(editId) {
       this.$layer.iframe({
         content: {
@@ -220,6 +162,12 @@ export default {
         this.$message.info('已取消删除')
       })
     },
+    btn_putaway(editId) {
+      console.log(editId)
+    },
+    btn_soldout(editId) {
+      console.log(editId)
+    },
   }
 }
 </script>

CallCenterWeb.UI/src/views/memberManagement/memberBasicSetting/addOrEdit.vue

@@ -1,327 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="工单来源" prop="sourceid">
-        <el-select v-model="ruleForm.sourceid" class="form_select" filterable clearable placeholder="请选择工单来源">
-          <el-option v-for="item in sourceOptions" :key="item.id" :label="item.name" :value="item.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="工单类型" prop="typeid">
-        <el-select v-model="ruleForm.typeid" class="form_select" filterable clearable placeholder="请选择工单类型">
-          <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户姓名" prop="name">
-        <el-input v-model="ruleForm.name" placeholder="请输入客户姓名"/>
-      </el-form-item>
-      <el-form-item label="客户电话" prop="phone">
-        <el-input v-model="ruleForm.phone" placeholder="请输入客户电话"/>
-      </el-form-item>
-      <el-form-item label="性别" prop="sex">
-        <el-radio-group v-model="ruleForm.sex">
-          <el-radio label="男">男</el-radio>
-          <el-radio label="女">女</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="所在地" prop="provinceCity">
-        <el-cascader
-          v-model="provinceCity"
-          :options="provinceCityDatas"
-          :props="props"
-          placeholder="请选择省市"
-          class="form_select"
-          clearable
-          filterable
-          change-on-select/>
-      </el-form-item>
-      <el-form-item label="具体地址" prop="address">
-        <el-input v-model="ruleForm.address" placeholder="请输入具体地址"/>
-      </el-form-item>
-      <el-form-item label="工单内容" prop="content">
-        <el-input v-model="ruleForm.content" type="textarea" autosize placeholder="请输入工单内容"/>
-      </el-form-item>
-      <el-form-item label="附件" prop="files">
-        <el-upload
-          ref="upload"
-          :file-list="uploadData.fileList"
-          :action= "uploadData.uploadUrl"
-          :data = "uploadData.uploaderFiles"
-          :on-success="uploadSuccess"
-          :on-error="uploadError"
-          :on-remove="uploadRemove"
-          class="uploadFiles"
-          list-type="picture"
-          multiple>
-          <el-button size="small" type="primary">点击上传</el-button>
-          <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
-          <!-- <i class="el-icon-plus"></i> -->
-        </el-upload>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="resetForm">重置</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getOrder, addOrder, editOrder } from '@/api/order/orderSearch'
-import { validateTel } from '@/utils/validate'
-import { delFiles, filterContent } from '@/utils'
-
-const validateTelRule = (rule, value, callback) => {
-  if (!validateTel(value)) {
-    callback(new Error('请输入有效的客户电话!'))
-  } else {
-    callback()
-  }
-}
-
-export default {
-  name: 'AddOrEdit',
-  props: {
-    rowid: {
-      type: String,
-      default: ''
-    },
-    callid: {
-      type: Number,
-      default: 0
-    },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      uploadData: {// 文件上传数据
-        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'fileserverapi/Api/Upload',
-        uploaderFiles: {// 上传文件的参数 //是	string	模块code，如：test
-          uploadtype: 'orderFiles'
-        },
-        fileList: [] // 展示文件的数据
-      },
-      provinceCity: [], // 省市下拉绑定的值
-      provinceCityDatas: [], // 省市下拉数据
-      props: { // 自定义省市下拉数据的key值
-        value: 'code',
-        label: 'name',
-        children: 'entityJson'
-      },
-      sourceOptions: [], // 工单来源下拉数据
-      typeOptions: [], // 工单类型下拉数据
-      ruleForm: {
-        unique_id: '', //		否	string	callid
-        ordercode: '',
-        sourceid: '', //	否	string	来源id
-        typeid: '', //	否	string	类型id
-        name: '', //	否	string	姓名
-        phone: '', //	是	string	号码
-        sex: '男', //	否	string	性别
-        province: '', //	否	string	省code
-        city: '', //	否	string	市code
-        address: '', //	否	string	地址
-        // deptid: '', //	否	string	部门id
-        content: '', //	是	string	工单内容
-        files: [] // 否	list	附件json
-      },
-      rules: {
-        sourceid: [{
-          required: true,
-          message: '请选择工单来源',
-          trigger: 'blur'
-        }],
-        typeid: [{
-          required: true,
-          message: '请选择工单类型',
-          trigger: 'blur'
-        }],
-        name: [{
-          required: true,
-          message: '请输入客户姓名',
-          trigger: 'blur'
-        }],
-        phone: [{
-          required: true,
-          trigger: 'blur',
-          validator: validateTelRule
-        }]
-      },
-      loading: false
-    }
-  },
-  created() {
-    if (this.callid) {
-      this.ruleForm.unique_id = this.callid
-    }
-    Promise.all([this.getOrderSource(), this.getOrderType(), this.getProCity()])
-      .then(() => {
-        if (this.rowid) {
-          this.ruleForm.ordercode = this.rowid
-          this.getDetail(this.rowid)
-        }
-      })
-  },
-  methods: {
-    submitForm() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          this.ruleForm.province = this.provinceCity && this.provinceCity[0]
-          this.ruleForm.city = this.provinceCity && this.provinceCity[1]
-          this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content)// 保存内容时去掉 html 标签
-          this.loading = true
-          // 添加
-          if (!this.rowid) {
-            addOrder(this.ruleForm).then(response => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.$parent.$layer.close(this.layerid)
-                if (this.callid) {
-                  this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
-                } else {
-                  this.$parent.getList() // 重新加载父级数据
-                }
-                this.$message.success('恭喜你，工单信息添加成功!')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
-            return
-          }
-          // 编辑
-          editOrder(this.ruleForm).then(response => {
-            this.loading = false
-            if (response.state.toLowerCase() === 'success') {
-              this.$parent.$layer.close(this.layerid)
-              this.$parent.getList() // 重新加载父级数据
-              this.$message.success('恭喜你，工单信息编辑成功!')
-            }
-          }).catch(() => {
-            this.loading = false
-          })
-        } else {
-          this.$message.error('请输入有效的必填项信息!')
-          return false
-        }
-      })
-    },
-    resetForm() {
-      if (!this.rowid) {
-        if (this.ruleForm.files.length > 0) {
-          for (let i = this.ruleForm.files.length - 1; i >= 0; i--) {
-            delFiles(this.ruleForm.files[i].filesmallurl, this.ruleForm.files[i].fileurl)
-            this.ruleForm.files.splice(i, 1)
-          }
-        }
-        this.$refs.upload.clearFiles()	// 清空已上传的文件列表（该方法不支持在 before-upload 中调用）
-      }
-      this.provinceCity = []
-      this.$refs.ruleForm.resetFields()
-    },
-    // 详情
-    getDetail(rid) {
-      getOrder(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
-          this.ruleForm.sourceid = res.sourceid // 来源
-          this.ruleForm.typeid = res.typeid // 类型
-          this.ruleForm.name = res.name // 姓名
-          this.ruleForm.phone = res.phone // 电话
-          this.ruleForm.sex = res.sex // 性别
-          this.provinceCity = [res.province, res.city]
-          this.ruleForm.address = res.address // 具体地址
-          this.ruleForm.content = res.content // 内容
-
-          // 附件
-          if (res.files) {
-            for (let i = 0, len = res.files.length; i < len; i++) {
-              this.uploadData.fileList.push({
-                'name': res.files[i].filename,
-                'url': res.files[i].fileurl
-              })
-            }
-            this.ruleForm.files = res.files
-          }
-        }
-      })
-    },
-    // 获取省市下拉数据
-    getProCity() {
-      return new Promise(resolve => {
-        getProviceCity().then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.provinceCityDatas = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取工单来源
-    getOrderSource() {
-      return new Promise(resolve => {
-        getDictionary('GDLY').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.sourceOptions = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取工单类型
-    getOrderType() {
-      return new Promise(resolve => {
-        getDictionary('GDLX').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.typeOptions = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 文件上传
-    uploadSuccess(response, file, fileList) {
-      if (response.state.toLowerCase() === 'success') {
-        this.ruleForm.files.push(response.data[0])
-      } else {
-        this.$message.error(response.message)
-      }
-    },
-    uploadRemove(file, fileList) {
-      if (this.ruleForm.files.length > 0) {
-        for (let i = 0, len = this.ruleForm.files.length; i < len; i++) {
-          if (this.ruleForm.files[i].filename === file.name) {
-            delFiles(this.ruleForm.files[i].filesmallurl, this.ruleForm.files[i].fileurl)
-            this.ruleForm.files.splice(i, 1)
-            return
-          }
-        }
-      }
-    },
-    uploadError(err, file, fileList) {
-      // console.log(err)
-      this.$message.error(err)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.order_form .form_select{
-	width: 100%;
-}
-.order_form .uploadFiles .el-upload-list--picture{
-	margin-right: -1%;
-}
-.order_form .el-upload-list--picture li{
-	width: 24%;
-	margin-right: 1%;
-	float: left;
-}
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>

CallCenterWeb.UI/src/views/memberManagement/memberBasicSetting/detail.vue

@@ -1,323 +0,0 @@
-<template>
-  <div class="order_detail">
-    <el-row :gutter="20">
-      <el-col :md="24" class="order_detail_body">
-        <el-card shadow="hover">
-          <el-col :md="3">
-            <div class="round_img">
-              <img :src="avatar" alt="头像">
-            </div>
-          </el-col>
-          <el-col :md="21">
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ ordercode }}</h1>
-            <!-- <p class="title_sub"><span class="green">{{ name }}</span> {{ createtime }}</p> -->
-            <p class="title_sub"><span class="green">{{ name }}</span> 	河南阜外华中心血管病医院 {{ createtime }}</p>
-            <p class="title_sub">催单次数：<span class="red">10</span>次 | 工单状态： <span class="done">已完成</span></p>
-          </el-col>
-          <el-col :md="24" class="order_detail_content">
-            <el-col :md="6" class="order_detail_item">
-              客户电话：{{ phone }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              客户性别：{{ sex }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              工单来源：{{ sourcename }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              工单类型：{{ sourcetype }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              地址：{{ address }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              创建人：{{ createuser }}
-            </el-col>
-            <el-col :md="24" class="order_detail_item">
-              工单内容：
-              <div class="order_content" v-html="content"/>
-            </el-col>
-            <el-col v-if="fileList.length > 0" :md="24" class="order_detail_item">
-              <p>附件：<span class="yellow">（可以下载查看）</span></p>
-
-              <el-col v-for="(item, index) in fileList" :md="3" :key="index">
-                <el-card class="order_file">
-                  <span class="img_mask">
-                    <a :href="item.fileurl" download="filename" title="点击下载">
-                      <i class="el-icon-download"/>
-                    </a>
-                  </span>
-                  <img v-if="item.filesmallurl" :src="item.filesmallurl" :large="item.fileurl" :preview-text="item.filename" preview="0" height="68" width="80%">
-                  <i v-else class="el-icon-document file_icon"/>
-                  <p :title="item.filename"> {{ item.filename }} </p>
-                </el-card>
-              </el-col>
-
-            </el-col>
-            <el-col :md="6">
-              <i class="el-icon-time"/>
-              已持续 <span class="red">20</span> 小时 <span class="red">20</span> 分 <span class="red">20</span> 秒
-            </el-col>
-            <el-col :md="6" :offset="12">
-              <el-button type="primary" size="mini" plain>催单</el-button>
-              <el-button type="primary" size="mini" plain>转派</el-button>
-              <el-button type="primary" size="mini" plain>完成</el-button>
-            </el-col>
-          </el-col>
-        </el-card>
-      </el-col>
-
-      <el-col :md="12">
-        <el-card shadow="hover">
-          <div slot="header" class="clearfix">
-            <span>工单动态</span>
-          </div>
-          <div class="order_steps">
-            <el-steps :active="0" :space="100" direction="vertical" process-status="success">
-              <el-step title="已完成" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
-              <el-step title="已转派" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
-              <el-step title="已创建" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
-            </el-steps>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :md="12">
-        <el-card shadow="hover" class="order_record">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="催单记录(2)" name="first">
-              <div class="tab_body">
-                催单记录
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="录音记录(3)" name="second">
-              <div class="tab_body">
-                录音记录
-              </div>
-            </el-tab-pane>
-          </el-tabs>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { getOrder } from '@/api/order/orderSearch'
-import { mapGetters } from 'vuex'
-import { filterContent } from '@/utils'
-
-export default {
-  name: 'Detail',
-  props: {
-    rowid: {
-      type: String,
-      default: ''
-    },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      activeName: 'first',
-      ordercode: '', // 工单编号
-      name: '', // 姓名
-      phone: '', // 电话
-      sex: '', // 性别
-      address: '', // 地址
-      sourcename: '', // 工单来源
-      sourcetype: '', // 工单类型
-      content: '', // 工单内容
-      createtime: '', // 创建时间
-      createuser: '', // 创建人
-      fileList: [] // 附件
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'avatar'
-    ])
-  },
-  created() {
-    if (this.rowid) {
-      this.getDetail(this.rowid)
-    }
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
-    },
-    // 详情
-    getDetail(rid) {
-      getOrder(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
-          this.ordercode = res.ordercode // 工单编号
-          this.name = res.name // 姓名
-          this.phone = res.phone // 电话
-          this.sex = res.sex // 性别
-          res.provincename = res.provincename === null ? '' : res.provincename
-          res.cityname = res.cityname === null ? '' : res.cityname
-          res.address = res.address === null ? '' : res.address
-          this.address = res.provincename + res.cityname + res.address // 地址
-          this.sourcename = res.sourcename // 工单来源
-          this.sourcetype = res.typename // 工单类型
-          this.content = filterContent.content(res.content) // 工单内容
-          this.createtime = res.createtime // 创建时间
-          this.createuser = res.createuser + '-' + res.createusername // 创建人
-          // 附件
-          if (res.files) {
-            this.fileList = res.files
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-	.order_detail{
-		.el-col{
-			margin-bottom: 20px;
-		}
-		.el-icon-time{
-			color: #d81e06;
-		}
-		.el-card__header{
-			padding-top: 14px;
-			padding-bottom: 14px;
-			background-color: #F5F5F6;
-		}
-		.order_file{
-			.el-card__body{
-				padding: 22px 0 0 0;
-				text-align: center;
-			}
-		}
-		.order_steps{
-			.el-step__icon-inner{
-				display: none;
-			}
-		}
-		.order_record {
-			.el-card__body{
-				padding: 0;
-			}
-			.el-tabs__header{
-				padding: 0px 20px;
-				background-color: #F5F5F6;
-					.el-tabs__item{
-						font-size: 16px;
-						height: 47px;
-						line-height: 47px;
-					}
-			}
-		}
-	}
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.order_detail{
-		.order_detail_body{
-			margin-bottom: 20px;
-			.round_img{
-				width: 90px;
-				height: 90px;
-				border-radius: 50%;
-				overflow: hidden;
-				margin: 14px;
-				img{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.title{
-				font-size: 20px;
-				.title_icon{
-					color: #d81e06;
-					font-size: 16px;
-					margin-right: 20px;
-				}
-			}
-			.title_sub{
-				font-size: 14px;
-				color: #666666;
-			}
-			.order_detail_content{
-				background-color: #F5F5F6;
-				padding-top: 20px;
-				color: #4c4c4c;
-				font-size: 14px;
-				.order_detail_item{
-					margin-bottom: 10px;
-					.order_content{
-						margin-top: 10px;
-					}
-					.order_file {
-						position: relative;
-						cursor: pointer;
-						.img_mask {
-							display: none;
-							position: absolute;
-							left: 0px;
-							top: 0px;
-							background-color: rgba(0, 0, 0, 0.3);
-							width: 100%;
-							height: 22px;
-							text-align: right;
-							z-index: 1;
-							i {
-								font-size: 20px;
-								line-height: 22px;
-								display: inline-block;
-								margin-right: 15px;
-								color: #fff;
-							}
-						}
-						p {
-							margin-top: 5px;
-							padding-left: 14px;
-							padding-right: 14px;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-						.file_icon{
-							height: 68px;
-							line-height: 68px;
-							font-size: 68px;
-							color: #409EFF;
-						}
-					}
-					.order_file:hover .img_mask {
-						display: block;
-					}
-				}
-			}
-		}
-		.green {
-			color: #00c1de;
-		}
-		.done {
-			color: #198120;
-		}
-		.red {
-			color: #d81e06;
-		}
-		.yellow{
-			color: #e6a23c;
-		}
-		.order_steps{
-			// height: 240px;
-			.el-step__icon-inner{
-				display: none;
-			}
-		}
-
-		.tab_body{
-			padding: 0 20px 20px 20px;
-		}
-	}
-</style>

CallCenterWeb.UI/src/views/memberManagement/memberBasicSetting/index.vue

@@ -1,261 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-cascader
-        v-model="provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择省市"
-        class="filter-item"
-        clearable
-        filterable
-        change-on-select/>
-      <el-select v-model="sc_source" class="filter-item" filterable clearable placeholder="请选择工单来源">
-        <el-option
-          v-for="item in sourceOptions"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"/>
-      </el-select>
-      <el-select v-model="sc_type" class="filter-item" filterable clearable placeholder="请选择工单类型">
-        <el-option
-          v-for="item in typeOptions"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"/>
-      </el-select>
-      <el-date-picker
-        v-model="searchDate"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        align="left"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
-      <el-input v-model="sc_tel" placeholder="请输入电话号码" class="filter-item"/>
-      <el-input v-model="sc_ordercode" placeholder="请输入工单编号" class="filter-item"/>
-      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
-    </div>
-
-    <el-table v-loading="loading" :data="dataLists" border stripe>
-      <el-table-column type="index" label="编号" align="center" fixed width="80"/>
-      <el-table-column prop="ordercode" label="工单编号" align="center" min-width="140"/>
-      <el-table-column prop="sourcename" label="工单来源" align="center" min-width=""/>
-      <el-table-column prop="typename" label="工单类型" align="center" min-width=""/>
-      <el-table-column prop="provincename" label="所在省" align="center"/>
-      <el-table-column prop="cityname" label="所在市" align="center"/>
-      <el-table-column prop="address" label="具体地址" align="center"/>
-      <el-table-column label="工单内容" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.content | formatterContent }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="name" label="姓名" align="center"/>
-      <el-table-column prop="phone" label="电话" align="center"/>
-      <el-table-column prop="sex" label="性别" align="center"/>
-      <el-table-column prop="createuser" label="创建人" align="center"/>
-      <el-table-column prop="createtime" label="创建时间" align="center" min-width="120"/>
-      <el-table-column label="操作" width="220" align="center" class-name="oparate_btn" fixed="right">
-        <template slot-scope="scope">
-          <el-button v-permission="'HY_detail'" size="mini" plain type="primary" @click="btn_detail(scope.row.ordercode)">详情</el-button>
-          <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">编辑</el-button>
-          <el-button v-permission="'HY_delete'" size="mini" plain type="danger" @click="btn_delete(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="pageParams.total > 0"
-      :total="pageParams.total"
-      :pageindex.sync="pageParams.pageindex"
-      :pagesize.sync="pageParams.pagesize"
-      class="pagination"
-      @pagination="getList" />
-
-  </div>
-</template>
-
-<script>
-
-import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getOrderLists, deleteOrder } from '@/api/order/orderSearch'
-import addOrEdit from './addOrEdit'
-import detail from './detail'
-import { pickerOptions, formatterContent } from '@/utils'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-
-export default {
-  name: 'memberBasicSetting',
-  components: {
-    Pagination
-  },
-  filters: {
-    OrderTextFilter(status) {
-      const statusMap = {
-        0: '暂时',
-        1: '永久',
-        2: '已取消'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      provinceCity: [], // 省市下拉绑定的值
-      provinceCityDatas: [], // 省市下拉数据
-      props: {// 自定义省市下拉数据的key值
-        value: 'code',
-        label: 'name',
-        children: 'entityJson'
-      },
-      sc_source: '', // 工单来源
-      sourceOptions: [], // 工单来源下拉数据
-      sc_type: '', // 工单类型
-      typeOptions: [], // 工单类型下拉数据
-      searchDate: '', // 日期
-      pickerOptions, // 日期数据
-      sc_tel: '', // 电话号码
-      sc_ordercode: '', // 工单编号
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      dataLists: [] // 列表数据
-    }
-  },
-  created() {
-    this.getProCity()
-    this.getOrderSource()
-    this.getOrderType()
-    this.getList()
-    document.onkeyup = (e) => {
-      if (e.keyCode === 13) {
-        this.getList()
-      }
-    }
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      return new Promise(resolve => {
-        const params = {
-          pageindex: this.pageParams.pageindex, // int 第几页
-          pagesize: this.pageParams.pagesize, // int 每页几条信息
-          stime: this.searchDate && this.searchDate[0], // 开始时间
-          etime: this.searchDate && this.searchDate[1], // 结束时间
-          ordercode: this.sc_ordercode.replace(/\s+/g, ""), //	否	string	模糊查询（工单编号）
-          phone: this.sc_tel.replace(/\s+/g, ""), //	否	string	模糊查询（号码）
-          province: this.provinceCity && this.provinceCity[0], //	否	string	省code
-          city: this.provinceCity && this.provinceCity[1], //	否	string	市code
-          sourceid: this.sc_source, //	否	string	来源id
-          typeid: this.sc_type //	否	string	类型id
-        }
-        getOrderLists(params).then(response => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.data.total
-            this.dataLists = response.data.rows
-          }
-        })
-        resolve()
-      })
-    },
-    btn_search() {
-      this.pageParams.pageindex = 1
-      this.getList()
-    },
-    btn_add() {
-      this.$layer.iframe({
-        content: {
-          content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-        },
-        area: ['80%', '90%'],
-        title: '添加工单'
-      })
-    },
-    btn_edit(editId) {
-      this.$layer.iframe({
-        content: {
-          content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '编辑工单'
-      })
-    },
-    btn_detail(editId) {
-      this.$layer.iframe({
-        content: {
-          content: detail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '工单详情'
-      })
-    },
-    btn_delete(editId) {
-      this.$confirm('您确定要将此工单删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteOrder(editId).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.getList()
-            this.$message.success('删除成功!')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
-      })
-    },
-    // 获取省市下拉数据
-    getProCity() {
-      return new Promise(resolve => {
-        getProviceCity().then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.provinceCityDatas = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取工单来源
-    getOrderSource() {
-      return new Promise(resolve => {
-        getDictionary('GDLY').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.sourceOptions = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取工单类型
-    getOrderType() {
-      return new Promise(resolve => {
-        getDictionary('GDLX').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.typeOptions = response.data
-          }
-        })
-        resolve()
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -1,11 +1,125 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="商户名称" prop="businessName">
-        <el-input v-model="ruleForm.businessName" placeholder="请输入商户名称"/>
+      <el-form-item label="客户姓名" prop="customerName">
+        <el-input v-model="ruleForm.customerName" placeholder="请输入商户名称"/>
       </el-form-item>
-      <el-form-item label="会员卡标题" prop="memberCardTitle">
-        <el-input v-model="ruleForm.memberCardTitle" placeholder="请输入会员卡标题"/>
+      <el-form-item label="客户性别" prop="customerGender">
+        <el-radio v-model="ruleForm.customerGender" label="1">男</el-radio>
+        <el-radio v-model="ruleForm.customerGender" label="2">女</el-radio>
+      </el-form-item>
+      <el-form-item label="客户年龄" prop="customerAge">
+        <el-input v-model="ruleForm.customerAge" placeholder="请输入客户年龄"/>
+      </el-form-item>
+      <el-form-item label="手机号码1" prop="phoneNumber1">
+        <el-input v-model="ruleForm.phoneNumber1" placeholder="请输入手机号码1"/>
+      </el-form-item>
+      <el-form-item label="手机号码2" prop="phoneNumber2">
+        <el-input v-model="ruleForm.phoneNumber2" placeholder="请输入手机号码2"/>
+      </el-form-item>
+      <el-form-item label="固定电话" prop="fixedTelephone">
+        <el-input v-model="ruleForm.fixedTelephone" placeholder="请输入固定电话"/>
+      </el-form-item>
+      <el-form-item label="会员类型" prop="memberType">
+        <el-select v-model="ruleForm.memberType" placeholder="请选择会员类型">
+          <!-- <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option> -->
+          <el-option
+            label="会员类型1"
+            value="1">
+          </el-option>
+          <el-option
+            label="会员类型2"
+            value="2">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="省">
+        <el-col :span="4">
+          <el-select v-model="ruleForm.province" placeholder="请选择省">
+            <el-option
+              label="省1"
+              value="1">
+            </el-option>
+            <el-option
+              label="省2"
+              value="2">
+            </el-option>
+          </el-select>          
+        </el-col>
+        <el-col :span="2">
+          市
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="ruleForm.city" placeholder="请选择市">
+            <el-option
+              label="城市1"
+              value="1">
+            </el-option>
+            <el-option
+              label="城市2"
+              value="2">
+            </el-option>
+          </el-select>          
+        </el-col>
+        <el-col :span="2">
+          县/区
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="ruleForm.county" placeholder="请选择县/区">
+            <el-option
+              label="县"
+              value="1">
+            </el-option>
+            <el-option
+              label="区"
+              value="2">
+            </el-option>
+          </el-select>          
+        </el-col>
+        <el-col :span="2">
+          乡镇
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="ruleForm.township" placeholder="请选择乡镇">
+            <el-option
+              label="乡镇1"
+              value="1">
+            </el-option>
+            <el-option
+              label="乡镇2"
+              value="2">
+            </el-option>
+          </el-select>          
+        </el-col>
+      </el-form-item>
+      <el-form-item label="详细地址" prop="address">
+        <el-input v-model="ruleForm.address" placeholder="请输入详细地址"/>
+      </el-form-item>
+      <el-form-item label="邮编" prop="Postcode">
+        <el-input v-model="ruleForm.Postcode" placeholder="请输入邮编"/>
+      </el-form-item>
+      <el-form-item label="鞋码" prop="shoeSize">
+        <el-input v-model="ruleForm.shoeSize" placeholder="请输入鞋码"/>
+      </el-form-item>
+      <el-form-item label="会员日期" prop="memberDate">
+        <el-input v-model="ruleForm.memberDate" placeholder="请输入会员日期"/>
+      </el-form-item>
+      <el-form-item label="会员积分" prop="memberPoints">
+        <el-input v-model="ruleForm.memberPoints" placeholder="请输入会员积分"/>
+      </el-form-item>
+      <el-form-item label="推荐人" prop="referrer">
+        <el-input v-model="ruleForm.referrer" placeholder="请输入推荐人"/>
+      </el-form-item>
+      <el-form-item label="累计消费金额" prop="cumulativeConsumptionAmount">
+        <el-input v-model="ruleForm.cumulativeConsumptionAmount" placeholder="请输入累计消费金额"/>
+      </el-form-item>
+      <el-form-item label="累计积分" prop="accumulatedPoints">
+       <el-input v-model="ruleForm.accumulatedPoints" placeholder="请输入累计积分"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -48,20 +162,32 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        businessName: '',
-        memberCardTitle: '',
+        customerName: '', //客户姓名
+        customerGender: '1', //客户性别
+        customerAge: '', //客户年龄
+        phoneNumber1: '', //手机号码1
+        phoneNumber2: '', //手机号码2
+        fixedTelephone: '', //固定电话
+        memberType: '', //会员类型
+        province: '', //省
+        city: '', //市
+        county: '', //县/区
+        township: '', //乡镇
+        address: '', //详细地址
+        Postcode: '', //邮编
+        shoeSize: '', //鞋码
+        memberDate: '', //会员日期
+        memberPoints: '', //会员积分
+        referrer: '', //推荐人
+        cumulativeConsumptionAmount: '', //累计消费金额
+        accumulatedPoints: '', //累计积分
       },
       rules: {
-        businessName: [{
+        customerName: [{
           required: true,
           trigger: 'blur',
           message: '请输入商户名称',
         }],
-        memberCardTitle: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入会员卡标题',
-        }]
       },
       loading: false
     }

CallCenterWeb.UI/src/views/memberManagement/memberList/components/searchFilter.vue

@@ -20,6 +20,8 @@
       <el-button v-permission="'HY_member_level'" type="primary" class="filter-item" @click="btn_member_level">会员等级</el-button>
       <el-button type="primary" class="filter-item" @click="btn_import"><svg-icon icon-class="daoru" />导入</el-button>
       <el-button type="primary" class="filter-item" @click="btn_export">导出</el-button>
+      <el-button type="primary" class="filter-item" @click="btn_export">档案合并</el-button>
+      <el-button type="primary" class="filter-item" @click="btn_export">档案拆分</el-button>
     </div>
 </template>
 
@@ -33,7 +35,6 @@ import sendGroupMessage from './sendGroupMessage'
 import memberExtension from './memberExtension'
 import memberLevel from './memberLevel'
 
-
 export default {
   name: 'SearchFilter',
   props: {
@@ -56,16 +57,6 @@ export default {
         }
       }
     },
-    // 是否显示 添加
-    showadd: { 
-      type: Boolean,
-      default: false
-    },
-    // 是否显示 批量删除
-    showdeletes: {
-      type: Boolean,
-      default: true
-    }
   },
   data() {
     return {
@@ -83,8 +74,6 @@ export default {
   },
   created() {
     this.getProCity()
-    this.getOrderType()
-    this.getDeptData()// 获取咨询/投诉部门
   },
   methods: {
     btn_search() {
@@ -118,7 +107,7 @@ export default {
         title: '打标签'
       })
     },
-        btn_coupon() {
+    btn_coupon() {
       this.$layer.iframe({
         content: {
           content: freeCoupons, // 传递的组件对象
@@ -163,15 +152,15 @@ export default {
       })
     },
     btn_import() {
-      if (!this.planId) {
-        this.$message.warning('请先选择一行!')
-        return
-      }
+      // if (!this.planId) {
+      //   this.$message.warning('请先选择一行!')
+      //   return
+      // }
       this.$layer.iframe({
         content: {
           content: importTels, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': this.planId }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
         area: ['40%', '380px'],
         shadeClose: false,
@@ -189,28 +178,6 @@ export default {
         resolve()
       })
     },
-    // 获取工单类型
-    getOrderType() {
-      return new Promise(resolve => {
-        getDictionary('HYGDLX').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.typeOptions = response.data
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取咨询/投诉部门
-    getDeptData() {
-      return new Promise(resolve => {
-        getDictionary('HYZXBM').then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.deptOptions = response.data
-          }
-        })
-        resolve()
-      })
-    }
   }
 }
 </script>

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -7,7 +7,12 @@
       @delorders="btn_search"
       @export="btn_search">
     </search-filter>
-    <el-table v-loading="loading" :data="dataLists" border stripe>
+    <el-table 
+      v-loading="loading" 
+      :data="dataLists" 
+      border
+      stripe
+      @select="handleTableClick">
       <el-table-column 
         type="selection"
         width="40">
@@ -165,7 +170,7 @@
 
 <script>
 
-import { getOrderLists, deleteOrder } from '@/api/order/orderSearch'
+import { getOrderLists, deleteOrder } from '@/api/memberManagement/memberList'
 import searchFilter from './components/searchFilter'
 import addOrEdit from './components/addOrEdit'
 import detail from './components/detail'
@@ -204,7 +209,8 @@ export default {
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
         total: 0 // 总共多少数据
       },
-      dataLists: [] // 列表数据
+      dataLists: [],// 列表数据
+      selectTableId: '', //选中行id
     }
   },
   created() {
@@ -222,6 +228,17 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
+          customerName: this.searchDatas.customerName, //客户姓名
+          phoneNumber: this.searchDatas.phoneNumber, //手机号码
+          memberType: this.searchDatas.memberType, //会员类型
+          province: this.searchDatas.province, //省份
+          city: this.searchDatas.city, //市
+          county: this.searchDatas.county, //县区
+          township: this.searchDatas.township, //乡镇
+          address: this.searchDatas.address, //详细地址
+          memberBirthday: this.searchDatas.memberBirthday, //会员生日
+          referrer: this.searchDatas.referrer, //推荐人
+          contactFrequency: this.searchDatas.contactFrequency, //联系频次
         }
         getOrderLists(params).then(response => {
           this.loading = false
@@ -275,6 +292,9 @@ export default {
         this.$message.info('已取消删除')
       })
     },
+    handleTableClick(selection, row) {
+      this.selectTableId = selection
+    }
   }
 }
 </script>