diff --git a/src/api/emis/emisCustomerUser.js b/src/api/emis/emisCustomerUser.js index 8e42a509..607b9085 100644 --- a/src/api/emis/emisCustomerUser.js +++ b/src/api/emis/emisCustomerUser.js @@ -122,11 +122,11 @@ export function monthlyShipmentDetail(query) { }) } -//查询现金客户接口 -export function listMoneyUserAll(query) { +// 绑定现金客户接口 +export function bindMoneyUser(data) { return request({ - url: '/emis/emisCustomerUser/listMoneyUserAll', - method: 'get', - params: query + url: '/emis/emisCustomerUser/bindMoneyUser', + method: 'put', + data: data }) } \ No newline at end of file diff --git a/src/api/emis/emisMoneyUser.js b/src/api/emis/emisMoneyUser.js new file mode 100644 index 00000000..633fe0c9 --- /dev/null +++ b/src/api/emis/emisMoneyUser.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +//查询 +export function listMoneyUser(query){ + return request({ + url: '/emis/emisMoneyUser/list', + method: 'get', + params: query + }) +} + +//根据id查询 +export function getMoneyUser(id){ + return request({ + url: `/emis/emisMoneyUser/${id}`, + method: 'get' + }) +} +//新增 +export function addMoneyUser(data){ +return request({ + url: '/emis/emisMoneyUser', + method: 'post', + data: data + }) +} +//修改 +export function editMoneyUser(data){ + return request({ + url: '/emis/emisMoneyUser', + method: 'put', + data: data + }) +} +// 删除 +export function delMoneyUser(ids) { + return request({ + url: `/emis/emisMoneyUser/${ids} `, + method: 'delete' + }) +} + +//现金客户用户统计信息 +export function moneyUserShipmentStat(query) { + return request({ + url: '/emis/emisCustomerUser/moneyShipmentStat', + method: 'get', + params: query + }) +} diff --git a/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue b/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue index 99fb8661..7002ce09 100644 --- a/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue +++ b/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue @@ -1,12 +1,12 @@ - + + diff --git a/src/views/emis/emisCustomerUser/moneyUserFormNew.vue b/src/views/emis/emisCustomerUser/moneyUserFormNew.vue new file mode 100644 index 00000000..9786f958 --- /dev/null +++ b/src/views/emis/emisCustomerUser/moneyUserFormNew.vue @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + 确 定 + 取 消 + + + + + + + + + + + + diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue index 7e86c029..f76b24ed 100644 --- a/src/views/emis/emisCustomerUser/moneyUserList.vue +++ b/src/views/emis/emisCustomerUser/moneyUserList.vue @@ -130,6 +130,15 @@ v-hasPermi="['emis:emisCustomerUser:export']" >导出 --> + + 绑定所属现金客户 + @@ -184,6 +193,7 @@ + 启用 @@ -217,6 +227,10 @@ + + + + @@ -227,7 +241,7 @@ import AirTable from '@/components/AirTable/demo.vue'; import { listMoneyUser, delEmisCustomerUser,resetCustomerUserPwd } from "@/api/emis/emisCustomerUser"; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm'; - +import moneyUserBindingForm from '@/views/emis/emisCustomerUser/moneyUserBindingForm.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue'; @@ -246,7 +260,7 @@ export default { name: "MoneyUserList", components: {AirTable, EmpNamePicker1,EmpNamePicker2,elDateSimplePicker,moneyUserForm ,CountryPicker, EmisSiteSimplePicker,ProvincePicker,CityPicker, - EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,XdTable3 + EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,XdTable3,moneyUserBindingForm }, dicts: [ ], @@ -271,8 +285,9 @@ export default { currentId:null, openForm: false, + openBindForm: false, titleForm: "", - + titleBindForm:"", // 弹出展示层 id:null, titleView:"", @@ -290,6 +305,8 @@ export default { phone: null, company: null, }, + // 选中寄件人 + selection:null, }; }, created() { @@ -327,6 +344,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { + this.selection = selection; this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length @@ -445,6 +463,19 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + /** 绑定所属现金客户按钮操作 */ + handleBindMoneyUser(row) { + this.id=row.id; + this.titleBindForm="绑定所属现金客户"; + this.openBindForm = true; + }, + handleBindFormChanged(){ + this.openBindForm = false; + this.getList(); + }, + cancelBindForm(){ + this.openBindForm = false; + }, } }; diff --git a/src/views/emis/emisCustomerUser/moneyUserListNew.vue b/src/views/emis/emisCustomerUser/moneyUserListNew.vue new file mode 100644 index 00000000..6494b06a --- /dev/null +++ b/src/views/emis/emisCustomerUser/moneyUserListNew.vue @@ -0,0 +1,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新增客户 + + + 修改 + + + 删除 + + + + + + + + + + + + + + + 启用 + 停用 + + + + + + + + + + + + + + + + + + + + + +