diff --git a/src/api/modular/main/tmsaip/tmsCarBindingAudit.js b/src/api/modular/main/tmsaip/tmsCarBindingAudit.js new file mode 100644 index 0000000..085177e --- /dev/null +++ b/src/api/modular/main/tmsaip/tmsCarBindingAudit.js @@ -0,0 +1,26 @@ +import { axios } from '@/utils/request' +// 车辆绑定审核：获取车辆列表 +export function tmsCarAuditingList(parameter) { + return axios({ + url: '/tmsaip/tmsCar/auditingList', + method: 'get', + params: parameter + }) +} +// 车辆绑定审核：通过 +export function tmsCarApproved(parameter) { + return axios({ + url: `/tmsaip/tmsCar/approved/${parameter.id}`, + method: 'post' + }) +} +// 车辆绑定审核：驳回 +export function tmsCarReject(parameter) { + return axios({ + url: `/tmsaip/tmsCar/reject/${parameter.id}`, + method: 'post' + // data: { + // rejectReason: parameter.rejectReason + // } + }) +} diff --git a/src/api/modular/main/tmsaip/tmsCobLoadingPlace.js b/src/api/modular/main/tmsaip/tmsCobLoadingPlace.js new file mode 100644 index 0000000..2983858 --- /dev/null +++ b/src/api/modular/main/tmsaip/tmsCobLoadingPlace.js @@ -0,0 +1,32 @@ +import { axios } from '@/utils/request' +// 获取工厂地址模板列表 +export function tmsCobLoadingPlacelist(parameter) { + return axios({ + url: '/tmsaip/tmsCobLoadingPlace/list', + method: 'get', + params: parameter + }) +} +// 新增 +export function tmsCobLoadingPlacecreate(parameter) { + return axios({ + url: '/tmsaip/tmsCobLoadingPlace/create', + method: 'post', + data: parameter + }) +} +// 根据id更新信息 +export function tmsCobLoadingPlaceupdate(parameter) { + return axios({ + url: `/tmsaip/tmsCobLoadingPlace/update/${parameter.id}`, + method: 'post', + data: parameter + }) +} +// 根据id删除信息 +export function tmsCobLoadingPlacedelete(parameter) { + return axios({ + url: `/tmsaip/tmsCobLoadingPlace/delete/${parameter}`, + method: 'post' + }) +} diff --git a/src/views/main/tmsaip/TmsForwarderOrder/details.vue b/src/views/main/tmsaip/TmsForwarderOrder/details.vue index a538107..acf96e2 100644 --- a/src/views/main/tmsaip/TmsForwarderOrder/details.vue +++ b/src/views/main/tmsaip/TmsForwarderOrder/details.vue @@ -6,9 +6,9 @@
保存
- +
复制
终止订单 @@ -280,7 +280,22 @@ :wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }" has-feedback > - + + @@ -331,6 +346,14 @@ + + +
@@ -594,6 +617,7 @@ + @@ -604,6 +628,7 @@ import { mapGetters, mapActions } from 'vuex' import { commondbYardlist } from '@/api/modular/main/CommondbYardlist' import { commondbCarrierlist } from '@/api/modular/main/CommondbPortlist' import { GetCtn } from '@/api/modular/main/BookingLedger' +import addForm from '../tmsCobLoadingPlace/addForm.vue' import { TmsForwarderOrderCreate, TmsForwarderOrderUpdate, @@ -619,9 +644,17 @@ import { } from '@/api/modular/main/tmsaip/TmsForwarderOrder' import { DjyCustomerQuerytDjyCustomerInfo } from '@/api/modular/main/SendCar' import { tmsTenantRelationList } from '@/api/modular/main/tmsaip/tmsTenantRelationTF' +import { tmsCobLoadingPlacelist } from '@/api/modular/main/tmsaip/tmsCobLoadingPlace' +import AAutoComplete from 'ant-design-vue/es/auto-complete' export default { + components: { + addForm, + AAutoComplete + }, data() { return { + dataSource: [''], + dataSourceA: [], AddsData: { driverId: '', num: 1 @@ -798,6 +831,21 @@ export default { }, methods: { ...mapActions(['setTmsAddData']), + TemplateFilterOption(input, option) { + return option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0 + }, + TemplateSelect(value, option, data) { + this.dataSourceA.forEach(item => { + if (item.templateName == value || item.name == value) { + console.log(item) + data.name = item.name + data.contact = item.contact + data.address = item.address + data.tel = item.tel + } + }) + console.log(value, option) + }, CopyFromToReturn() { // fromYardId fromContract fromTel returnYardId returnContract returnTel let values = { ...this.form.getFieldsValue() } @@ -996,13 +1044,6 @@ export default { ...res.data }) }, 100) - // this.$router.replace({ - // name: 'TmsTruckerOrderDetails', - // query: { - // type: 'Details', - // id: res.data.id - // } - // }) } else { this.$message.error(res.message) } @@ -1025,6 +1066,13 @@ export default { FnFactoryDelete(index) { this.tmsForwarderOrderLoadingPlaceEntityList.splice(index, 1) }, + FnSaveTemplate(data) { + this.$refs.addForm.add(data) + }, + handleOk() { + this.FnGetTemplateData() + // this.FnGetData() + }, FnCopy() { this.$router.push({ name: 'TmsForwarderOrderDetails', @@ -1064,6 +1112,19 @@ export default { }) }, + FnGetTemplateData() { + let Arr = [] + tmsCobLoadingPlacelist({ + pageSize: 999 + }).then(res => { + res.data.list.forEach(item => { + Arr.push(item.name) + Arr.push(item.templateName) + }) + this.dataSource = Arr + this.dataSourceA = res.data.list + }) + }, init() { if (this.initTime) { this.ContactsData = [] @@ -1092,8 +1153,11 @@ export default { } else { this.tmsForwarderOrderLoadingPlaceEntityList = res.data.orderLoadingPlaceList } - + res.data.orderBodyList.forEach((item, index) => { + item.WebKey = index + 1 + }) this.ContactsData = res.data.orderBodyList + console.log(this.ContactsData) }, 100) } else { } @@ -1129,6 +1193,7 @@ export default { commondbYardlist().then(res => { this.YardCodeData = res.data }) + this.FnGetTemplateData() // listCarGroup().then(res => { // this.carGroupIdData = res.data // }) @@ -1176,6 +1241,7 @@ export default { console.log(this.$refs.xTable.selection) this.$refs.xTable.selection.forEach(item => { this.ContactsData.forEach((item2, index2) => { + console.log(item.WebKey, item2.WebKey) if (item.WebKey == item2.WebKey) { this.ContactsData.splice(index2, 1) } @@ -1186,6 +1252,10 @@ export default { if (!this.ContactsData) { this.ContactsData = [] } + console.log( + this.ContactsData, + this.ContactsData.length ? this.ContactsData[this.ContactsData.length - 1].WebKey + 1 : 1 + ) this.ContactsData.push({ WebKey: this.ContactsData.length ? this.ContactsData[this.ContactsData.length - 1].WebKey + 1 : 1, dispatchStatus: '0' diff --git a/src/views/main/tmsaip/TmsForwarderOrder/index.vue b/src/views/main/tmsaip/TmsForwarderOrder/index.vue index 51d341a..628562b 100644 --- a/src/views/main/tmsaip/TmsForwarderOrder/index.vue +++ b/src/views/main/tmsaip/TmsForwarderOrder/index.vue @@ -379,7 +379,8 @@ export default { { code: '1', name: '已发送' }, { code: '2', name: '已派车' }, { code: '3', name: '订单完成' }, - { code: '9', name: '订单取消' } + { code: '9', name: '订单取消' }, + { code: '21', name: '部分派车' } ], carGroupIdData: [], listAllData: [], diff --git a/src/views/main/tmsaip/tmsCarBindingAudit/addForm.vue b/src/views/main/tmsaip/tmsCarBindingAudit/addForm.vue new file mode 100644 index 0000000..0d75d76 --- /dev/null +++ b/src/views/main/tmsaip/tmsCarBindingAudit/addForm.vue @@ -0,0 +1,162 @@ + + + diff --git a/src/views/main/tmsaip/tmsCarBindingAudit/editForm.vue b/src/views/main/tmsaip/tmsCarBindingAudit/editForm.vue new file mode 100644 index 0000000..44a4c41 --- /dev/null +++ b/src/views/main/tmsaip/tmsCarBindingAudit/editForm.vue @@ -0,0 +1,181 @@ + + + diff --git a/src/views/main/tmsaip/tmsCarBindingAudit/index.vue b/src/views/main/tmsaip/tmsCarBindingAudit/index.vue new file mode 100644 index 0000000..fb9f9c5 --- /dev/null +++ b/src/views/main/tmsaip/tmsCarBindingAudit/index.vue @@ -0,0 +1,401 @@ + + + diff --git a/src/views/main/tmsaip/tmsCobLoadingPlace/addForm.vue b/src/views/main/tmsaip/tmsCobLoadingPlace/addForm.vue new file mode 100644 index 0000000..77b57ff --- /dev/null +++ b/src/views/main/tmsaip/tmsCobLoadingPlace/addForm.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/main/tmsaip/tmsCobLoadingPlace/editForm.vue b/src/views/main/tmsaip/tmsCobLoadingPlace/editForm.vue new file mode 100644 index 0000000..9e9c3da --- /dev/null +++ b/src/views/main/tmsaip/tmsCobLoadingPlace/editForm.vue @@ -0,0 +1,129 @@ + + + diff --git a/src/views/main/tmsaip/tmsCobLoadingPlace/index.vue b/src/views/main/tmsaip/tmsCobLoadingPlace/index.vue new file mode 100644 index 0000000..4ebebda --- /dev/null +++ b/src/views/main/tmsaip/tmsCobLoadingPlace/index.vue @@ -0,0 +1,372 @@ + + + diff --git a/src/views/main/tmsaip/tmsTenantRelationTF/addForm.vue b/src/views/main/tmsaip/tmsTenantRelationTF/addForm.vue index 7c00548..fc0dc11 100644 --- a/src/views/main/tmsaip/tmsTenantRelationTF/addForm.vue +++ b/src/views/main/tmsaip/tmsTenantRelationTF/addForm.vue @@ -12,11 +12,12 @@ - + + @@ -85,6 +86,13 @@ export default { // values[key] = JSON.stringify(values[key]) // } // } + + console.log(values) + // this.relationIdData.forEach(item => { + // if (item.id == values.relationId) { + // values.relationName = item.name + // } + // }) tmsTenantRelationCreate(values) .then(res => { if (res.success) { diff --git a/src/views/main/tmsaip/tmsTruckerOrder/details.vue b/src/views/main/tmsaip/tmsTruckerOrder/details.vue index 3ac377a..10f20e9 100644 --- a/src/views/main/tmsaip/tmsTruckerOrder/details.vue +++ b/src/views/main/tmsaip/tmsTruckerOrder/details.vue @@ -1113,16 +1113,16 @@ export default { } return RData }, - removeCheckboxRow() { - console.log(this.$refs.xTable.selection) - this.$refs.xTable.selection.forEach(item => { - this.ContactsData.forEach((item2, index2) => { - if (item.WebKey == item2.WebKey) { - this.ContactsData.splice(index2, 1) - } - }) - }) - }, + // removeCheckboxRow() { + // console.log(this.$refs.xTable.selection) + // this.$refs.xTable.selection.forEach(item => { + // this.ContactsData.forEach((item2, index2) => { + // if (item.WebKey == item2.WebKey) { + // this.ContactsData.splice(index2, 1) + // } + // }) + // }) + // }, insertEvent() { if (!this.ContactsData) { this.ContactsData = [] diff --git a/src/views/main/tmsaip/tmsTruckerOrder/index.vue b/src/views/main/tmsaip/tmsTruckerOrder/index.vue index bc3f500..8dee78d 100644 --- a/src/views/main/tmsaip/tmsTruckerOrder/index.vue +++ b/src/views/main/tmsaip/tmsTruckerOrder/index.vue @@ -560,62 +560,64 @@ export default { if (nData == 1) { Object.assign(this.$data.columns, this.$options.data().columns) } else { - this.columns = [ - { - title: '派车状态', - align: 'center', - width: '80', - dataIndex: 'orderStatus' - }, - { - title: '派单号', - align: 'center', - width: '80', - dataIndex: 'billNo' - }, - { - title: '提单号', - align: 'center', - width: '80', - dataIndex: 'mblNo' - }, - { - title: '客户名称', - align: 'center', - width: '80', - dataIndex: 'forwarderName' - }, - { - title: '派单日期', - align: 'center', - width: '80', - dataIndex: 'dispatchTime' - }, - { - title: '提箱场站', - align: 'center', - width: '80', - dataIndex: 'fromYardId' - }, - { - title: '回箱场站', - align: 'center', - width: '80', - dataIndex: 'returnYardId' - }, - { - title: '箱型箱量', - align: 'center', - width: '80', - dataIndex: 'containers' - }, - { - title: '工厂地址', - align: 'center', - width: '80', - dataIndex: 'carrierId' - } - ] + setTimeout(() => { + this.columns = [ + { + title: '派车状态', + align: 'center', + width: '80', + dataIndex: 'orderStatus' + }, + { + title: '派单号', + align: 'center', + width: '80', + dataIndex: 'billNo' + }, + { + title: '提单号', + align: 'center', + width: '80', + dataIndex: 'mblNo' + }, + { + title: '客户名称', + align: 'center', + width: '80', + dataIndex: 'forwarderName' + }, + { + title: '派单日期', + align: 'center', + width: '80', + dataIndex: 'dispatchTime' + }, + { + title: '提箱场站', + align: 'center', + width: '80', + dataIndex: 'fromYardId' + }, + { + title: '回箱场站', + align: 'center', + width: '80', + dataIndex: 'returnYardId' + }, + { + title: '箱型箱量', + align: 'center', + width: '80', + dataIndex: 'containers' + }, + { + title: '工厂', + align: 'center', + width: '80', + dataIndex: 'loadingPlaceName' + } + ] + }, 100) } } },