11.29门店管理编辑获取到详情 图片上传等

src/api/homeURL.js

-const homeUrl= 'http://localhost/hantengfei/newShopBack1/backend/web/v1/';
+const homeUrl= 'http://localhost/dengxueyun/newshopBack/backend/web/v1/';
 export default homeUrl
\ No newline at end of file

src/api/store.js

@@ -63,6 +63,7 @@ export function deleteEvaluate (id) {
 // 门店管理
 // 获取门店列表
 export function getStoreList (parameter) {
+  console.log(parameter)
   return axios({
     url: homeUrl+'branch/branches/branch-list',
     method: 'get',
@@ -71,13 +72,45 @@ export function getStoreList (parameter) {
 }
 // 加载省市区
 export function loadAddress (parameter) {
-  console.log('省市区',parameter)
+
   return axios({
     url: homeUrl+'common/shop-transport-areas/area',
     method: 'get',
     params: parameter
   })
 }
+// 获取门店详情
+export function getStoreDetails (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/branch-detail',
+    method: 'get',
+    params: {GUID:parameter}
+  })
+}
+// 门店管理中获取服务类目
+export function getStoreServiceList (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/branch-services',
+    method: 'get',
+    params: parameter
+  })
+}
+// 门店管理中获取配送类型
+export function getStoreDeveliy (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/branch-transport-type',
+    method: 'get',
+    params: parameter
+  })
+}
+// 门店管理上传图片
+export function uploadStorePicture (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/branch-img-upload',
+    method: 'post',
+    data: parameter
+  })
+}
 // 获取门店服务类目管理
 export function getScategorymg(parameter) {
   console.log(parameter)

src/config/router.config.js

@@ -77,6 +77,13 @@ export const asyncRouterMap = [
               component: () => import('@/views/storedc/storeManage'),
               meta: { title: '门店管理', keepAlive: false, permission: ['table'] }
             },
+            {
+              path: '/storedc/storeManage_details',
+              name: 'storeManage_details',
+              hidden: true,
+              component: () => import('@/views/storedc/details/storeManage_details'),
+              meta: { title: '门店管理编辑', keepAlive: false, permission: ['table'] }
+            },
             {
               path: '/storedc/dcManage',
               name: 'dcManage',
@@ -405,7 +412,7 @@ export const asyncRouterMap = [
             meta: { title: '业务布局', icon: 'layout', permission: [ 'support' ] },
             redirect: '/other/list/tree-list',
             children: [
-              {
+              { 
                 path: '/other/list/tree-list',
                 name: 'TreeList',
                 component: () => import('@/views/other/TreeList'),
@@ -416,7 +423,7 @@ export const asyncRouterMap = [
                 name: 'EditList',
                 component: () => import('@/views/other/TableInnerEditList'),
                 meta: { title: '内联编辑表格', keepAlive: true }
-              },
+              }, 
               {
                 path: '/other/list/user-list',
                 name: 'UserList',

src/core/lazy_lib/components_use.js

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

src/views/storedc/details/branchservice_add.vue

@@ -17,7 +17,7 @@
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
       >
-        <a-input
+        <a-input 
           placeholder="服务类目编号"
           v-decorator="[
             'CODE',

src/views/storedc/storeEvaluateManage.vue

@@ -164,8 +164,7 @@
                     :labelCol='labelCol'
                     :wrapperCol='wrapperCol'
                   >
-                    <a-input
-                    disabled
+                    <a-input 
                     v-decorator="['BRANCH_NAME']"
                     name="BRANCH_NAME"
                     placeholder="请输入门店名称" />

src/views/storedc/storeManage.vue

@@ -28,33 +28,9 @@
               </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-cascader :allowClear='allowClear' changeOnSelect :fieldNames="addressFields" :options='addressOptions' :loadData="loadChildren" placeholder="请选择地址" v-model="addressTest"></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="请选择">
@@ -81,7 +57,7 @@
               </a-col>
               <a-col :md="8" :sm="24">
                   <a-form-item label="所属分公司">
-                  <a-select v-model="queryParam.BRANCH_TYPE" placeholder="请选择">
+                  <a-select v-model="queryParam.SUPPROVINCE_GUID" placeholder="请选择">
                       <a-select-option value="0">否</a-select-option>
                       <a-select-option value="1">是</a-select-option>
                   </a-select>
@@ -91,7 +67,7 @@
             <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-button style="margin-left: 8px" @click="() =>{ queryParam = {};addressTest=[]}">重置</a-button>
                 <a @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -139,6 +115,7 @@ export default {
   data () {
     return {
       mdl: {},
+      addressTest:null,
       labelCol: {
         xs: { span: 8 },
         sm: { span: 8 }
@@ -147,6 +124,7 @@ export default {
         xs: { span: 12 },
         sm: { span: 12 }
       },
+      allowClear:true,
       addressOptions:[],
       addressFields:{
         label:'NAME',
@@ -169,18 +147,18 @@ export default {
           title: '编号',
           dataIndex: 'CODE'
         },
-        // {
-        //   title: '上级/省级编号',
-        //   dataIndex: 'USER_GROUP_GUID'
-        // },
+        {
+          title: '上级/省级编号',
+          dataIndex: 'PARENT_GUID'
+        },
         {
           title: '电话',
           dataIndex: 'PHONE' 
         },
-        // {
-        //   title: '联系人姓名',
-        //   dataIndex: 'WX_NO'
-        // },
+        {
+          title: '联系人姓名',
+          dataIndex: 'CONTACT_NAME'
+        },
         {
           title: '详细地址',
           dataIndex: 'DETAIL_ADDRESS'
@@ -200,7 +178,7 @@ export default {
         }
       ],
       loadData: parameter => {
-        return getStoreList(Object.assign(parameter, this.queryParam))
+        return getStoreList(Object.assign(parameter, this.addressCheck(this.addressTest)))
           .then(res => {
             res.pageSize=res._meta.perPage;
             res.page=res._meta.currentPage;
@@ -215,6 +193,26 @@ export default {
     this.loadProvince()
   },
   methods: {
+    // queryParame处理省市区传旨
+    addressCheck(value){
+      if(value){
+        if(value.length>0){
+          if(value.length>1){
+            if(value.length>2){
+              this.queryParam.RECIVER_PROVINCE=this.addressTest[0]
+              this.queryParam.RECIVER_CITY=this.addressTest[1]
+              this.queryParam.RECIVER_REGION=this.addressTest[2]
+            }else{
+              this.queryParam.RECIVER_PROVINCE=this.addressTest[0]
+              this.queryParam.RECIVER_CITY=this.addressTest[1]
+            }
+          }else{
+            this.queryParam.RECIVER_PROVINCE=this.addressTest[0]
+          }
+        }
+      }
+      return this.queryParam
+    },
     // 加载省
     loadProvince(){
       loadAddress().then( res => {
@@ -242,7 +240,7 @@ export default {
           })
           setTimeout(() => {
             targetOption.loading=false;
-            targetOption.children=res.data;
+            targetOption.children=res.data; 
             this.addressOptions=[...this.addressOptions];
           },1000)
         }).catch(err => {
@@ -272,6 +270,7 @@ export default {
     handleOk(value){
     },
     handleEdit(record) {
+      this.$router.push({path:'/storedc/storeManage_details',query:{GUID:record.GUID}})
     },
     toggleAdvanced () {
       this.advanced = !this.advanced

src/views/userstaff/uList.vue

 <template>
+<a-card :bordered="false">
   <div>
     <div class="table-page-search-wrapper">
       <a-form :form='formCheck' layout="inline">
@@ -208,6 +209,7 @@
       </a-form>
     </a-modal>
   </div>
+</a-card>
 </template>
 
 <script>
@@ -226,11 +228,11 @@ export default {
       mdl: {},
       destoryOnClose:true,
       labelCol: {
-        xs: { span: 8 },
-        sm: { span: 8 }
+        xs: { span: 24 },
+        sm: { span: 7 }
       },
       wrapperCol: {
-        xs: { span: 12 },
+        xs: { span: 24 },
         sm: { span: 12 }
       },
       visible:false,