htf

src/api/login.js

@@ -16,7 +16,7 @@ import homeUrl from './homeURL'
  */
 export function login (parameter) {
   return axios({
-    url: homeUrl+'rbacuser/rbac-users/login',
+    url:'rbacuser/rbac-users/login',
     method: 'post',
     data: parameter
   })

src/api/userstaff.js

@@ -22,7 +22,7 @@ export function getPermissions(parameter) {
   //   'page': parameter.page-1
   // }
   return axios({
-    url: "shopuser/shop-users/employee-list",
+    url: "shopuser/shop-employees/employee-list",
     method: 'get',
     params: parameter
   })
@@ -30,11 +30,37 @@ export function getPermissions(parameter) {
 // 获取员工信息详情
 export function getEminformanDetails(id) {
   return axios({
-    url: 'shopuser/shop-users/employee-info?id=' + id,
+    url: 'shopuser/shop-employees/employee-info?id=' + id,
     method: 'get'
     // data: { "GUID": id }
   })
 }
+// 新增员工信息
+export function addEminforman (parameter) {
+  console.log(parameter)
+  return axios({
+    url: 'shopuser/shop-employees/employee-add',
+    method: 'post',
+    data: parameter
+  })
+}
+// 删除员工信息
+export function deleteEminforman (id) {
+  return axios({
+    url: 'shopuser/shop-employees/employee-del?GUID='+id,
+    method: 'delete',
+    // data: {'GUID':id}
+  })
+}
+// 修改用户组详情
+export function modifyEminformanDetails (parameter) {
+    // console.log(parameter)
+    return axios({
+      url: 'shopuser/shop-employees/employee-update',
+      method: 'put',
+      data: parameter
+    })
+  }
 //用户留言列表
 export function getServiceList(parameter) {
   console.log(parameter);

src/config/router.config.js

@@ -23,6 +23,13 @@ export const asyncRouterMap = [
               component: () => import('@/views/userstaff/Eminforman'),
               meta: { title: '员工信息管理', keepAlive: true, permission: [ 'table' ] }
             },
+            {
+              path: '/userstaff/details/Eminforman_editor',
+              name: 'eminformanEditor',
+              hidden:true,
+              component: () => import('@/views/userstaff/details/Eminforman_editor'),
+              meta: { title: '员工信息编辑', keepAlive: true, permission: [ 'table' ] }
+            },
             {
               path: '/userstaff/departmentim',
               name: 'Departmentim',

src/views/userstaff/Eminforman.vue

@@ -37,7 +37,9 @@
         </a-row>
       </a-form>
     </div>
-
+    <div class="table-operator">
+      <a-button @click="goEdit(1)" type="primary" icon="plus">添加员工</a-button>
+    </div>
     <s-table
       ref="table"
       size="default"
@@ -47,121 +49,25 @@
       showPagination="auto"
     >
         <span slot="action"  slot-scope="text, record">
-        <template>
-          <a @click="handleEdit(record)">详情</a>
-        </template>
+            <a type="primary" @click="goEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="是否要删除此行？" @confirm="remove(record.GUID)">
+              <a>删除</a>
+          </a-popconfirm>
         </span>
     </s-table>
 
-    <a-modal title="操作" :width="800" v-model="visible" :footer="null" >
-      <a-form :form='formCheck'>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="用户GUID"
-        >
-         <a-input
-             v-decorator="['GUID']"
-            name="GUID" />
-         
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="员工姓名"
-        >
-         <a-input
-             v-decorator="['NAME']"
-            name="NAME" />
-         
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="员工编号"
-        >
-         <a-input
-             v-decorator="['EMPLOYEE_CODE']"
-            name="EMPLOYEE_CODE"/>
-      
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="电话号码"
-        >
-        <a-input
-             v-decorator="['MOBILE_PHONE']"
-            name="MOBILE_PHONE" />
-        </a-form-item>
-  <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="年龄"
-        >
-        <a-input
-             v-decorator="['AGE']"
-            name="AGE" />
-        </a-form-item>
+    <!-- <a-modal title="操作" :width="800" v-model="visible" :footer="null">
      
- <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="性别"
-        >
-        <a-input
-             v-decorator="['CONTACT_SEX']"
-            name="CONTACT_SEX" />
-        </a-form-item>
+    </a-modal> -->
 
-         <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="会员卡号"
-        >
-        <a-input
-             v-decorator="['MEMBER_NO']"
-            name="MEMBER_NO" />
-        </a-form-item>
- <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="分销商标识"
-        >
-        <a-input
-             v-decorator="['IS_DISTRIBUTOR']"
-            name="IS_DISTRIBUTOR" />
-        </a-form-item>
-         <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="员工是否为门店店长"
-        >
-        <a-input
-             v-decorator="['EMPLOYEE_IS_MANAGER']"
-            name="EMPLOYEE_IS_MANAGER" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="用户所属门店编号"
-        >
-        <a-input
-             v-decorator="['BRANCH_GUID']"
-            name="BRANCH_GUID" />
-        </a-form-item>
-      </a-form>
-    </a-modal>
   </a-card>
 </template>
 
 <script>
 import moment from 'moment'
 import { STable } from '@/components'
-import { getPermissions, getEminformanDetails } from '@/api/userstaff'
+import { getPermissions, getEminformanDetails, deleteEminforman } from '@/api/userstaff'
 
 export default {
   name: 'TableList',
@@ -180,7 +86,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      newform:this.$form.createForm(this),
+      newform: this.$form.createForm(this),
       formCheck: this.$form.createForm(this),
       mdl: {},
       // 高级搜索 展开/关闭
@@ -191,10 +97,10 @@ export default {
       // queryParam1: {},
       // 表头
       columns: [
-        {
-          title: '用户GUID',
-          dataIndex: 'GUID'
-        },
+        // {
+        //   title: '用户GUID',
+        //   dataIndex: 'GUID'
+        // },
         {
           title: '姓名',
           dataIndex: 'NAME'
@@ -208,8 +114,8 @@ export default {
           dataIndex: 'MOBILE_PHONE'
         },
         {
-          title: '用户所属门店GUID',
-          dataIndex: 'EMPLOYEE_BRANCH_GUID'
+          title: '用户所属门店',
+          dataIndex: 'SHOP_BRANCH_NAME'
         },
 
         {
@@ -235,30 +141,46 @@ export default {
         })
       },
       selectedRowKeys: [],
-      selectedRows: [],
+      selectedRows: []
     }
   },
-  created() {
+  created() {},
+  methods: {
+     goEdit (value) {
 
+      if(value==1){
+        this.$router.push({path:'/userstaff/details/Eminforman_editor',query:{goid:1}})
+      }else{
+        console.log(value)
+        this.$router.push({path:'/userstaff/details/Eminforman_editor',query:{goid:0,GUID:value.GUID}})
+    
+      }
     },
-  methods: {
+    // handleEdit(record) {
+    //   this.visible = true
+    //   var that = this
+    //   getEminformanDetails(record.GUID)
+    //     .then(res => {
+    //       // this.radioVal = res.data[0]
+    //       // console.log(res.data[0])
+    //       // this.modalForm.initialValue(res.data[0])
+    //       this.$nextTick(() => {
+    //         this.formCheck.setFieldsValue(res)
+    //       })
+    //     })
+    //     .catch(err => {
+    //       console.log(err)
+    //     })
+    //   // this.queryParam1 = Object.assign({}, record)
+    // },
+    remove ( key ) {
+      console.log(key)
+      deleteEminforman(key).then(res => {
+        console.log('已删除')
+        this.$refs.table.refresh();
+      }).catch(err => {
         
-    handleEdit(record) {
-      this.visible = true
-         var that = this
-      getEminformanDetails(record.GUID)
-        .then(res => {
-          // this.radioVal = res.data[0]
-          // console.log(res.data[0])
-          // this.modalForm.initialValue(res.data[0])
-          this.$nextTick(() => {
-            this.formCheck.setFieldsValue(res)
-          })
-        })
-        .catch(err => {
-          console.log(err)
       })
-      // this.queryParam1 = Object.assign({}, record)
     },
 
     // handleOk() {

src/views/userstaff/details/Eminforman_editor.vue

+<template>
+  <a-card :body-style="{ padding: '24px 32px' }" :bordered="false">
+    <a-form :form="form">
+       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="员工guid">
+        <a-input v-decorator="[
+        'GUID',
+         {rules: [{ required: true, message: '请输入GUID' }]}
+         ]" 
+         name="GUID"
+        placeholder="请输入GUID" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="员工姓名">
+        <a-input v-decorator="[
+        'NAME',
+         {rules: [{ required: true, message: '请输入员工姓名' }]}
+         ]" 
+         name="NAME"
+        placeholder="请输入员工姓名" />
+      </a-form-item>
+
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="员工编号">
+        <a-input v-decorator="['EMPLOYEE_CODE']" name="EMPLOYEE_CODE" />
+      </a-form-item>
+
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电话号码">
+        <!-- <a-input v-decorator="['MOBILE_PHONE']" name="MOBILE_PHONE" /> -->
+         <a-input v-decorator="[
+        'MOBILE_PHONE',
+         {rules: [{ required: true, message: '请输入电话号码' }]}
+         ]" 
+         name="MOBILE_PHONE"
+        placeholder="请输入电话号码" />
+      </a-form-item>
+      <a-form-item
+            label="出生日期"
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol">
+            <a-date-picker v-decorator="['CONTACTBIRTH_DATE', { normalize:DateCheck }]" />
+        </a-form-item>
+
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="性别">
+        <!-- <a-input v-decorator="['CONTACT_SEX']" name="CONTACT_SEX" /> -->
+        <a-radio-group v-decorator="['CONTACT_SEX', { initialValue: '0', normalize: checkRadio }]">
+          <a-radio value="0">男</a-radio>
+          <a-radio value="1">女</a-radio>
+        </a-radio-group>
+      </a-form-item>
+
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
+        <a-input v-decorator="['MEMBER_NO']" name="MEMBER_NO" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="分销商标识">
+        <a-radio-group v-decorator="['IS_DISTRIBUTOR', { initialValue: '0', normalize: checkRadio }]">
+          <a-radio value="0">否</a-radio>
+          <a-radio value="1">是</a-radio>
+        </a-radio-group>
+        <!-- <a-input v-decorator="['IS_DISTRIBUTOR']" name="IS_DISTRIBUTOR" /> -->
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="员工是否为门店店长">
+        <a-input v-decorator="['EMPLOYEE_IS_MANAGER']" name="EMPLOYEE_IS_MANAGER" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户所属门店编号">
+        <!-- <a-input v-decorator="['BRANCH_GUID']" name="BRANCH_GUID" /> -->
+         <a-input v-decorator="[
+        'BRANCH_CODE',
+         {rules: [{ required: true, message: '请输入用户所属门店编号' }]}
+         ]" 
+         name="BRANCH_CODE"
+        placeholder="请输入用户所属门店编号" />
+      </a-form-item>
+      <!-- <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="年龄">
+        <a-input v-decorator="['AGE']" name="AGE" />
+      </a-form-item> -->
+      <a-form-item :wrapperCol="{ span: 24 }" style="text-align: center">
+        <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>
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { addEminforman } from '@/api/userstaff'
+import { getEminformanDetails } from '@/api/userstaff'
+import { modifyEminformanDetails  } from '@/api/userstaff'
+
+export default {
+  name: 'BaseForm',
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 12 }
+      },
+
+      // count: 2,
+      description: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+      goId: 1,
+      GUID: '',
+      // form
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {
+    var id = this.$route.query.GUID
+    var gooId = this.$route.query.goid
+    this.goId = gooId
+    this.GUID = id
+    if (gooId == 0) {
+      getEminformanDetails(id)
+        .then(res => {
+          console.log(res)
+          this.form.setFieldsValue(res)
+        })
+        .catch(err => {})
+    }
+  },
+  methods: {
+    //time
+    DateCheck(value) {
+      if (value || value != null || value != '') {
+        console.log(value)
+        return moment(value, 'YYYY-MM-DD')
+      }
+    },
+    checkRadio(value) {
+      if(value==null || value==""){
+        return '0';
+      }else{
+        return value.toString()
+      }
+    },
+    handleSubmit() {
+      console.log(validateFields)
+      const { form: { validateFields } } = this;
+      validateFields({ force: true }, (err, values) => {
+          console.log(values)
+
+        if (!err) {
+          console.log(err)
+          const EminformanParams = { ...values }
+          addEminforman(EminformanParams)
+          this.$router.push({ path: '/userstaff/Eminforman' })
+        }
+      })
+    },
+
+    handleSubmit1() {
+      let guid = this.GUID
+      const {
+        form: { validateFields }
+      } = this
+      validateFields({ force: true }, (err, values) => {
+        if (!err) {
+          const EminformanModify = Object.assign({ ...values }, { GUID: guid })
+          if (EminformanModify.CONTACTBIRTH_DATE) {
+            EminformanModify.CONTACTBIRTH_DATE = EminformanModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
+          }
+          modifyEminformanDetails(EminformanModify)
+          this.$router.push({ path: '/userstaff/Eminforman' })
+        }
+      })
+    },
+    goBack() {
+      this.$router.push({ path: '/userstaff/Eminforman' })
+    }
+  }
+}
+</script>

vue.config.js

@@ -102,7 +102,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/apis': {
-        target: 'http://localhost/dengxueyun/newshopBack/backend/web/v1/',
+        target: 'http://localhost/hantengfei/newShopBack1/backend/web/v1/',
         ws: false,
         changeOrigin: true,
         pathRewrite:{