门店管理

src/api/store.js

@@ -45,7 +45,6 @@ export function modifyEvaluateDetails (parameter) {
 }
 // 新建门店评价
 export function addEvaluate (parameter) {
-  console.log('新建',parameter)
   return axios({
     url: homeUrl+'branch/branch-scores/add-branch-score',
     method: 'post',
@@ -54,12 +53,19 @@ export function addEvaluate (parameter) {
 }
 // 删除门店评价
 export function deleteEvaluate (id) {
-  console.log(id)
   return axios({
     url: homeUrl+'branch/branch-scores/score-info-del?guid='+id,
     method: 'delete'
   })
 }
+// 下载模板
+export function downloadFile (parameter) {
+  return axios({
+    url: homeUrl+'common/down-templates/template-file',
+    method: 'get',
+    params: parameter
+  })
+}
 // 门店管理
 // 获取门店列表
 export function getStoreList (parameter) {
@@ -111,6 +117,22 @@ export function uploadStorePicture (parameter) {
     data: parameter
   })
 }
+// 门店管理新增
+export function addStoreManage (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/add-branch',
+    method: 'post',
+    data: parameter
+  })
+}
+// 门店管理编辑
+export function modifyStoreManage (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/revise-branch',
+    method: 'put',
+    data: parameter
+  })
+}
 // 获取门店服务类目管理
 export function getScategorymg(parameter) {
   console.log(parameter)

src/views/storedc/storeEvaluateManage.vue

@@ -28,7 +28,7 @@
               <a-button-group>
                 <a-button @click="goEdit(1)" type='primary' icon='plus'>添加分值</a-button>
                 <a-button style="margin-left: 8px" type='primary' icon='file-add'>导入打分</a-button>
-                <a-button style="margin-left: 8px" type='primary' icon='download'>下载导入模板</a-button>
+                <a-button @click="downloadFile" style="margin-left: 8px" type='primary' icon='download'>下载导入模板</a-button>
               </a-button-group>
             </div>
             <s-table
@@ -288,7 +288,7 @@
 <script>
 import moment from 'moment'
 import { STable } from '@/components'
-import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate } from '@/api/store'
+import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate,downloadFile } from '@/api/store'
 
 export default {
   name: 'TableList',
@@ -299,11 +299,11 @@ export default {
     return {
       mdl: {},
       labelCol: {
-        xs: { span: 8 },
-        sm: { span: 8 }
+          xs: { span: 24 },
+          sm: { span: 7 }
       },
       wrapperCol: {
-        xs: { span: 12 },
+          xs: { span: 24 },
           sm: { span: 12 }
       },
       destroyOnClose:true,
@@ -370,6 +370,17 @@ export default {
       // this.$refs.table.refresh();
   },
   methods: {
+    // 下载模板门店服务评价打分模板（shop_branch_score_import.xls）
+    downloadFile(){
+      let downloadData={
+        'ENG_NAME':'shop_branch_score_import.xls',
+        'CN_NAME' :'门店服务评价打分模板'
+      }
+      downloadFile(downloadData).then(res => {
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     remove ( key ) {
       console.log(key)
       deleteEvaluate(key).then(res => {

src/views/storedc/storeManage.vue

@@ -79,6 +79,7 @@
       </div>
       <div class="table-operator">
         <a-button-group>
+          <a-button type='primary' icon='plus' @click="handleEdit(1)">新建门店</a-button>
           <a-button type='primary' icon='edit'>修改门店信息</a-button>
           <a-button style="margin-left: 8px" type='primary' icon='download'>导出门店</a-button>
         </a-button-group>
@@ -117,11 +118,11 @@ export default {
       mdl: {},
       addressTest:null,
       labelCol: {
-        xs: { span: 8 },
-        sm: { span: 8 }
+          xs: { span: 24 },
+          sm: { span: 7 }
       },
       wrapperCol: {
-        xs: { span: 12 },
+          xs: { span: 24 },
           sm: { span: 12 }
       },
       allowClear:true,
@@ -191,6 +192,7 @@ export default {
   },
   mounted(){
     this.loadProvince()
+    this.$refs.table.refresh();
   },
   methods: {
     // queryParame处理省市区传旨
@@ -269,8 +271,12 @@ export default {
     },
     handleOk(value){
     },
-    handleEdit(record) {
-      this.$router.push({path:'/storedc/storeManage_details',query:{GUID:record.GUID}})
+    handleEdit(value) {
+      if(value==1){
+        this.$router.push({path:'/storedc/storeManage_details',query:{goid:1}})
+      }else{
+        this.$router.push({path:'/storedc/storeManage_details',query:{goid:0,GUID:value.GUID}})
+      }
     },
     toggleAdvanced () {
       this.advanced = !this.advanced

src/views/userstaff/details/userGroup_edit.vue

@@ -3,8 +3,8 @@
     <a-form :form="form">
       <a-form-item
         label="组名称"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol">
         <a-input
           v-decorator="[
             'NAME',
@@ -15,8 +15,8 @@
       </a-form-item>
       <a-form-item
         label="优惠百分比"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol">
         <a-input
           placeholder="请输入优惠百分比"
           v-decorator="[
@@ -26,8 +26,8 @@
       </a-form-item>
       <a-form-item
         label="优惠范围"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-radio-group v-decorator="['IS_SETRANGE',{initialValue:'0',normalize:checkRadio}]">
@@ -56,8 +56,8 @@
       </a-form-item>
       <a-form-item
         label="是否为默认组"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-radio-group v-decorator="['IS_DEFAULT',{initialValue:'1',normalize:checkRadio}]">
@@ -67,8 +67,8 @@
       </a-form-item>
       <a-form-item
         label="积分比率"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-input-number v-decorator="['MONEY_POINT_SRATE']" :min="0" :max="100" />
@@ -96,6 +96,14 @@ export default {
   name: 'BaseForm',
   data () {
     return {
+        labelCol: {
+            xs: { span: 24 },
+            sm: { span: 7 }
+        },
+        wrapperCol: {
+            xs: { span: 24 },
+            sm: { span: 12 }
+        },
         dataSource: [
           {
             key: '0',