配送优化

src/api/authority.js

@@ -93,7 +93,31 @@ export function getManageUserInfo(parameter) {
       }
   })
 }
-// 获取角色列表
+//搜索管理员信息  
+export function searchUser (parameter) {
+  return axios({
+    url: 'authority/manage-lists/search-user',
+    method: 'get',
+    data: parameter
+  })
+}
+// 添加管理员
+export function addManageInfo (parameter) {
+  return axios({
+    url: 'authority/manage-lists/manage-add',
+    method: 'post',
+    data: parameter
+  })
+}
+// 修改管理员详情
+export function modifyManageInfoDetails (parameter) {
+  return axios({
+    url: 'authority/manage-lists/manage-update',
+    method: 'post',
+    data: parameter
+  })
+}
+// 获取所有角色分配
 export function getManageGroupList() {
   return axios({
       url: 'authority/manage-lists/manage-group-list',

src/api/delivery.js

@@ -33,6 +33,7 @@ export function getCompanyDetail(parameter) {
         }
     })
 }
+
 //修改快递方式详情
 export function modifyCompanyDetail(parameter) {
     return axios({
@@ -44,28 +45,63 @@ export function modifyCompanyDetail(parameter) {
 // 添加快递方式
 export function addCompanyDetail(parameter) {
     return axios({
-        url: 'transport/transport-settings/transport-fee-add',
+        url: 'transport/companies/company-add',
         method: 'post',
         data: parameter
       })
 }
+// // 获取配送方式列表
+// export function getTransportMethod(parameter) {
+//     console.log(parameter)
+//     return axios({
+//         url: 'transport/transport-methods/get-transport-method',
+//         method: 'get',
+//         params: parameter
+//     })
+// }
 // 获取配送方式列表
-export function getTransportMethod(parameter) {
-    console.log(parameter)
+export function getTransportList(parameter) {
     return axios({
         url: 'transport/transport-methods/get-transport-method',
         method: 'get',
         params: parameter
     })
 }
+//修改配送方式详情
+export function modifyDistributionDetail(parameter) {
+    return axios({
+        url: 'transport/transport-methods/transport-method-update',
+        method: 'put',
+        data: parameter
+    })
+}
+// 获取配送方式详情
+export function getDistributionDetail(parameter) {
+    return axios({
+        url: '',
+        method: 'get',
+        params: {
+        'guid':parameter
+        }
+    })
+}
+
 // 添加配送方式
-export function addDistributionManage(parameter) {
+export function addDistributionDetail(parameter) {
     return axios({
         url: 'transport/transport-methods/transport-method-insert',
         method: 'post',
         data: 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)
@@ -83,14 +119,7 @@ export function getDeliveryList(parameter) {
         params: parameter
     })
 }
-// 获取配送方式列表
-export function getTransportList(parameter) {
-    return axios({
-        url: 'transport/transport-methods/get-transport-method',
-        method: 'get',
-        params: parameter
-    })
-}
+
 // 获取指定省级列表
 export function getProvincialList(parameter) {
     return axios({

src/views/authority/details/Manage_editor.vue

@@ -2,11 +2,19 @@
   <a-card :body-style="{ padding: '24px 32px' }" :bordered="false">
     <a-form :form="form">
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名">
-        <a-input
+        <!-- <a-input
           v-decorator="['GUID', { rules: [{ required: true, message: '请输入姓名' }] }]"
           name="GUID"
           placeholder="请输入姓名"
-        />
+        /> -->
+         <a-row>
+          <a-col :span="24">
+            <a-input-group>
+              <a-input style="width:50%" v-model="NAME" placeholder="请输入姓名" />
+              <a-button @click='searchUser' type="primary" >查找用户信息</a-button>
+            </a-input-group>
+          </a-col>
+        </a-row>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="省级公司">
         <a-input
@@ -28,8 +36,8 @@
       </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 v-if="GUID" @click.stop.prevent="updateSubmit" htmlType="submit" type="primary">提交</a-button>
+        <a-button v-else @click.stop.prevent="addSubmit" htmlType="submit" type="primary">提交</a-button>
         <a-button @click="goBack" style="margin-left: 8px">返回</a-button>
       </a-form-item>
     </a-form>
@@ -38,12 +46,13 @@
 
 <script>
 import moment from 'moment'
-import { getManageUserInfo, getManageGroupList } from '@/api/authority'
+import { getManageUserInfo, getManageGroupList, addManageInfo, modifyManageInfoDetails,searchUser } from '@/api/authority'
 
 export default {
   name: 'authority',
   data() {
     return {
+      NAME:'',
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -70,29 +79,40 @@ export default {
     // this.goId = gooId
     this.GUID = id
     if (id) {
-        getManageGroupList()
-              .then(res => {
-        console.log(res)
-        this.grouplist = res.info;
-        return getManageUserInfo(id)
-      })
-    //   getManageUserInfo(id)
-        .then(res => {
-          console.log(res)
+      // getManageGroupList().then(res => {
+      //   this.grouplist = res.info;
+      //   return getManageUserInfo(id)
+      // }).then(res => {
+      //   this.form.setFieldsValue(res)
+      //   this.res = res
+      // }).catch(err => {
+
+      // })
+      //  loadData: parameter => {
+      //   return getPermissions(Object.assign(parameter, this.queryParam)).then(res => {
+      getManageUserInfo(id).then(res => {
         this.form.setFieldsValue(res)
         this.res = res
-        })
-        .catch(err => {})
+      }).catch(err => {})
     }
+    
     //获取所有权限
-    // getManageGroupList()
-    //   .then(res => {
-    //     console.log(res)
-    //     this.grouplist = res.info
-    //   })
-    //   .catch(err => {})
+    getManageGroupList().then(res => {
+        console.log(res)
+        this.grouplist = res.info
+      }).catch(err => {})
   },
   methods: {
+    //查找用户信息
+    searchUser(){
+      var searchobj = {
+        'MOBILE_PHONE':this.NAME
+      }
+      searchUser(searchobj).then(res => {
+        console.log(res)
+        this.grouplist = res.info
+      }).catch(err => {})
+    },
     // checkboxGroup处理
     checkRadio(value) {
       if (value) {
@@ -113,7 +133,7 @@ export default {
     //     return value.toString()
     //   }
     // },
-    handleSubmit() {
+    addSubmit() {
       console.log(validateFields)
       const {
         form: { validateFields }
@@ -123,25 +143,27 @@ export default {
 
         if (!err) {
           console.log(err)
-          const EminformanParams = { ...values }
-          addEminforman(EminformanParams)
+          const ManageInfoParams = { ...values }
+          console.log(ManageInfoParams)
+          addManageInfo(ManageInfoParams)
           this.$router.push({ path: '/authority/manageList' })
         }
       })
     },
 
-    handleSubmit1() {
+    updateSubmit() {
       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)
+          const ManageInfoModify = Object.assign({ ...values }, { USER_ID: guid })
+          // if (ManageInfoModify.CONTACTBIRTH_DATE) {
+          //   ManageInfoModify.CONTACTBIRTH_DATE = ManageInfoModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
+          // }
+          console.log(ManageInfoModify)
+          modifyManageInfoDetails(ManageInfoModify)
           this.$router.push({ path: '/authority/manageList' })
         }
       })

src/views/delivery/details/companyDetail.vue

@@ -16,7 +16,7 @@
 
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号">
         <a-input 
-         v-decorator="['PHONE', { rules: [{ required: true, message: '请输入手机号' }] }]" name="PHONE" placeholder="请输入手机号"/>
+         v-decorator="['PHONE']" name="PHONE" placeholder="请输入手机号"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
         <a-input v-decorator="['SORT']" name="SORT" />
@@ -33,8 +33,8 @@
       </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 v-if="GUID" @click.stop.prevent="updateSubmit" htmlType="submit" type="primary">提交</a-button>
+        <a-button v-else @click.stop.prevent="addSubmit" htmlType="submit" type="primary">提交</a-button>
         <a-button @click="goBack" style="margin-left: 8px">返回</a-button>
       </a-form-item>
     </a-form>
@@ -112,24 +112,23 @@ export default {
     //     return value.toString()
     //   }
     // },
-    handleSubmit() {
+    addSubmit() {
       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)
+          const CompanyParams = { ...values }
+          addCompanyDetail(CompanyParams)
           this.$router.push({ path: '/delivery/distributionMode' })
         }
       })
     },
 
-    handleSubmit1() {
+    updateSubmit() {
       let guid = this.GUID
       const {
         form: { validateFields }
@@ -140,7 +139,7 @@ export default {
           // if (CompanyModify.CONTACTBIRTH_DATE) {
           //   CompanyModify.CONTACTBIRTH_DATE = CompanyModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
           // }
-          modifyCompanyDetail(EminformanModify)
+          modifyCompanyDetail(CompanyModify)
           this.$router.push({ path: '/delivery/distributionMode' })
         }
       })

src/views/delivery/details/distributionDetail.vue

@@ -65,8 +65,8 @@
       </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 v-if="GUID" @click.stop.prevent="updateSubmit" htmlType="submit" type="primary">提交</a-button>
+        <a-button v-else @click.stop.prevent="addSubmit" htmlType="submit" type="primary">提交</a-button>
         <a-button @click="goBack" style="margin-left: 8px">返回</a-button>
       </a-form-item>
     </a-form>
@@ -75,7 +75,7 @@
 
 <script>
 import moment from 'moment'
-import { addDistributionManage } from '@/api/delivery'
+import { getDistributionDetail, addDistributionDetail, modifyDistributionDetail } from '@/api/delivery'
 
 export default {
   name: 'delivery',
@@ -107,7 +107,7 @@ export default {
     // this.goId = gooId
     this.GUID = id
     if (id) {
-      return getCompanyDetail(id)
+      return getDistributionDetail(id)
         .then(res => {
           console.log(res)
           this.form.setFieldsValue(res)
@@ -144,35 +144,35 @@ export default {
     //     return value.toString()
     //   }
     // },
-    handleSubmit() {
+    addSubmit() {
       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)
+          const DistributionParams = { ...values }
+          addDistributionDetail(DistributionParams).then(res=>{
           this.$router.push({ path: '/delivery/distributionManage' })
+          })
         }
       })
     },
 
-    handleSubmit1() {
+    updateSubmit() {
       let guid = this.GUID
       const {
         form: { validateFields }
       } = this
       validateFields({ force: true }, (err, values) => {
         if (!err) {
-          const CompanyModify = Object.assign({ ...values }, { GUID: guid })
+          const DistributionModify = Object.assign({ ...values }, { GUID: guid })
           // if (CompanyModify.CONTACTBIRTH_DATE) {
           //   CompanyModify.CONTACTBIRTH_DATE = CompanyModify.CONTACTBIRTH_DATE.format('YYYY-MM-DD')
           // }
-          modifyCompanyDetail(EminformanModify)
+          modifyDistributionDetail(DistributionModify)
           this.$router.push({ path: '/delivery/distributionManage' })
         }
       })

src/views/delivery/distributionManage.vue

@@ -24,7 +24,7 @@
             </a-row>
           </template>
         </span>
-        <span slot="action" slot-scope="">
+        <span slot="action" slot-scope="text, record">
           <template>
             <a-row type="flex" justify="start" align="middle">
               <a-col>
@@ -49,7 +49,7 @@
 // , addMenu, updateMenu, deleteMenu
 import moment from 'moment'
 import { STable } from '@/components'
-import { getTransportMethod } from '@/api/delivery'
+import { getTransportList } from '@/api/delivery'
 export default {
   name: 'delivery',
   components: {
@@ -87,7 +87,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         console.log('shujujiazai')
-        return getTransportMethod().then(res => {
+        return getTransportList().then(res => {
           console.log('1212121')
           console.log(res)
             this.listData = res
@@ -103,6 +103,7 @@ export default {
   },
   methods: {
         goEdit (GUID='') {
+          console.log(GUID)
       if(GUID){
         this.$router.push({path:'/delivery/details/distributionDetail',query:{GUID:GUID}})
         // this.$router.push({path:'/authority/details/Manage_editor',query:{goid:1}})