htf

package-lock.json

@@ -15562,6 +15562,14 @@
       "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
       "dev": true
     },
+    "uppercamelcase": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/uppercamelcase/-/uppercamelcase-1.1.0.tgz",
+      "integrity": "sha1-Mk2YprOvx+iolT4QZBUJsOTiP5c=",
+      "requires": {
+        "camelcase": "^1.2.1"
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -15771,6 +15779,14 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
+    "vue-amap": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/vue-amap/-/vue-amap-0.5.10.tgz",
+      "integrity": "sha512-9ViNCev1vx32+zZ5RvF/TmUZNbwL9QrdA2/OnD2GlXMfQBkJy7D08Vb7379t6guqnopDPtWJ8K6gg72h9+4GUg==",
+      "requires": {
+        "uppercamelcase": "^1.1.0"
+      }
+    },
     "vue-clipboard2": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.2.1.tgz",

package.json

@@ -27,6 +27,7 @@
     "nprogress": "^0.2.0",
     "viser-vue": "^2.4.6",
     "vue": "^2.6.10",
+    "vue-amap": "^0.5.10",
     "vue-clipboard2": "^0.2.1",
     "vue-cropper": "0.4.9",
     "vue-ls": "^3.2.1",

src/api/store.js

@@ -168,7 +168,37 @@ export function modifyStoreManage (parameter) {
     data: parameter
   })
 }
-// 获取门店服务类目管理
+// 获取门店电子围栏
+export function getElecfence(parameter) {
+  console.log(parameter)
+  // let newParameter = {
+  //   'page': parameter.page,
+  //   'pageSize': parameter.pageSize
+  // }
+  return axios({
+    url: 'branch/city-distribution-settings/city-distribution-setting-list',
+    method: 'get',
+    params: parameter
+  })
+}
+  // 获取门店电子围栏详情
+  export function getElecfenceDetails (parameter) {
+    return axios({
+      url: 'branch/city-distribution-settings/city-distribution-setting-detail',
+      method: 'get',
+      params: {guid:parameter}
+    })
+  }
+  // 删除门店电子围栏
+export function deleteElecfence(id) {
+  console.log(id)
+  return axios({
+    url: 'branch/city-distribution-settings/city-distribution-setting-delete',
+    method: 'delete',
+    data: { "GUID": id }
+  })
+}
+// 获取门店服务类目列表
 export function getScategorymg(parameter) {
   console.log(parameter)
   // let newParameter = {

src/config/router.config.js

@@ -109,7 +109,13 @@ export const asyncRouterMap = [
               component: () => import('@/views/storedc/Electronicfence'),
               meta: { title: '门店电子围栏', keepAlive: false, permission: ['table'] }
             },
-      
+            {
+              path: '/storedc/details/Elecfence_edit',
+              name: 'Elecfence_edit',
+              hidden:true,
+              component: () => import('@/views/storedc/details/Elecfence_edit'),
+              meta: { title: '编辑电子围栏', keepAlive: false, permission: ['table'] }
+            },
             {
               path: '/storedc/scategorymg',
               name: 'Scategorymg',
@@ -117,20 +123,20 @@ export const asyncRouterMap = [
               meta: { title: '门店服务类目管理', keepAlive: true, permission: ['table'] }
             },
             {
-              path: '/storedc/branchservice_editor',
+              path: '/storedc/details/branchservice_editor',
               name: 'branchService_editor',
               hidden: true,
               component: () => import('@/views/storedc/details/branchService_editor'),
               meta: { title: '编辑服务类目', keepAlive: true, permission: [ 'table' ]  }
             },
-            {
-              path: '/storedc/branchservice_add',
-              name: 'branchservice_add',
-              hidden: true,
-              component: () => import('@/views/storedc/details/branchservice_add'),
-              // component:addbranchservice,
-              meta: { title: '添加服务类目', keepAlive: true, permission: [ 'table' ]  }
-            },
+            // {
+            //   path: '/storedc/details/branchservice_add',
+            //   name: 'branchservice_add',
+            //   hidden: true,
+            //   component: () => import('@/views/storedc/details/branchservice_add'),
+            //   // component:addbranchservice,
+            //   meta: { title: '添加服务类目', keepAlive: true, permission: [ 'table' ]  }
+            // },
             {
               path: '/storedc/cerfmg',
               name: 'Cerfmg',

src/main.js

@@ -8,22 +8,34 @@ import router from './router'
 import store from './store/'
 import { VueAxios } from './utils/request'
 
+import VueQuillEditor from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+import VueAMap from 'vue-amap';
 // mock
 // WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
-// import './mock'
+import './mock'
 
 import bootstrap from './core/bootstrap'
 import './core/lazy_use'
 import './permission' // permission control
 import './utils/filter' // global filter
 import './components/global.less'
-import common from '@/static/js/common.js'
 
 Vue.config.productionTip = false
 
-Vue.prototype.common=common
 // mount axios Vue.$http and this.$http
 Vue.use(VueAxios)
+Vue.use(VueQuillEditor)
+Vue.use(VueAMap)
+VueAMap.initAMapApiLoader({
+  key: 'your amap key',
+  plugin: ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor'],
+  // 默认高德 sdk 版本为 1.4.4
+  v: '1.4.4'
+});
 
 new Vue({
   router,

src/views/storedc/Scategorymg.vue

 <template>
   <a-card :bordered="false">
     <div class="table-operator">
-      <a-button @click="handleadd" type="primary" icon="plus">添加服务类目</a-button>
+      <a-button @click="handleEdit(1)" type="primary" icon="plus">添加服务类目</a-button>
       <a-button type="primary" icon="cloud-upload">导出服务类目</a-button>
       <a-button type="primary" icon="cloud-download">导入服务类目</a-button>
       <a-button type="primary" icon="download">下载导入模板</a-button>
@@ -26,7 +26,7 @@
       </span>
     </s-table>
 
-    <a-modal title="操作" :width="800" v-model="visible" @ok="handleOk">
+    <!-- <a-modal title="操作" :width="800" v-model="visible" @ok="handleOk">
       <a-form :form="modalForm">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务类目名称">
           <a-input v-decorator="['NAME']" name="NAME" placeholder="请输入服务类目名称" />
@@ -44,7 +44,7 @@
           <a-date-picker showTime v-decorator="['CREATE_TIME',{normalize:DateCheck}]" />
         </a-form-item>
       </a-form>
-    </a-modal>
+    </a-modal> -->
   </a-card>
 </template>
 
@@ -155,23 +155,27 @@ export default {
         return moment(value, 'YYYY-MM-DD HH:mm:ss')
       }
     },
-    handleEdit(record) {
-      this.visible = true
-      var that = this
-      getScategorymgDetails(record.CODE)
-        .then(res => {
-          // this.radioVal = res.data[0]
-          console.log(res.data[0])
-          // this.modalForm.initialValue(res)
-          this.$nextTick(() => {
-            this.GUID = res.data[0].GUID
-            this.modalForm.setFieldsValue(res.data[0])
-          })
-        })
-        .catch(err => {})
-    },
-    handleadd() {
-      this.$router.push({ path: '/storedc/branchservice_add' })
+    // handleEdit(record) {
+    //   this.visible = true
+    //   var that = this
+    //   getScategorymgDetails(record.CODE)
+    //     .then(res => {
+    //       // this.radioVal = res.data[0]
+    //       console.log(res.data[0])
+    //       // this.modalForm.initialValue(res)
+    //       this.$nextTick(() => {
+    //         this.GUID = res.data[0].GUID
+    //         this.modalForm.setFieldsValue(res.data[0])
+    //       })
+    //     })
+    //     .catch(err => {})
+    // },
+    handleEdit(value) {
+      if(value==1){
+        this.$router.push({path: '/storedc/details/branchService_editor',query:{goid:1} })
+      }else{
+        this.$router.push({path: '/storedc/details/branchService_editor',query:{goid:0,GUID:value.GUID} })
+      }
     },
     handleOk() {
       let GUID = this.GUID

src/views/storedc/details/branchService_editor.vue

@@ -57,24 +57,17 @@
         />
       </a-form-item>
         <a-form-item
-        label="服务类目描述"
+        label="创建时间"
         :labelCol="{lg: {span: 7}, sm: {span: 7}}"
         :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
         :required="false"
       >
       <a-date-picker showTime v-decorator="['CREATE_TIME',{normalize:DateCheck}]" />
-        <!-- <a-input
-          placeholder="请输入创建时间"
-          v-decorator="[
-            'CREATE_TIME',
-            {rules: [{ required: true, message: '请输入创建时间' }]}
-          ]"
-          name="CREATE_TIME"
-        /> -->
       </a-form-item>
 
       <a-form-item :wrapperCol="{ span: 24 }" style="text-align: center">
-        <a-button @click="handleSubmit1()" htmlType="submit" type="primary">提交</a-button>
+        <a-button v-if="goId == 1" @click.stop.prevent="handleSubmit" htmlType="submit" type="primary">提交</a-button>
+        <a-button v-else @click.stop.prevent="handleSubmit1()" htmlType="submit" type="primary">提交</a-button>
         <a-button @click="goBack" style="margin-left: 8px">返回</a-button>
       </a-form-item>
     </a-form>
@@ -83,16 +76,15 @@
 
 <script>
 import moment from 'moment'
-// 获取门店服务类目详情
-import { getScategorymgDetails } from '@/api/store'
-//修改门店服务类目
-import { modifyScategorymgDetails } from '@/api/store'
+import { getScategorymgDetails, addScategorymg, modifyScategorymgDetails, deleteScategorymg } from '@/api/store'
 
 export default {
   name: 'BaseForm',
   data() {
     return {
       description: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+      goId: 1,
+      GUID: '',
       value: Object,
       // form
       form: this.$form.createForm(this)
@@ -104,11 +96,10 @@ export default {
   mounted() {
     console.log(this.$route.query)
     var id = this.$route.query.GUID
-    // var coDe = this.$route.query.code
-    // this.coDe = coDe
-    // this.scateId = id
-    // if (coDe == 0) {
-      // this.scateId = id
+    var gooId = this.$route.query.goid
+    this.goId = gooId
+    this.GUID = id
+    if (gooId == 0) {
       getScategorymgDetails(id)
         .then(res => {
           console.log(res)
@@ -116,11 +107,9 @@ export default {
             this.GUID = res.data[0].GUID
             this.form.setFieldsValue(res.data[0])
           })
-          // this.form.initialValue(res)
-          // this.form.setFieldsValue(res)
         })
         .catch(err => {})
-    
+    }
   },
   methods: {
      // 时间处理
@@ -132,23 +121,21 @@ export default {
     checkRadio(value) {
       return value.toString()
     },
-    // handleSubmit() {
-    //   alert(111)
-    //   const {
-    //     form: { validateFields }
-    //   } = this
-    //   validateFields({ force: true }, (err, values) => {
-    //     if (!err) {
-    //       const ScategorymgParams = { ...values }
-    //       addScategorymg(ScategorymgParams)
-    //       this.$router.push({ path: '/storedc/scategorymg' })
-    //     }
-    //   })
-    // },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      validateFields({ force: true }, (err, values) => {
+        if (!err) {
+          const ScategorymgParams = { ...values }
+          addScategorymg(ScategorymgParams)
+          this.$router.push({ path: '/storedc/scategorymg' })
+        }
+      })
+    },
     handleSubmit1() {
       alert(121)
       let GUID = this.GUID
-      //
       const {
         form: { validateFields }
       } = this

src/views/userstaff/Eminforman.vue

@@ -39,6 +39,7 @@
     </div>
     <div class="table-operator">
       <a-button @click="goEdit(1)" type="primary" icon="plus">添加员工</a-button>
+      <a-button type='primary' icon='import'>导入员工信息</a-button>
     </div>
     <s-table
       ref="table"