diff --git a/src/api/modular/system/appManage.js b/src/api/modular/system/appManage.js index 71db56f..f2f57b0 100644 --- a/src/api/modular/system/appManage.js +++ b/src/api/modular/system/appManage.js @@ -132,24 +132,24 @@ export function ServiceProjectSavAndEnable (parameter) { export function ServiceProjectSetEnable (parameter) { return axios({ url: '/ServiceProject/SetEnable', - method: 'get', - params: parameter + method: 'post', + data: parameter }) } export function ServiceProjectSetUnEnable (parameter) { return axios({ url: '/ServiceProject/SetUnEnable', - method: 'get', - params: parameter + method: 'post', + data: parameter }) } export function ServiceProjectDelete (parameter) { return axios({ url: '/ServiceProject/Delete', - method: 'get', - params: parameter + method: 'post', + data: parameter }) } @@ -168,3 +168,68 @@ export function ServiceProjectQueryList (parameter) { params: parameter }) } + +// 服务状态 +export function StatusSkuBaseGetPage (parameter) { + return axios({ + url: '/StatusSkuBase/GetPage', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseSave (parameter) { + return axios({ + url: '/StatusSkuBase/Save', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseSavAndEnable (parameter) { + return axios({ + url: '/StatusSkuBase/SaveAndEnable', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseSetEnable (parameter) { + return axios({ + url: '/StatusSkuBase/SetEnable', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseSetUnEnable (parameter) { + return axios({ + url: '/StatusSkuBase/SetUnEnable', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseDelete (parameter) { + return axios({ + url: '/StatusSkuBase/Delete', + method: 'post', + data: parameter + }) +} + +export function StatusSkuBaseGetInfo (parameter) { + return axios({ + url: '/StatusSkuBase/GetInfo', + method: 'get', + params: parameter + }) +} + +export function StatusSkuBaseQueryList (parameter) { + return axios({ + url: '/StatusSkuBase/QueryList', + method: 'get', + params: parameter + }) +} diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 6539fdf..1038e6e 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -732,7 +732,8 @@ export default { shipper: $data.bookingDetails.shipper, consignee: $data.bookingDetails.consignee, notifyparty: $data.bookingDetails.notifyparty, - goodsStatus: $data.bookingDetails.goodsStatus + goodsStatus: $data.bookingDetails.goodsStatus, + sale: $data.bookingDetails.sale } this.bookingDetails = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } } else { @@ -1130,7 +1131,8 @@ export default { shippingMethod: res.data.shippingMethod, shipper: res.data.shipper, consignee: res.data.consignee, - notifyparty: res.data.notifyparty + notifyparty: res.data.notifyparty, + sale: res.data.bookingDetails.sale } newData = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } } diff --git a/src/views/main/EDI/addForm.vue b/src/views/main/EDI/addForm.vue index 0c6fb63..82659e9 100644 --- a/src/views/main/EDI/addForm.vue +++ b/src/views/main/EDI/addForm.vue @@ -34,7 +34,7 @@ + + + + + + 发送方 diff --git a/src/views/main/EDI/editForm.vue b/src/views/main/EDI/editForm.vue index 12984b7..3e62b20 100644 --- a/src/views/main/EDI/editForm.vue +++ b/src/views/main/EDI/editForm.vue @@ -34,7 +34,7 @@ + + + + + + 发送方 @@ -214,6 +220,7 @@ export default { sm: { span: 15 } }, typeData: [], + ftpModeActive: false, visible: false, confirmLoading: false, form: this.$form.createForm(this), @@ -253,6 +260,7 @@ export default { setTimeout(() => { this.form.setFieldsValue({ edicode: record.edicode, + ftpModeActive: true, serverip: record.serverip, foldername: record.foldername, username: record.username, @@ -278,6 +286,7 @@ export default { aliassendcode: record.aliassendcode, sendshippercode: record.sendshippercode }) + this.ftpModeActive = record.ftpModeActive console.log(this.form.getFieldsValue()) }, 100) }, @@ -307,7 +316,7 @@ export default { } }) // console.log(this.form, values.id) - let data = { ...values, id: this.data.id } + const data = { ...values, id: this.data.id } DjyEdiSettingSave(data) .then(res => { if (res.success) { diff --git a/src/views/system/ServiceItems/editForm.vue b/src/views/system/ServiceItems/editForm.vue index 17c8496..abb1461 100644 --- a/src/views/system/ServiceItems/editForm.vue +++ b/src/views/system/ServiceItems/editForm.vue @@ -27,13 +27,13 @@ 关闭 - + 删除 - + 取消启用 - + 启用 @@ -46,7 +46,7 @@ diff --git a/src/views/system/ServiceStatus/editForm.vue b/src/views/system/ServiceStatus/editForm.vue new file mode 100644 index 0000000..abb1461 --- /dev/null +++ b/src/views/system/ServiceStatus/editForm.vue @@ -0,0 +1,166 @@ + + diff --git a/src/views/system/ServiceStatus/index.vue b/src/views/system/ServiceStatus/index.vue new file mode 100644 index 0000000..18da35d --- /dev/null +++ b/src/views/system/ServiceStatus/index.vue @@ -0,0 +1,294 @@ + + +