11月20

src/api/store.js

@@ -75,6 +75,30 @@ export function deleteEvaluate (id) {
       }
   })
 }
+// 门店管理
+// 获取门店列表
+export function getStoreList (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/branch-list',
+    method: 'get',
+    headers: {
+        "Authorization": loginToken
+    },
+    params: parameter
+  })
+}
+// 加载省市区
+export function loadAddress (parameter) {
+  console.log('省市区',parameter)
+  return axios({
+    url: homeUrl+'common/shop-transport-areas/get-area',
+    method: 'post',
+    data: parameter,
+    headers: {
+        "Authorization": loginToken
+      }
+  })
+}
 
 
 /**

src/api/token.js

-const loginToken = "Bearer EHtB5oGwObjgdUSgSYRY8Lr_QA8lV_NZ";
+const loginToken = "Bearer ZDGucJp9mrZR3zJoW5EenLaaeS2b6DMt";
 export default loginToken
\ No newline at end of file

src/api/userstaff.js

@@ -76,11 +76,11 @@ export function getUserGroupDetails (id) {
   }
 // 获取用户列表
   export function getUList (parameter) {
-    // console.log(parameter)
-    // let newParameter={
-    //     'page':parameter.page,
-    //     'pageSize':parameter.pageSize
-    // }
+    console.log(parameter)
+    if(parameter.CREATE_DATE){
+      console.log('666')
+      parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD')
+    }
     return axios({
       url: homeUrl+'shopuser/shop-user-lists/user-list',
       method: 'get',
@@ -90,6 +90,16 @@ export function getUserGroupDetails (id) {
       params: parameter
     })
   }
+// 获取所有用户组
+export function getUListUserGroup () {
+  return axios({
+    url: homeUrl+'shopuser/shop-user-lists/get-member-grade-list',
+    method: 'get',
+    headers: {
+        "Authorization": loginToken
+    }
+  })
+}
 // 用户列表详情
 export function getUListDetails (id) {
   return axios({

src/config/defaultSettings.js

@@ -14,7 +14,7 @@
  */
 
 export default {
-  primaryColor: '#52C41A', // primary color of ant design
+  primaryColor: '#1890FF', // primary color of ant design
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu

src/core/lazy_lib/components_use.js

@@ -46,7 +46,8 @@ import {
   Skeleton,
   Popconfirm,
   message,
-  notification
+  notification,
+  Cascader
 } from 'ant-design-vue'
 // import VueCropper from 'vue-cropper'
 
@@ -89,6 +90,7 @@ Vue.use(Skeleton)
 Vue.use(Popconfirm)
 // Vue.use(VueCropper)
 Vue.use(notification)
+Vue.use(Cascader)
 
 Vue.prototype.$confirm = Modal.confirm
 Vue.prototype.$message = message

src/views/storedc/storeManage.vue

+<template>
+  <a-card :bordered="false">
+    <div>
+      <div class="table-page-search-wrapper">
+        <a-form :form='formCheck' layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="8" :sm="24">
+              <a-form-item label="门店名称编码">
+                <a-input v-model="queryParam.CODE" placeholder="请输入"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
+              <a-form-item label="是否营业">
+                <a-select v-model="queryParam.IS_SHELVE" placeholder="请选择">
+                  <a-select-option value="0">否</a-select-option>
+                  <a-select-option value="1">是</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="是否医保">
+                  <a-select v-model="queryParam.IS_CARE" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="省市区">
+                    <a-cascader changeOnSelect :fieldNames="addressFields" :options='addressOptions' :loadData="loadChildren" placeholder="请选择地址"></a-cascader>
+                  </a-form-item>
+              </a-col>
+              <!-- <a-col :md="8" :sm="24">
+                  <a-form-item label="省份">
+                  <a-select v-model="queryParam.BINDCARD" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="城市">
+                  <a-select v-model="queryParam.BINDCARD" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="县区">
+                  <a-select v-model="queryParam.BINDCARD" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col> -->
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="是否积分商城门店">
+                  <a-select v-model="queryParam.IS_POINTS_SHOP" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="是否冷链配送">
+                  <a-select v-model="queryParam.IS_DELIVERY_CODECHAIN_GOODS" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="是否O2O门店">
+                  <a-select v-model="queryParam.IS_O2O" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                  <a-form-item label="所属分公司">
+                  <a-select v-model="queryParam.BRANCH_TYPE" placeholder="请选择">
+                      <a-select-option value="0">否</a-select-option>
+                      <a-select-option value="1">是</a-select-option>
+                  </a-select>
+                  </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="!advanced && 8 || 24" :sm="24">
+              <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+                <a @click="toggleAdvanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <div class="table-operator">
+        <a-button-group>
+          <a-button type='primary' icon='edit'>修改门店信息</a-button>
+          <a-button style="margin-left: 8px" type='primary' icon='download'>导出门店</a-button>
+        </a-button-group>
+      </div>
+      <s-table
+        ref="table"
+        size="default"
+        :columns="columns"
+        :data="loadData"
+        rowKey='GUID'
+      >
+
+        <span slot="action" slot-scope="text, record">
+          <!-- <router-link to="/userstaff/ulist_details"> -->
+            <a type="primary" @click="handleEdit(record)">编辑</a>
+          <!-- </router-link> -->
+
+        </span>
+      </s-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { STable } from '@/components'
+import { getStoreList,loadAddress } from '@/api/store'
+
+export default {
+  name: 'TableList',
+  components: {
+    STable
+  },
+  data () {
+    return {
+      mdl: {},
+      labelCol: {
+        xs: { span: 8 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 12 },
+        sm: { span: 12 }
+      },
+      addressOptions:[],
+      addressFields:{
+        label:'NAME',
+        value:'GUID',
+        children:'children'
+      },
+      visible:false,
+      size: 'default',
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      formCheck:this.$form.createForm(this),
+      columns: [
+        {
+          title: '门店名称',
+          dataIndex: 'NAME'
+        },
+        {
+          title: '编号',
+          dataIndex: 'CODE'
+        },
+        // {
+        //   title: '上级/省级编号',
+        //   dataIndex: 'USER_GROUP_GUID'
+        // },
+        {
+          title: '电话',
+          dataIndex: 'PHONE' 
+        },
+        // {
+        //   title: '联系人姓名',
+        //   dataIndex: 'WX_NO'
+        // },
+        {
+          title: '详细地址',
+          dataIndex: 'DETAIL_ADDRESS'
+        },
+        {
+          title: 'lng坐标',
+          dataIndex: 'LNG'
+        },
+        {
+          title: 'lat坐标',
+          dataIndex: 'LAT'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      loadData: parameter => {
+        return getStoreList(Object.assign(parameter, this.queryParam))
+          .then(res => {
+            res.pageSize=res._meta.perPage;
+            res.page=res._meta.currentPage;
+            res.totalPage=res._meta.pageCount;
+            res.totalCount=res._meta.totalCount;
+            return res
+          })
+      }
+    }
+  },
+  mounted(){
+    this.loadProvince()
+  },
+  methods: {
+    // 加载省
+    loadProvince(){
+      loadAddress().then( res => {
+        res.data.forEach(item => {
+          item.isLeaf=false;
+        });
+        console.log(res)
+        this.addressOptions=res.data;
+      }).catch( err=> {
+
+      })
+    },
+    // 加载市区
+    loadChildren(selectedOptions){
+    //   if(selectedOptions.length<2){
+    //     const targetOption = selectedOptions[selectedOptions.length - 1];
+    //     targetOption.loading = true;
+    //     var that=this;
+    //     // loadAddress()
+    //   }
+    },
+    handleOk(value){
+    },
+    handleEdit(record) {
+    },
+    toggleAdvanced () {
+      this.advanced = !this.advanced
+    }
+  }
+}
+</script>

src/views/userstaff/uList.vue

@@ -10,7 +10,7 @@
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="绑定会员">
-              <a-select v-model="queryParam.BINDCARD" placeholder="请选择" default-value="0">
+              <a-select v-model="queryParam.BINDCARD" placeholder="请选择">
                 <a-select-option value="0">否</a-select-option>
                 <a-select-option value="1">是</a-select-option>
               </a-select>
@@ -29,10 +29,8 @@
             </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="用户所属">
-                <a-select v-model="queryParam.USER_GROUP_GUID" placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
+                <a-select v-model="queryParam.USER_GROUP_GUID" placeholder="请选择">
+                  <a-select-option v-for="item in userGroupList" :key="item.GUID">{{item.NAME}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -72,6 +70,16 @@
     </s-table>
     <a-modal title="操作" :width="800" :destoryOnClose="destoryOnClose" v-model="visible" @ok='handleOk(0)'>
       <a-form :form="modalForm">
+        <a-form-item
+            :labelCol='labelCol'
+            :wrapperCol='wrapperCol'
+          >
+            <a-input
+            hidden
+            v-decorator="['USERGUID']"
+            name="USERGUID"
+            placeholder="请输入评分GUID" />
+        </a-form-item>
         <a-form-item
             label="昵称"
             :labelCol="labelCol"
@@ -142,7 +150,7 @@
             :labelCol="labelCol"
             :wrapperCol="wrapperCol">
             <a-date-picker
-             v-decorator="['CONTACTBIRTH_DATE']"
+             v-decorator="['CONTACTBIRTH_DATE',{normalize:DateFilter}]"
             />
         </a-form-item>
         <a-form-item
@@ -205,7 +213,8 @@
 <script>
 import moment from 'moment'
 import { STable } from '@/components'
-import { getUList,getUserGroup,getUListDetails,UListModify } from '@/api/userstaff'
+import { getUList,getUserGroup,getUListDetails,UListModify,getUListUserGroup } from '@/api/userstaff'
+import { format } from 'path'
 
 export default {
   name: 'TableList',
@@ -269,6 +278,7 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
+      userGroupList:[],//用户组列表
       // giveArray:{},//查询参数
       // whichOptions:0,//0为修改查询，1为默认查询
       // 加载数据方法 必须为 Promise 对象
@@ -291,17 +301,25 @@ export default {
     }
   },
   mounted(){
-    // getUserGroup().then(res => {
-    //   console.log('用户组')
-    //   console.log(res)
-    // }).catch(err => {
+    getUListUserGroup().then(res => {
+      this.userGroupList=res;
+      console.log(this.userGroupList)
+    }).catch(err => {
       
-    // })
+    })
+    // this.getCurrentDate()
   },
   methods: {
+    DateFilter(sexValue){
+      if(sexValue!=null){
+        return moment(sexValue,'YYYY-MM-DD')
+      }
+    },
     checkNull(value){
-      if(value==null){
+      if(value==null || value==""){
         return '0';
+      }else{
+        return value.toString()
       }
     },
     handleOk(value){
@@ -310,6 +328,7 @@ export default {
           validateFields({ force: true }, (err, values) => {
             if (!err) {
               const EvaluateModify = Object.assign({ ...values });
+              EvaluateModify.CONTACTBIRTH_DATE=EvaluateModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
               UListModify(EvaluateModify).then(res => {
                 this.visible=false;
                 // this.whichOptions=1;
@@ -335,6 +354,7 @@ export default {
       var that=this;
       getUListDetails(record.GUID).then(res => {
         this.$nextTick(() => {
+          res.data.userInfo.USERGUID=record.GUID;
           this.modalForm.setFieldsValue(res.data.userInfo)
           that.modal_usergroup=res.data.memberGradeList;
         })