提交问题

src/api/delivery.js

@@ -14,9 +14,43 @@ import homeUrl from './homeURL'
  * @param parameter
  * @returns {*}
  */
-
-// 获取配送方式列表
+// 获取快递方式列表
 export function getDistributionModeList(parameter) {
+    console.log(parameter)
+    return axios({
+        url: 'transport/companies/company-list',
+        method: 'get',
+        params: parameter
+    })
+}
+// 获取快递方式详情
+export function getCompanyDetail(parameter) {
+    return axios({
+        url: 'transport/companies/company-detail',
+        method: 'get',
+        params: {
+        'guid':parameter
+        }
+    })
+}
+//修改快递方式详情
+export function modifyCompanyDetail(parameter) {
+    return axios({
+        url: 'transport/companies/company-revise',
+        method: 'put',
+        data: parameter
+    })
+}
+// 添加快递方式
+export function addCompanyDetail(parameter) {
+    return axios({
+        url: 'transport/transport-settings/transport-fee-add',
+        method: 'post',
+        data: parameter
+      })
+}
+// 获取配送方式列表
+export function getTransportMethod(parameter) {
     console.log(parameter)
     return axios({
         url: 'transport/transport-methods/get-transport-method',
@@ -24,6 +58,14 @@ export function getDistributionModeList(parameter) {
         params: parameter
     })
 }
+// 添加配送方式
+export function addDistributionManage(parameter) {
+    return axios({
+        url: 'transport/transport-methods/transport-method-insert',
+        method: 'post',
+        data: parameter
+      })
+}
 // 获取O2O配送费列表
 export function getExpressPrice(parameter) {
     console.log(parameter)

src/config/router.config.js

@@ -208,12 +208,26 @@ export const asyncRouterMap = [
               component: () => import('@/views/delivery/distributionMode'),
               meta: { title: '快递方式', keepAlive: false, permission: ['table'] }
             },
+            {
+              path: '/delivery/details/companyDetail',
+              name: 'companyDetail',
+              hidden:true,
+              component: () => import('@/views/delivery/details/companyDetail'),
+              meta: { title: '编辑快递方式', keepAlive: false, permission: ['table'] }
+            },
             {
               path: '/delivery/distributionManage',
               name: 'distributionManage',
               component: () => import('@/views/delivery/distributionManage'),
               meta: { title: '配送方式管理', keepAlive: false, permission: ['table'] }
             },
+            {
+              path: '/delivery/details/distributionDetail',
+              name: 'distributionDetail',
+              hidden:true,
+              component: () => import('@/views/delivery/details/distributionDetail'),
+              meta: { title: '编辑配送方式管理', keepAlive: false, permission: ['table'] }
+            },
             {
               path: '/delivery/expressPrice',
               name: 'expressPrice',

src/views/authority/details/Manage_editor.vue

@@ -22,7 +22,8 @@
 
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="拥有权限" >
         <a-radio-group v-decorator="['ROLE_ID',{normalize:checkRadio}]">
-          <a-radio v-for="(item,index) in grouplist" :key="index" :value="item.ID">{{ item.NAME }}</a-radio>
+          <!-- <a-radio v-for="(item,index) in grouplist" :key="index" :value="item.ID">{{ item.NAME }}</a-radio> -->
+          <a-radio v-for="(group, index) in grouplist"  :key="index"  :value="group.ID">{{ group.NAME }}</a-radio>
         </a-radio-group>
       </a-form-item>
 

src/views/authority/manageList.vue

@@ -98,8 +98,8 @@ export default {
         this.$router.push({path:'/authority/details/Manage_editor',query:{GUID:GUID}})
         // this.$router.push({path:'/authority/details/Manage_editor',query:{goid:1}})
       }else{
-        console.log(value)
-        this.$router.push({path:'/authority/details/Manage_editor',query:{goid:0,GUID:value.GUID}})
+        // console.log(value)
+        this.$router.push({path:'/authority/details/Manage_editor'})
     
       }
     },

src/views/delivery/details/companyDetail.vue

+<template>
+  <a-card :body-style="{ padding: '24px 32px' }" :bordered="false">
+    <a-form :form="form">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="快递方式CODE">
+        <a-input
+          v-decorator="['CODE', { rules: [{ required: true, message: '请输入快递方式CODE' }] }]"
+          name="CODE"
+          placeholder="请输入快递方式CODE"
+        />
+      </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="['PHONE', { rules: [{ required: true, message: '请输入手机号' }] }]" name="PHONE" placeholder="请输入手机号"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+        <a-input v-decorator="['SORT']" name="SORT" />
+      </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+        <a-input 
+        v-decorator="['DESCRIPTION', { rules: [{ required: true, message: '请输入描述' }] }]" name="DESCRIPTION" placeholder="请输入描述"/>
+      </a-form-item>
+       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否默认">
+        <a-radio-group v-decorator="['IS_DEFAULT', { 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 :wrapperCol="{ span: 24 }" style="text-align: center">
+        <a-button v-if="GUID" @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 { getCompanyDetail, modifyCompanyDetail, addCompanyDetail } from '@/api/delivery'
+
+export default {
+  name: 'delivery',
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 12 }
+      },
+
+      // count: 2,
+      description: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+      //   goId: 1,
+      GUID: '',
+    //   res:[],
+    //   grouplist: [],
+      // form
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {
+    var id = this.$route.query.GUID
+    console.log(id)
+    // var gooId = this.$route.query.goid
+    // this.goId = gooId
+    this.GUID = id
+   if (id) {
+      return getCompanyDetail(id)
+        .then(res => {
+          console.log(res)
+          this.form.setFieldsValue(res)
+        })
+        .catch(err => {})
+    }
+    
+    //获取所有权限
+    // getManageGroupList()
+    //   .then(res => {
+    //     console.log(res)
+    //     this.grouplist = res.info
+    //   })
+    //   .catch(err => {})
+  },
+  methods: {
+    // checkboxGroup处理
+    checkRadio(value) {
+      if (value) {
+        return value.toString()
+      }
+    },
+    //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 }
+          addCompanyDetail(EminformanParams)
+          this.$router.push({ path: '/delivery/distributionMode' })
+        }
+      })
+    },
+
+    handleSubmit1() {
+      let guid = this.GUID
+      const {
+        form: { validateFields }
+      } = this
+      validateFields({ force: true }, (err, values) => {
+        if (!err) {
+          const CompanyModify = Object.assign({ ...values }, { GUID: guid })
+          // if (CompanyModify.CONTACTBIRTH_DATE) {
+          //   CompanyModify.CONTACTBIRTH_DATE = CompanyModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
+          // }
+          modifyCompanyDetail(EminformanModify)
+          this.$router.push({ path: '/delivery/distributionMode' })
+        }
+      })
+    },
+    goBack() {
+      this.$router.push({ path: '/delivery/distributionMode' })
+    }
+  }
+}
+</script>

src/views/delivery/details/distributionDetail.vue

+<template>
+  <a-card :body-style="{ padding: '24px 32px' }" :bordered="false">
+    <a-form :form="form">
+      <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="['DSDINTERVAL', { rules: [{ required: true, message: '请输入小时数' }] }]"
+          name="DSDINTERVAL"
+          placeholder="请输入小时数"
+        /> -->
+        <a-row>
+          <a-col :span="12">
+            <a-input-group compact>
+              <a-input style="width:50%" v-decorator="['DSDINTERVAL']" placeholder="请输入小时数" />
+              <a-button type="primary" style="width:20%">元</a-button>
+            </a-input-group>
+          </a-col>
+        </a-row>
+      </a-form-item>
+
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="额外配送费用">
+        <!-- <a-input
+          v-decorator="['EXTRA_MONEY', { rules: [{ required: true, message: '请输入额外配送费用' }] }]"
+          name="EXTRA_MONEY"
+          placeholder="请输入额外配送费用"
+        /> -->
+         <a-row>
+          <a-col :span="12">
+            <a-input-group compact>
+              <a-input style="width:50%" v-decorator="['EXTRA_MONEY']" placeholder="请输入额外配送费用" />
+              <a-button type="primary" style="width:20%">元</a-button>
+            </a-input-group>
+          </a-col>
+        </a-row>
+      </a-form-item>
+       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配送类型">
+        <a-input
+          v-decorator="['TRANSPOR_TYPE', { rules: [{ required: true, message: '请选择配送类型' }] }]"
+          name="TRANSPOR_TYPE"
+          placeholder="请选择配送类型"
+        />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+        <a-input v-decorator="['ORDER_INDEX']" name="ORDER_INDEX" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否支持线下付款">
+        <a-radio-group v-decorator="['IS_UNDERLINE_PAY', { 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="['DESCRIPTION', { rules: [{ required: true, message: '请输入描述' }] }]"
+          name="DESCRIPTION"
+          placeholder="请输入描述"
+        />
+      </a-form-item>
+
+      <a-form-item :wrapperCol="{ span: 24 }" style="text-align: center">
+        <a-button v-if="GUID" @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 { addDistributionManage } from '@/api/delivery'
+
+export default {
+  name: 'delivery',
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 12 }
+      },
+
+      // count: 2,
+      description: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+      //   goId: 1,
+      GUID: '',
+      //   res:[],
+      //   grouplist: [],
+      // form
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {
+    var id = this.$route.query.GUID
+    console.log(id)
+    // var gooId = this.$route.query.goid
+    // this.goId = gooId
+    this.GUID = id
+    if (id) {
+      return getCompanyDetail(id)
+        .then(res => {
+          console.log(res)
+          this.form.setFieldsValue(res)
+        })
+        .catch(err => {})
+    }
+
+    //获取所有权限
+    // getManageGroupList()
+    //   .then(res => {
+    //     console.log(res)
+    //     this.grouplist = res.info
+    //   })
+    //   .catch(err => {})
+  },
+  methods: {
+    // checkboxGroup处理
+    checkRadio(value) {
+      if (value) {
+        return value.toString()
+      }
+    },
+    //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 }
+          addDistributionManage(EminformanParams)
+          this.$router.push({ path: '/delivery/distributionManage' })
+        }
+      })
+    },
+
+    handleSubmit1() {
+      let guid = this.GUID
+      const {
+        form: { validateFields }
+      } = this
+      validateFields({ force: true }, (err, values) => {
+        if (!err) {
+          const CompanyModify = Object.assign({ ...values }, { GUID: guid })
+          // if (CompanyModify.CONTACTBIRTH_DATE) {
+          //   CompanyModify.CONTACTBIRTH_DATE = CompanyModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
+          // }
+          modifyCompanyDetail(EminformanModify)
+          this.$router.push({ path: '/delivery/distributionManage' })
+        }
+      })
+    },
+    goBack() {
+      this.$router.push({ path: '/delivery/distributionManage' })
+    }
+  }
+}
+</script>

src/views/delivery/distributionManage.vue

@@ -3,7 +3,7 @@
     <a-card style="margin-bottom:10px">
       <div class="table-operator">
         <a-button-group>
-          <a-button type='primary' icon='plus' @click="goEdit(1)">添加管理员</a-button>
+          <a-button type="primary" icon="plus" @click="goEdit()">添加配送方式</a-button>
         </a-button-group>
       </div>
       <s-table
@@ -15,13 +15,30 @@
         :data="loadData"
         :showPagination="pagination"
       >
-        <span slot="action" slot-scope="text, record">
+        <span slot="switchAction" slot-scope="">
           <template>
-            <a @click="handleEdit(record)">角色分配</a>
-            <!-- <a-divider type="vertical" /> -->
-            <!-- <a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
-              <a>删除</a>
-            </a-popconfirm> -->
+            <a-row type="flex" justify="start" align="middle">
+              <a-col><a-switch checkedChildren="开" unCheckedChildren="关" defaultChecked/></a-col>
+              <a-col><a-divider type="vertical"/></a-col>
+              <a-col><a-switch checkedChildren="开" unCheckedChildren="关" defaultChecked/></a-col>
+            </a-row>
+          </template>
+        </span>
+        <span slot="action" slot-scope="">
+          <template>
+            <a-row type="flex" justify="start" align="middle">
+              <a-col>
+                <a @click="goEdit(record.GUID)">编辑</a>
+              </a-col>
+              <!-- <a-col>
+                <a-divider type="vertical"/>
+              </a-col>
+              <a-col>
+                <a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-col> -->
+            </a-row>
           </template>
         </span>
       </s-table>
@@ -32,9 +49,9 @@
 // , addMenu, updateMenu, deleteMenu
 import moment from 'moment'
 import { STable } from '@/components'
-import { getMangeList } from '@/api/authority'
+import { getTransportMethod } from '@/api/delivery'
 export default {
-  name:"authority",
+  name: 'delivery',
   components: {
     STable
   },
@@ -49,21 +66,14 @@ export default {
       form: this.$form.createForm(this),
       columns: [
         {
-          title: '管理员姓名',
+          title: '名称',
           dataIndex: 'NAME'
         },
         {
-          title: '手机号',
-          dataIndex: 'MOBILEPHONE'
-          
-        },
-        {
-          title: '创建时间',
-          dataIndex: 'CREATE_DATE'
-        },
-        {
-          title: '角色',
-          dataIndex: 'ROLENAME'
+          title: '开启关闭配送方式',
+          dataIndex: 'switchAction',
+          width: '200px',
+          scopedSlots: { customRender: 'switchAction' }
         },
         {
           title: '操作',
@@ -72,30 +82,37 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
-    //   listData:[],
-      pagination:false,
+      listData:[],
+      pagination: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         console.log('shujujiazai')
-        return getMangeList(Object.assign(parameter, this.queryParam)).then(res => {
+        return getTransportMethod().then(res => {
           console.log('1212121')
           console.log(res)
-        //   this.listData = res
-        //   console.log(this.listData)
-        //   res.data=this.listData
+            this.listData = res
+            console.log(this.listData)
+            res.data=this.listData
           return res
         })
       },
       selectedRowKeys: [],
       selectedRows: [],
       modalNow: 1
-     
     }
   },
   methods: {
-  
+        goEdit (GUID='') {
+      if(GUID){
+        this.$router.push({path:'/delivery/details/distributionDetail',query:{GUID:GUID}})
+        // this.$router.push({path:'/authority/details/Manage_editor',query:{goid:1}})
+      }else{
+        // console.log(value)
+        this.$router.push({path:'/delivery/details/distributionDetail'})
+    
+      }
+    },
   }
-
 }
 </script>
 <style>

src/views/delivery/distributionMode.vue

@@ -3,7 +3,7 @@
     <a-card style="margin-bottom:10px">
       <div class="table-operator">
         <a-button-group>
-          <a-button type='primary' icon='plus' @click="goEdit(1)">添加快递</a-button>
+          <a-button type='primary' icon='plus' @click="goEdit()">添加快递</a-button>
         </a-button-group>
       </div>
       <s-table
@@ -13,11 +13,11 @@
         rowKey="GUID"
         :columns="columns"
         :data="loadData"
-        :showPagination="pagination"
+        showPagination="auto"
       >
         <span slot="action" slot-scope="text, record">
           <template>
-            <a @click="handleEdit(record)">编辑</a>
+            <a @click="goEdit(record.GUID)">编辑</a>
             <a-divider type="vertical" />
             <a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
               <a>删除</a>
@@ -53,49 +53,26 @@ export default {
           dataIndex: 'CODE'
         },
         {
-          title: '名称',
+          title: '配送方式名称',
           dataIndex: 'NAME'
           
         },
         {
-          title: '描述',
-          dataIndex: 'DESCRIPTION'
+          title: '手机号',
+          dataIndex: 'PHONE'
         },
         {
-          title: '是否启用',
-          dataIndex: 'STATE'
-        },
-        {
-          title: '是否支持线下付款',
-          dataIndex: 'IS_UNDERLINE_PAY'
-        },
-        {
-          title: '积分商城中是否启用',
-          dataIndex: 'POINTS_STATE'
-        },
-        {
-          title: '小程序中是否启用',
-          dataIndex: 'ROMENS_RENT_STATE'
-        },
-        {
-          title: '定时达时间间隔',
-          dataIndex: 'DSDINTERVAL'
-        },
-        {
-          title: '配送方式类型',
-          dataIndex: 'TRANSPOR_TYPE'
-        },
-        {
-          title: '额外费用',
-          dataIndex: 'EXTRA_MONEY'
+          title: '排序',
+          dataIndex: 'SORT'
         },
+
         {
-          title: '配送时间',
-          dataIndex: 'DELIVERY_TIME'
+          title: '描述',
+          dataIndex: 'DESCRIPTION'
         },
         {
-          title: '排序序号',
-          dataIndex: 'ORDER_INDEX'
+          title: '是否默认',
+          dataIndex: 'IS_DEFAULT'
         },
 
         {
@@ -105,17 +82,20 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
-      listData:[],
-      pagination:false,
+      // listData:[],
+      // pagination:false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         console.log('shujujiazai')
         return getDistributionModeList(Object.assign(parameter, this.queryParam)).then(res => {
-          console.log('1212121')
-          console.log(res)
-          this.listData = res
-          console.log(this.listData)
-          res.data=this.listData
+           console.log(res)
+          res.pageSize = res._meta.perPage
+          res.page = res._meta.currentPage
+          res.totalPage = res._meta.pageCount
+          res.totalCount = res._meta.totalCount
+          // res.data = []
+          // res.data = res.userdepartment
+          console.log(res.data)
           return res
         })
       },
@@ -126,6 +106,16 @@ export default {
     }
   },
   methods: {
+    goEdit (GUID='') {
+      if(GUID){
+        this.$router.push({path:'/delivery/details/companyDetail',query:{GUID:GUID}})
+        // this.$router.push({path:'/authority/details/Manage_editor',query:{goid:1}})
+      }else{
+        // console.log(value)
+        this.$router.push({path:'/delivery/details/companyDetail'})
+    
+      }
+    },
   
   }
 

src/views/storedc/details/storeManage_details.vue

@@ -83,7 +83,7 @@
                         label="门店坐标"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <div id="components-button-demo-button-group">
+                        <a-row>
                             <a-col :span="12">
                                 <a-input-group compact>
                                     <a-input
@@ -94,17 +94,7 @@
                                     <a-button type="primary" style="width:20%">LAT</a-button>
                                 </a-input-group>
                             </a-col>
-                            <a-col :span="12">
-                                <a-input-group compact>
-                                    <a-input 
-                                        style="width:50%" 
-                                        v-decorator="['LNG']" 
-                                        placeholder="请输入坐标" 
-                                    />
-                                    <a-button type="primary" style="width:20%">LNG</a-button>
-                                </a-input-group>
-                            </a-col>
-                        </div>
+                       <a-row>
                     </a-form-item>
                     <a-form-item
                         label="是否积分兑换门店"