合并dengxueyun

src/api/store.js

@@ -91,9 +91,9 @@ export function getStoreList (parameter) {
 export function loadAddress (parameter) {
   console.log('省市区',parameter)
   return axios({
-    url: homeUrl+'common/shop-transport-areas/get-area',
-    method: 'post',
-    data: parameter,
+    url: homeUrl+'common/shop-transport-areas/area',
+    method: 'get',
+    params: parameter,
     headers: {
         "Authorization": loginToken
       }

src/api/token.js

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

src/api/userstaff.js

@@ -112,6 +112,9 @@ export function getUListDetails (id) {
 }
 // 修改用户列表
 export function UListModify (parameter) {
+  if(parameter.CREATE_DATE){
+    parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD')
+  }
   return axios({
     url: homeUrl+'shopuser/shop-user-lists/user-update',
     method: 'post',
@@ -121,6 +124,17 @@ export function UListModify (parameter) {
       }
   })
 }
+// 获取用户组列表
+export function getUGroupList () {
+  return axios({
+    url: homeUrl+'shopuser/shop-user-lists/get-member-grade-list',
+    method: 'get',
+    headers: {
+        "Authorization": loginToken
+    }
+  })
+}
+
 
 /**
  * get user 2step code open?

src/views/storedc/storeManage.vue

@@ -229,12 +229,45 @@ export default {
     },
     // 加载市区
     loadChildren(selectedOptions){
-    //   if(selectedOptions.length<2){
-    //     const targetOption = selectedOptions[selectedOptions.length - 1];
-    //     targetOption.loading = true;
-    //     var that=this;
-    //     // loadAddress()
-    //   }
+      if(selectedOptions.length<2){
+        const targetOption = selectedOptions[selectedOptions.length - 1];
+        targetOption.loading = true;
+        var that=this;
+        let giveParent={
+          PARENT_GUID: targetOption.GUID
+        }
+        loadAddress(giveParent).then(res => {
+          res.data.forEach(item => {
+            item.isLeaf=false;
+          })
+          setTimeout(() => {
+            targetOption.loading=false;
+            targetOption.children=res.data;
+            this.addressOptions=[...this.addressOptions];
+          },1000)
+        }).catch(err => {
+
+        })
+      }else{
+        const targetOption = selectedOptions[selectedOptions.length - 1];
+        targetOption.loading = true;
+        var that=this;
+        let giveParent={
+          PARENT_GUID: targetOption.GUID
+        }
+        loadAddress(giveParent).then(res => {
+          // res.data.forEach(item => {
+          //   item.isLeaf=false;
+          // })
+          setTimeout(() => {
+            targetOption.loading=false;
+            targetOption.children=res.data;
+            this.addressOptions=[...this.addressOptions];
+          },1000)
+        }).catch(err => {
+
+        })
+      }
     },
     handleOk(value){
     },

src/views/userstaff/uList.vue

@@ -30,7 +30,7 @@
             <a-col :md="8" :sm="24">
               <a-form-item label="用户所属">
                 <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-option v-for="item in groupList" :key="item.GUID">{{item.NAME}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -76,8 +76,8 @@
           >
             <a-input
             hidden
-            v-decorator="['USERGUID']"
-            name="USERGUID"
+            v-decorator="['GUID']"
+            name="GUID"
             placeholder="请输入评分GUID" />
         </a-form-item>
         <a-form-item
@@ -150,7 +150,7 @@
             :labelCol="labelCol"
             :wrapperCol="wrapperCol">
             <a-date-picker
-             v-decorator="['CONTACTBIRTH_DATE',{normalize:DateFilter}]"
+             v-decorator="['CONTACTBIRTH_DATE',{normalize:DateCheck}]"
             />
         </a-form-item>
         <a-form-item
@@ -213,7 +213,7 @@
 <script>
 import moment from 'moment'
 import { STable } from '@/components'
-import { getUList,getUserGroup,getUListDetails,UListModify,getUListUserGroup } from '@/api/userstaff'
+import { getUList,getUserGroup,getUListDetails,UListModify,getUGroupList } from '@/api/userstaff'
 import { format } from 'path'
 
 export default {
@@ -235,6 +235,7 @@ export default {
       },
       visible:false,
       size: 'default',
+      groupList:[],
       // queryParam1: {},
       modal_usergroup:[],
       // 高级搜索 展开/关闭
@@ -301,20 +302,24 @@ export default {
     }
   },
   mounted(){
-    getUListUserGroup().then(res => {
-      this.userGroupList=res;
-      console.log(this.userGroupList)
-    }).catch(err => {
-      
-    })
-    // this.getCurrentDate()
+    this.getUGroupList();
   },
   methods: {
-    DateFilter(sexValue){
-      if(sexValue!=null){
-        return moment(sexValue,'YYYY-MM-DD')
+    // 时间处理
+    DateCheck(value){
+      if(value || value!=null || value!=""){
+          return moment(value,'YYYY-MM-DD')
       }
     },
+    // 获取用户组列表
+    getUGroupList(){
+      getUGroupList().then(res => {
+        this.groupList=res;
+      }).catch(err => {
+
+      })
+    },
+    // 下拉选择处理
     checkNull(value){
       if(value==null || value==""){
         return '0';
@@ -328,7 +333,10 @@ export default {
           validateFields({ force: true }, (err, values) => {
             if (!err) {
               const EvaluateModify = Object.assign({ ...values });
-              EvaluateModify.CONTACTBIRTH_DATE=EvaluateModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
+              if(EvaluateModify.CONTACTBIRTH_DATE){
+                EvaluateModify.CONTACTBIRTH_DATE=EvaluateModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD');
+              }
+              EvaluateModify.USERGUID=EvaluateModify.GUID;
               UListModify(EvaluateModify).then(res => {
                 this.visible=false;
                 // this.whichOptions=1;