From d7e7e80121be970b323288a3f52a9cc51d51ab54 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期三, 03 十二月 2025 11:03:10 +0800
Subject: [PATCH] 提交
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 1264 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 850 insertions(+), 414 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index 1d8e947..24c338f 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -21,21 +21,21 @@
@on-load="onLoad"
>
<template #menu-left>
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- icon="Edit"-->
-<!-- :disabled="pageF.single"-->
-<!-- v-hasPermi="['tms:tmsDispatchOrder:edit']"-->
-<!-- @click="handleUpdate">淇敼-->
-<!-- </el-button>-->
-<!-- <el-button-->
-<!-- type="danger"-->
-<!-- icon="Delete"-->
-<!-- :disabled="pageF.multiple"-->
-<!-- @click="handleDelete"-->
-<!-- v-hasPermi="['tms:tmsDispatchOrder:remove']"-->
-<!-- >鍒犻櫎-->
-<!-- </el-button>-->
+ <!-- <el-button-->
+ <!-- type="success"-->
+ <!-- icon="Edit"-->
+ <!-- :disabled="pageF.single"-->
+ <!-- v-hasPermi="['tms:tmsDispatchOrder:edit']"-->
+ <!-- @click="handleUpdate">淇敼-->
+ <!-- </el-button>-->
+ <!-- <el-button-->
+ <!-- type="danger"-->
+ <!-- icon="Delete"-->
+ <!-- :disabled="pageF.multiple"-->
+ <!-- @click="handleDelete"-->
+ <!-- v-hasPermi="['tms:tmsDispatchOrder:remove']"-->
+ <!-- >鍒犻櫎-->
+ <!-- </el-button>-->
<el-button
type="warning"
plain
@@ -71,28 +71,36 @@
</template>
<template #menu-before="{row}">
- <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
+ <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
+ v-hasPermi="['tms:tmsGoodsDetail:add']"
:underline="false" icon="el-icon-document-add">杩愯緭璐у搧鐧昏
</el-link>
- <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
+ <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:update']"
:underline="false" icon="el-icon-set-up">瀹為檯杩愯緭璁板綍
</el-link>
<el-link size="small" type="primary" v-if="row.status == 0" @click="handleConfirm(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:confirmOrder']"
:underline="false" icon="el-icon-pointer">纭畾
</el-link>
<el-link size="small" type="primary" @click="handleCopy(row)" class="link-btn" :underline="false"
+ v-hasPermi="['tms:tmsDispatchOrder:copyOrder']"
icon="el-icon-connection">澶嶅埗
</el-link>
<el-link size="small" type="primary" v-if="[1,2].includes(row.status)" @click="handleUploadItinerary(row)"
+ v-hasPermi="['tms:tmsTrip:add']"
class="link-btn" :underline="false" icon="el-icon-upload">涓婁紶琛岀▼
</el-link>
<el-link size="small" type="primary" v-if="![0,1].includes(row.status)" @click="handleLogItinerary(row)"
+ v-hasPermi="['tms:tmsTrip:list']"
class="link-btn" :underline="false" icon="el-icon-view">鏌ョ湅琛岀▼
</el-link>
<el-link size="small" type="primary" v-if="[2].includes(row.status)" @click="handleOk(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:okOrder']"
:underline="false" icon="el-icon-circle-check">瀹屾垚琛岀▼
</el-link>
- <el-link size="small" type="primary" v-if="[2,3].includes(row.status)" @click="handleAddFinance(row)" class="link-btn"
+ <el-link size="small" type="primary" v-if="[2,3].includes(row.status)" @click="handleAddFinance(row)"
+ class="link-btn" v-hasPermi="['tms:tmsFinanceDetail:add']"
:underline="false" icon="el-icon-edit-pen">璐圭敤鐧昏
</el-link>
</template>
@@ -101,20 +109,46 @@
icon="el-icon-tickets">鏃ュ織
</el-link>
</template>
+
+ <template #shipperId-form>
+ <div style="display:flex; align-items: center;justify-content: space-between">
+ <avue-input-table :props="consignorProps"
+ :children="consignorOption"
+ :on-load="onShipperLoad" suffixIcon="search"
+ v-model="form.shipperId" style="width: 80%"
+ @change="changeShipper"
+ placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
+ <el-button icon="plus" @click="handleAddShipper"></el-button>
+ </div>
+ </template>
+ <template #receiverId-form>
+ <div style="display:flex; align-items: center;justify-content: space-between">
+ <avue-input-table :props="consignorProps"
+ :children="consignorOption"
+ :on-load="onConsignorLoad" suffixIcon="search"
+ v-model="form.receiverId"
+ @change="changeReceiver" style="width: 80%"
+ placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
+ <el-button icon="plus" @click="handleAddReceiver"></el-button>
+ </div>
+ </template>
+
</avue-crud>
<el-dialog :title="pageF.title" v-model="pageF.open" class="avue-dialog avue-dialog--top" width="80%">
<h2 v-if="optionType == 'addFinance'">鎶ヤ环璐圭敤</h2>
<avue-crud v-if="optionType == 'addFinance'"
- :option="itemsTableOption"
- :data="itemsTableData"
+ :option="itemsTableOption"
+ :data="itemsTableData"
@selection-change="selectionChange2"
>
<template #count="{row}">
- <el-input-number v-model="row.count" @change="countChange(row)" placeholder="璇疯緭鍏ヨ璐规暟閲�" min="0"></el-input-number>
+ <el-input-number v-model="row.count" @change="countChange(row)" placeholder="璇疯緭鍏ヨ璐规暟閲�"
+ min="0"></el-input-number>
</template>
</avue-crud>
<h2 v-if="optionType == 'addFinance'">瀹炴姤瀹為攢璐圭敤</h2>
- <avue-form v-if="optionType == 'addItinerary' || optionType == 'addFinance'" v-model="boxForm" ref="boxFormRef" :option="boxFormOption">
+ <avue-form v-if="optionType == 'addItinerary' || optionType == 'addFinance'" v-model="boxForm" ref="boxFormRef"
+ :option="boxFormOption">
</avue-form>
<avue-crud
@@ -124,11 +158,13 @@
</avue-crud>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" v-if="optionType == 'addItinerary' || optionType == 'addFinance'" :loading="pageF.isUploading" @click="submitForm">
+ <el-button type="primary" v-if="optionType == 'addItinerary' || optionType == 'addFinance'"
+ :loading="pageF.isUploading" @click="submitForm">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
- <el-button type="primary" v-if="optionType == 'generate' " :loading="pageF.isUploading" @click="submitGenerate">
+ <el-button type="primary" v-if="optionType == 'generate' " :loading="pageF.isUploading"
+ @click="submitGenerate">
{{ pageF.isUploading ? '鐢熸垚涓�' : '鐢熸垚璐圭敤' }}
</el-button>
<el-button @click="cancelBox">鍙� 娑�</el-button>
@@ -143,23 +179,23 @@
border
>
<el-descriptions-item label="璋冨害鍗曞彿">{{ form.dispatchNo }}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛" >{{ form.customerName }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯杩愯緭宸ュ叿绫诲瀷" >{{ form.$actualVehicleType}}</el-descriptions-item>
- <el-descriptions-item label="杩愯緭宸ュ叿鍙风爜" >{{ form.licensePlate }}</el-descriptions-item>
- <el-descriptions-item label="鎵樻灦鍙�" >{{ form.shelfCode }}</el-descriptions-item>
- <el-descriptions-item label="涓婚┚椹跺憳" >{{ form.mainDriverName }}</el-descriptions-item>
- <el-descriptions-item label="鍓┚椹跺憳" >{{ form.assistantDriverName }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛">{{ form.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯杩愯緭宸ュ叿绫诲瀷">{{ form.$actualVehicleType }}</el-descriptions-item>
+ <el-descriptions-item label="杩愯緭宸ュ叿鍙风爜">{{ form.licensePlate }}</el-descriptions-item>
+ <el-descriptions-item label="鎵樻灦鍙�">{{ form.shelfCode }}</el-descriptions-item>
+ <el-descriptions-item label="涓婚┚椹跺憳">{{ form.mainDriverName }}</el-descriptions-item>
+ <el-descriptions-item label="鍓┚椹跺憳">{{ form.assistantDriverName }}</el-descriptions-item>
</el-descriptions>
</div>
- <div v-if="optionType == 'connectHang'">
+ <div v-if="optionType == 'connectHang'">
<el-descriptions style="margin-bottom: 20px"
- :column="2"
- border
+ :column="2"
+ border
>
<el-descriptions-item label="璋冨害鍗曞彿">{{ form.dispatchNo }}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛" >{{ form.customerName }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯杩愯緭宸ュ叿绫诲瀷" >{{ form.$actualVehicleType}}</el-descriptions-item>
- <el-descriptions-item label="鎵樻灦鍙�" >{{ form.shelfCode }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛">{{ form.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯杩愯緭宸ュ叿绫诲瀷">{{ form.$actualVehicleType }}</el-descriptions-item>
+ <el-descriptions-item label="鎵樻灦鍙�">{{ form.shelfCode }}</el-descriptions-item>
</el-descriptions>
<avue-form v-model="form" ref="boxFormRef" :option="boxFormOption">
@@ -167,7 +203,7 @@
</div>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" :loading="pageF.isUploading" @click="submitForm2">
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitForm2">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
<el-button @click="cancelBox2">鍙� 娑�</el-button>
@@ -186,32 +222,31 @@
:data="goodsTableData" ref="goodsCrudRef"
>
</avue-crud>
-<!-- <template #footer>-->
-<!-- <div class="dialog-footer">-->
-<!-- <el-button type="primary" :loading="pageF.isUploading" @click="submitForm2">-->
-<!-- {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}-->
-<!-- </el-button>-->
-<!-- <el-button @click="open2 = false">鍙� 娑�</el-button>-->
-<!-- </div>-->
-<!-- </template>-->
+ <!-- <template #footer>-->
+ <!-- <div class="dialog-footer">-->
+ <!-- <el-button type="primary" :loading="pageF.isUploading" @click="submitForm2">-->
+ <!-- {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}-->
+ <!-- </el-button>-->
+ <!-- <el-button @click="open2 = false">鍙� 娑�</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
</el-dialog>
<el-dialog title="瀹為檯杩愯緭淇℃伅" v-model="open3" class="avue-dialog avue-dialog--top" width="80%">
- <avue-form v-model="actualForm"
- ref="actualFormRef"
- :option="actualFormOption">
+ <avue-form v-model="actualForm"
+ ref="actualFormRef"
+ :option="actualFormOption">
</avue-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" :loading="pageF.isUploading" @click="submitForm3">
- {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
- </el-button>
- <el-button @click="open3 = false">鍙� 娑�</el-button>
- </div>
- </template>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitForm3">
+ {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
+ </el-button>
+ <el-button @click="open3 = false">鍙� 娑�</el-button>
+ </div>
+ </template>
</el-dialog>
-
</basicContainer>
@@ -229,7 +264,7 @@
confirmOrder, copyOrder, okOrder, initGenerate, generateTmsDispatchOrder, dropHook, connectHang
} from "@/api/tms/tmsDispatchOrder";
import useCurrentInstance from "@/utils/useCurrentInstance";
-import {computed, onMounted, reactive, ref, toRefs, watch} from "vue";
+import {computed, onMounted, reactive, ref, toRefs, watch, getCurrentInstance} from "vue";
import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
import {usePagePlus} from "@/hooks/usePagePlus";
import {hasPermission} from "@/utils/permissionUtils";
@@ -241,7 +276,7 @@
import {getTmsVehicle, listTmsVehicle} from "@/api/tms/tmsVehicle";
import {getTmsContainer, listTmsContainer} from "@/api/tms/tmsContainer";
import {getTmsShelf, listTmsShelf} from "@/api/tms/tmsShelf";
-import {getTmsConsignor, listTmsConsignor} from "@/api/tms/tmsConsignor";
+import {addTmsConsignor, getTmsConsignor, listTmsConsignor} from "@/api/tms/tmsConsignor";
import {ElMessage, ElMessageBox} from "element-plus";
import {addTmsTrip, listTmsTrip} from "@/api/tms/tmsTrip";
import {addTmsFinanceDetail, listTmsFinanceDetail, updateTmsFinanceDetail} from "@/api/tms/tmsFinanceDetail";
@@ -249,6 +284,12 @@
import {addTmsGoodsDetail, delTmsGoodsDetail, listTmsGoodsDetail, updateTmsGoodsDetail} from "@/api/tms/tmsGoodsDetail";
import {getTransportRouteVi, listTransportRouteVi} from "@/api/tms/tmsTransportRouteVi";
import {listTmsQuoteItem} from "@/api/tms/tmsQuotePlanItem";
+import {$DialogForm} from '@smallwei/avue'
+import {getTmsCustomerInfo, listTmsCustomerInfo} from "@/api/tms/tmsCustomerInfo";
+import {getAddressCode} from "@/api/tms/tmsRegion";
+import {mapRegeo} from "@/api/common";
+
+const {appContext} = getCurrentInstance();
const {proxy} = useCurrentInstance();
const crudRef = ref();
@@ -263,7 +304,7 @@
} else if (key == 'delBtn') {
return hasPermission(["tms:tmsDispatchOrder:remove"]) && row?.status == 0
} else if (key == 'editBtn') {
- return hasPermission(["tms:tmsDispatchOrder:edit"]) && [0,1].includes(row?.status)
+ return hasPermission(["tms:tmsDispatchOrder:edit"]) && [0, 1].includes(row?.status)
} else if (key == 'viewBtn') {
return hasPermission(["tms:tmsDispatchOrder:query"])
} else {
@@ -286,17 +327,18 @@
boxTableOption: <any>{},
title: '',
open: false,
- open2:false,
+ open2: false,
goodsTableData: <any>[],
selectionList2: <any>[],
- goodsForm:<any>{},
+ goodsForm: <any>{},
open3: false,
- actualForm:<any>{},
+ actualForm: <any>{},
})
-const {queryParams, form, page, selectionList,open3,
+const {
+ queryParams, form, page, selectionList, open3,
boxTableData, optionType,
- boxFormOption,boxForm,boxTableOption,title,open,open2,
- goodsTableData,goodsForm,actualForm,selectionList2
+ boxFormOption, boxForm, boxTableOption, title, open, open2,
+ goodsTableData, goodsForm, actualForm, selectionList2
} = toRefs(data);
const option = ref({
pageKey: 'TmsDispatchOrder',
@@ -417,7 +459,7 @@
display: true, disabled: true
},
requiredVehicleTypes: {
- label: '涓嬪崟杞﹀瀷',disabled: true,
+ label: '涓嬪崟杞﹀瀷', disabled: true,
display: true, type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',
rules: [
{
@@ -437,17 +479,17 @@
message: "璁㈠崟绫诲瀷涓嶈兘涓虹┖", trigger: "change"
}
],
- change:({value}: any)=>{
- option.value.group.forEach((item:any) =>{
- if (item.prop == 'pcxx'){
- item.column.shipperId.rules.forEach((cItem:any)=>{
- cItem.required = !(value == 1);
- }) ;
- item.column.receiverId.rules.forEach((cItem:any)=>{
- cItem.required = !(value == 1);
- }) ;
- }
- })
+ change: ({value}: any) => {
+ option.value.group.forEach((item: any) => {
+ if (item.prop == 'pcxx') {
+ item.column.shipperId.rules.forEach((cItem: any) => {
+ cItem.required = !(value == 1);
+ });
+ item.column.receiverId.rules.forEach((cItem: any) => {
+ cItem.required = !(value == 1);
+ });
+ }
+ })
}
},
// signType: {
@@ -649,7 +691,7 @@
],
},
latestArrival: {
- label: '瑕佹眰鏈�鏅氬埌杈炬椂闂�',labelWidth: 150,
+ label: '瑕佹眰鏈�鏅氬埌杈炬椂闂�', labelWidth: 150,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -663,15 +705,14 @@
},
-
}
},
{
label: '娲捐溅淇℃伅',
prop: 'pcxx',
column: {
- operationMode:{
- label: '鏄惁鏄嚜钀ヨ溅闃�',value:0,
+ operationMode: {
+ label: '鏄惁鏄嚜钀ヨ溅闃�', value: 0,
type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/sys_number_is',
rules: [
{
@@ -679,13 +720,13 @@
message: "鏄惁鏄嚜钀ヨ溅闃熶笉鑳戒负绌�", trigger: "change"
}
],
- change: ({value}:any) => {
+ change: ({value}: any) => {
console.log(value)
- option.value.group.forEach((item:any) =>{
- if (item.prop == 'pcxx'){
- item.column.vehicleProviderId.rules.forEach((cItem:any)=>{
- cItem.required = value != 1;
- }) ;
+ option.value.group.forEach((item: any) => {
+ if (item.prop == 'pcxx') {
+ item.column.vehicleProviderId.rules.forEach((cItem: any) => {
+ cItem.required = value == 1;
+ });
}
})
},
@@ -778,7 +819,7 @@
},
mainDriverId: {
label: '涓婚┚椹跺憳',
- display: true,dataType: 'string',
+ display: true, dataType: 'string',
rules: [
{
required: true,
@@ -813,7 +854,7 @@
licenseType: {
label: '鍑嗛┚杞﹀瀷', minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/license_type',
- search: true,multiple:true,
+ search: true, multiple: true,
},
},
@@ -832,7 +873,11 @@
return callback(res.data || {})
})
} else {
- listTmsDriver({pageSize: page.pageSize, pageNum: page.currentPage, ...data,carrierType:form.value.operationMode}).then(res => {
+ listTmsDriver({
+ pageSize: page.pageSize,
+ pageNum: page.currentPage, ...data,
+ carrierType: form.value.operationMode
+ }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -846,7 +891,7 @@
},
assistantDriverId: {
label: '鍓┚椹跺憳',
- display: true,dataType: 'string',
+ display: true, dataType: 'string',
change: (val: any) => {
const table = crudRef.value?.getPropRef?.('assistantDriverId')?.$refs?.temp;
if (!table) return;
@@ -873,7 +918,7 @@
search: true,
},
licenseType: {
- label: '鍑嗛┚杞﹀瀷', minWidth: 120,multiple:true,
+ label: '鍑嗛┚杞﹀瀷', minWidth: 120, multiple: true,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/license_type',
search: true,
},
@@ -894,7 +939,11 @@
return callback(res.data || {})
})
} else {
- listTmsDriver({pageSize: page.pageSize, pageNum: page.currentPage, ...data,carrierType:form.value.operationMode}).then(res => {
+ listTmsDriver({
+ pageSize: page.pageSize,
+ pageNum: page.currentPage, ...data,
+ carrierType: form.value.operationMode
+ }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -906,7 +955,7 @@
},
vehicleId: {
- label: '杞︾墝鍙�',dataType: 'string',
+ label: '杞︾墝鍙�', dataType: 'string',
display: true,
rules: [
{
@@ -973,7 +1022,11 @@
return callback(res.data || {})
})
} else {
- listTmsVehicle({pageSize: page.pageSize, pageNum: page.currentPage, ...data,carrierType:form.value.operationMode}).then(res => {
+ listTmsVehicle({
+ pageSize: page.pageSize,
+ pageNum: page.currentPage, ...data,
+ carrierType: form.value.operationMode
+ }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -989,120 +1042,15 @@
display: true, type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',
},
shipperId: {
- label: '瑁呰揣鐐�',dataType:'string',
+ label: '瑁呰揣鐐�', dataType: 'string',
display: true,
- change: (val: any) => {
- const table = crudRef.value?.getPropRef?.('shipperId')?.$refs?.temp;
- if (!table) return;
- let active = table.active;
- if (Array.isArray(active)) active = active[0];
- if (active) {
- let shipperRegionCode = '';
- if (active.provinceId){
- shipperRegionCode = active.provinceId;
- }
- if (active.cityId){
- shipperRegionCode =shipperRegionCode+ ","+active.cityId;
- }
- if (active.districtId){
- shipperRegionCode =shipperRegionCode+ ","+active.districtId;
-
- }
- if (active.streetId){
- shipperRegionCode =shipperRegionCode+ ","+active.streetId;
- }
- Object.assign(form.value, {
- shipperId: active.id,
- shipperName: active.consignorName,
- shipperRegionLabel: active.regionLabel,
- shipperAddress: active.addressDetail,
- shipperMobile: active.contactPhone,
- shipperRegionCode:shipperRegionCode
- });
- }
- },
rules: [
{
required: false,
message: "瑁呰揣鐐逛笉鑳戒负绌�", trigger: "change"
}
],
- type: 'table', suffixIcon: 'search',
- children: {
- border: true,
- searchLabelWidth: 100,
- searchMenuSpan: 5,
- column: {
- consignorCode: {
- label: '鏀惰璐х偣缂栫爜', minWidth: 130,
- search: true,
- },
- consignorName: {
- label: '鏀惰璐х偣鍚嶇О', minWidth: 130,
- search: true,
- },
- consignorType: {
- label: '鏀惰璐х偣绫诲瀷', minWidth: 80,
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
- display: false,
- hide: false,
- search: true,
- },
- contactName: {
- label: '鑱旂郴浜哄鍚�', minWidth: 110,
- display: false,
- hide: false,
- search: true,
- },
- contactPhone: {
- label: '鑱旂郴浜虹數璇�', minWidth: 110,
- display: false,
- hide: false,
- search: true,
- },
- regionLabel: {
- label: '琛屾斂鍖哄煙', minWidth: 180,
- display: false,
- hide: false,
- search: true,
- },
- },
-
- },
- props: {
- label: 'consignorName',
- value: 'id'
- },
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
- if (value) {
- let id = value;
- if (Array.isArray(value)) {
- id = value[0]
- }
- getTmsConsignor(id).then(res => {
- return callback(res.data || {})
- })
- } else {
- if (form.value.startRegionCode) {
- const split = form.value.startRegionCode.split(',');
- const [provinceId, cityId, districtId, streetId] = split;
-
- if (provinceId) data.provinceId = provinceId;
- if (cityId) data.cityId = cityId;
- if (districtId) data.districtId = districtId;
- if (streetId) data.streetId = streetId;
- }
- console.log(form.value.startRegionCode)
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
- return callback({
- total: res.total,
- data: res.rows || [],
- })
- })
- }
-
- }
},
shipperRegionLabel: {
@@ -1120,120 +1068,13 @@
},
receiverId: {
label: '鍗歌揣鐐�',
- display: true, dataType:'string',
+ display: true, dataType: 'string',
rules: [
{
required: true,
message: "鍗歌揣鐐逛笉鑳戒负绌�", trigger: "change"
}
],
- change: (val: any) => {
- const table = crudRef.value?.getPropRef?.('receiverId')?.$refs?.temp;
- if (!table) return;
- let active = table.active;
- if (Array.isArray(active)) active = active[0];
- if (active) {
- let receiverRegionCode = '';
- if (active.provinceId){
- receiverRegionCode = active.provinceId;
- }
- if (active.cityId){
- receiverRegionCode =receiverRegionCode+ ","+active.cityId;
-
- }
- if (active.districtId){
- receiverRegionCode =receiverRegionCode+ ","+active.districtId;
-
- }
- if (active.streetId){
- receiverRegionCode =receiverRegionCode+ ","+active.streetId;
- }
-
- Object.assign(form.value, {
- receiverId: active.id,
- receiverName: active.consignorName,
- receiverRegionLabel: active.regionLabel,
- receiverAddress: active.addressDetail,
- receiverMobile: active.contactPhone,
- receiverRegionCode:receiverRegionCode,
- });
- }
- },
- type: 'table', suffixIcon: 'search',
- children: {
- border: true,
- searchLabelWidth: 100,
- searchMenuSpan: 5,
- column: {
- consignorCode: {
- label: '鏀惰璐х偣缂栫爜', minWidth: 130,
- search: true,
- },
- consignorName: {
- label: '鏀惰璐х偣鍚嶇О', minWidth: 130,
- search: true,
- },
- consignorType: {
- label: '鏀惰璐х偣绫诲瀷', minWidth: 80,
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
- display: false,
- hide: false,
- search: true,
- },
- contactName: {
- label: '鑱旂郴浜哄鍚�', minWidth: 110,
- display: false,
- hide: false,
- search: true,
- },
- contactPhone: {
- label: '鑱旂郴浜虹數璇�', minWidth: 110,
- display: false,
- hide: false,
- search: true,
- },
- regionLabel: {
- label: '琛屾斂鍖哄煙', minWidth: 180,
- display: false,
- hide: false,
- search: true,
- },
- },
-
- },
- props: {
- label: 'consignorName',
- value: 'id'
- },
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
- if (value) {
- let id = value;
- if (Array.isArray(value)) {
- id = value[0]
- }
- getTmsConsignor(id).then(res => {
- return callback(res.data || {})
- })
- } else {
- if (form.value.endRegionCode) {
- const split = form.value.endRegionCode.split(',');
- const [provinceId, cityId, districtId, streetId] = split;
-
- if (provinceId) data.provinceId = provinceId;
- if (cityId) data.cityId = cityId;
- if (districtId) data.districtId = districtId;
- if (streetId) data.streetId = streetId;
- }
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
- return callback({
- total: res.total,
- data: res.rows || [],
- })
- })
- }
-
- }
-
},
receiverRegionLabel: {
label: '鍗歌揣鐐硅鏀垮尯鍩�',
@@ -1602,7 +1443,21 @@
hide: false,
search: false,
},
-
+ updateTimeRange: {
+ label: '鏇存柊鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
+ confirmTimeRange: {
+ label: '纭鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
+ okTimeRange: {
+ label: '瀹屾垚鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
}
})
@@ -1666,7 +1521,7 @@
voucherUrl: {
label: '琛岀▼鍑瘉',
display: true,
- span: 24,dataType: 'string',
+ span: 24, dataType: 'string',
type: 'upload',
action: '/common/upload2',
@@ -1722,7 +1577,7 @@
voucherUrl: {
label: '琛岀▼鍑瘉',
display: true,
- span: 24,dataType: 'string',
+ span: 24, dataType: 'string',
type: 'upload',
action: '/common/upload2',
@@ -1761,7 +1616,7 @@
label: '琛岀▼鍑瘉',
display: true,
span: 24,
- accept:'string',dataType: 'string',
+ accept: 'string', dataType: 'string',
type: 'upload',
action: '/common/upload2',
@@ -1809,7 +1664,7 @@
label: '璐圭敤鍑瘉',
display: true,
span: 24,
- accept:'string',dataType: 'object',
+ accept: 'string', dataType: 'object',
type: 'upload',
action: '/common/upload2',
@@ -1860,7 +1715,7 @@
},
transportLine: {
label: '杩愯緭绾胯矾',
- display: false,minWidth: 180, overHidden: true
+ display: false, minWidth: 180, overHidden: true
},
actualVehicleType: {
label: '杞﹀瀷', minWidth: 130,
@@ -1888,7 +1743,7 @@
message: "鎺ユ寕杞﹁締鍙风爜涓嶈兘涓虹┖", trigger: "change"
}
],
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchLabelWidth: 100,
@@ -1954,7 +1809,7 @@
message: "鎺ユ寕鍙告満涓嶈兘涓虹┖", trigger: "change"
}
],
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchMenuSpan: 5,
@@ -1970,7 +1825,7 @@
licenseType: {
label: '鍑嗛┚杞﹀瀷', minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/license_type',
- search: true,multiple:true,
+ search: true, multiple: true,
},
},
@@ -2010,8 +1865,8 @@
viewBtn: false,
column: {
productId: {
- label: '璐у搧鍚嶇О',hide:true,
- display: true,minWidth: 120, type: 'table', suffixIcon: 'search',dataType: 'string',
+ label: '璐у搧鍚嶇О', hide: true,
+ display: true, minWidth: 120, type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchLabelWidth: 100,
@@ -2058,10 +1913,11 @@
return callback(res.data || {})
})
} else {
- listTmsProductInfo({pageSize: page.pageSize,
+ listTmsProductInfo({
+ pageSize: page.pageSize,
pageNum: page.currentPage,
...data,
- customerId:form.value.customerId
+ // customerId:form.value.customerId
}).then(res => {
return callback({
total: res.total,
@@ -2087,87 +1943,88 @@
packUnit: active.packUnit,
});
- goodsForm.value.sumWeight = active.grossWeight|| 0 * goodsForm.value.quantity;
- goodsForm.value.sumNetWeight = active.netWeight || 0* goodsForm.value.quantity;
- goodsForm.value.sumVolume = active.volume|| 0 * goodsForm.value.quantity;
+ goodsForm.value.sumWeight = active.grossWeight || 0 * goodsForm.value.quantity;
+ goodsForm.value.sumNetWeight = active.netWeight || 0 * goodsForm.value.quantity;
+ goodsForm.value.sumVolume = active.volume || 0 * goodsForm.value.quantity;
}
},
},
productName: {
- label: '璐у搧鍚嶇О',minWidth: 120,
- display :false,
+ label: '璐у搧鍚嶇О', minWidth: 120,
+ display: false,
hide: false,
},
quantity: {
label: '鏁伴噺',
- addDisplay :true,minWidth: 100,
- editDisplay :true,
- viewDisplay :true,
+ addDisplay: true, minWidth: 100,
+ editDisplay: true,
+ viewDisplay: true,
value: 1,
- change:()=>{
+ change: () => {
goodsForm.value.sumWeight = goodsForm.value.grossWeight || 0 * goodsForm.value.quantity;
- goodsForm.value.sumNetWeight = goodsForm.value.netWeight || 0* goodsForm.value.quantity;
+ goodsForm.value.sumNetWeight = goodsForm.value.netWeight || 0 * goodsForm.value.quantity;
goodsForm.value.sumVolume = goodsForm.value.volume || 0 * goodsForm.value.quantity;
}
},
sumWeight: {
label: '閲嶉噺(kg)',
- addDisplay :true,minWidth: 100,append: 'Kg',
- editDisplay :true,
- viewDisplay :true,
+ addDisplay: true, minWidth: 100, append: 'Kg',
+ editDisplay: true,
+ viewDisplay: true,
},
sumNetWeight: {
label: '鍑�閲�(kg)',
- addDisplay :true,
- editDisplay :true,minWidth: 100,append: 'Kg',
- viewDisplay :true,
+ addDisplay: true,
+ editDisplay: true, minWidth: 100, append: 'Kg',
+ viewDisplay: true,
},
sumVolume: {
label: '浣撶Н(m鲁)',
- addDisplay :true,
- editDisplay :true,minWidth: 100,append: 'm鲁',
- viewDisplay :true,
+ addDisplay: true,
+ editDisplay: true, minWidth: 100, append: 'm鲁',
+ viewDisplay: true,
},
loosePieces: {
label: '鏁ｄ欢鏁�',
- addDisplay :true,
- editDisplay :true,minWidth: 100,
- viewDisplay :true,
+ addDisplay: true,
+ editDisplay: true, minWidth: 100,
+ viewDisplay: true,
},
fullContainers: {
label: '鏁寸鏁�',
- addDisplay :true,
- editDisplay :true,minWidth: 100,
- viewDisplay :true,
+ addDisplay: true,
+ editDisplay: true, minWidth: 100,
+ viewDisplay: true,
},
containerNo: {
label: '闆嗚绠卞彿',
- addDisplay :true,
- editDisplay :true,minWidth: 100,
- viewDisplay :true,
+ addDisplay: true,
+ editDisplay: true, minWidth: 100,
+ viewDisplay: true,
},
palletCount: {
label: '鎵樻暟',
- addDisplay :true,minWidth: 100,
- editDisplay :true,
- viewDisplay :true,
+ addDisplay: true, minWidth: 100,
+ editDisplay: true,
+ viewDisplay: true,
}
- }})
+ }
+})
const actualFormOption = ref({
- menuBtn: false, labelWidth: 140,
- column:{
- departureAddress:{
+ menuBtn: false, labelWidth: 140,
+ column: {
+ departureAddress: {
label: '瀹為檯鍑哄彂鍦板湴鍧�',
- span:24,
+ span: 24,
},
- destinationAddress:{
+ destinationAddress: {
label: '瀹為檯鐩殑鍦板湴鍧�',
- span:24,
+ span: 24,
},
actualLoadStart: {
label: '瀹為檯瑁呰溅寮�濮嬫椂闂�',
@@ -2198,18 +2055,18 @@
display: true,
},
actualQuantity: {
- label: '瀹炲彂鏁伴噺',type: 'number',
+ label: '瀹炲彂鏁伴噺', type: 'number',
},
actualWeight: {
- label: '瀹炲彂閲嶉噺',type: 'number',
+ label: '瀹炲彂閲嶉噺', type: 'number',
},
actualVolume: {
- label: '瀹炲彂浣撶Н',type: 'number',
+ label: '瀹炲彂浣撶Н', type: 'number',
},
reweighWeight: {
- label: '澶嶇閲嶉噺',type: 'number',
+ label: '澶嶇閲嶉噺', type: 'number',
},
- electronicLock:{
+ electronicLock: {
label: '鐢靛瓙閿�',
}
}
@@ -2220,29 +2077,76 @@
pageKey: 'itemsTable',
rowKey: 'rowKey',
header: false,
- addBtn: false,menu: false,
- column:{
- feeType:{
+ addBtn: false, menu: false,
+ column: {
+ feeType: {
label: '璐圭敤鍚嶇О',
},
- unit:{
+ unit: {
label: '*璁￠噺鍗曚綅',
},
- price:{
+ price: {
label: '*璁¤垂閲戦',
},
- currency:{
+ currency: {
label: '甯佸埗',
},
- count:{
- label: '璁¤垂鏁伴噺',minWidth:130,
+ count: {
+ label: '璁¤垂鏁伴噺', minWidth: 130,
},
- sum:{
+ sum: {
label: '鎬婚噾棰�',
}
}
})
-const itemsCrudRef =ref()
+
+const consignorOption = ref({
+ border: true,
+ searchLabelWidth: 100,
+ searchMenuSpan: 5,
+ column: {
+ consignorCode: {
+ label: '鏀惰璐х偣缂栫爜', minWidth: 130,
+ search: true,
+ },
+ consignorName: {
+ label: '鏀惰璐х偣鍚嶇О', minWidth: 130,
+ search: true,
+ },
+ consignorType: {
+ label: '鏀惰璐х偣绫诲瀷', minWidth: 80,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
+ display: false,
+ hide: false,
+ search: true,
+ },
+ contactName: {
+ label: '鑱旂郴浜哄鍚�', minWidth: 110,
+ display: false,
+ hide: false,
+ search: true,
+ },
+ contactPhone: {
+ label: '鑱旂郴浜虹數璇�', minWidth: 110,
+ display: false,
+ hide: false,
+ search: true,
+ },
+ regionLabel: {
+ label: '琛屾斂鍖哄煙', minWidth: 180,
+ display: false,
+ hide: false,
+ search: true,
+ },
+ },
+})
+const consignorProps = ref({
+ label: 'consignorName',
+ value: 'id'
+})
+
+
+const itemsCrudRef = ref()
const itemsTableData = ref<any>([])
const {
@@ -2279,6 +2183,12 @@
},
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
+ },
+ getBeginListFunc: () => {
+ queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.createTimeRange, 'createTime') || {};
+ queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.updateTimeRange, 'updateTime') || {};
+ queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.confirmTimeRange, 'confirmTime') || {};
+ queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.okTimeRange, 'okTime') || {};
}
})
const handleConfirm = (row: any) => {
@@ -2358,7 +2268,7 @@
}
const submitForm = () => {
- if (optionType.value === 'addItinerary'){
+ if (optionType.value === 'addItinerary') {
if (Array.isArray(boxForm.value.voucherUrl)) {
boxForm.value.voucherUrl = boxForm.value.voucherUrl.toString();
}
@@ -2370,19 +2280,19 @@
cancelBox();
onLoad(page.value);
})
- }else if (optionType.value === 'addFinance'){
+ } else if (optionType.value === 'addFinance') {
if (Array.isArray(boxForm.value.feeVoucherUrl)) {
boxForm.value.feeVoucherUrl = boxForm.value.feeVoucherUrl.toString();
}
- let filter = selectionList2.value.filter((item:any)=>{
+ let filter = selectionList2.value.filter((item: any) => {
return !item.count
});
- if (filter.length > 0){
+ if (filter.length > 0) {
proxy.$modal.msgError("鍕鹃�夋姤浠疯垂鐢ㄨ濉啓璁¤垂鏁伴噺");
return;
}
boxForm.value.items = selectionList2.value;
- addTmsFinanceDetail(boxForm.value).then(res=>{
+ addTmsFinanceDetail(boxForm.value).then(res => {
ElMessage({
message: "鎿嶄綔鎴愬姛锛�",
type: 'success'
@@ -2410,27 +2320,28 @@
})
}
-const handleAddFinance = async (row:any)=>{
+const handleAddFinance = async (row: any) => {
optionType.value = 'addFinance';
boxFormOption.value = financeOption.value;
boxTableOption.value = financeTableOption.value;
- const quotePlanItemRes = await listTmsQuoteItem({quotePlanId:row.quotePlanId,pageNum: 1, pageSize: 999});
+ const quotePlanItemRes = await listTmsQuoteItem({quotePlanId: row.quotePlanId, pageNum: 1, pageSize: 999});
let items = quotePlanItemRes.rows || [];
- itemsTableData.value = items.map((item:any) => {
+ itemsTableData.value = items.map((item: any) => {
return {
rowKey: item.id,
feeType: item.freeName,
unit: item.unit,
price: item.price,
currency: item.currency,
- count: 0,
+ count: 0,
sum: 0,
}
})
listTmsFinanceDetail({
- dispatchOrderId: row.id,financeType:2,
- pageNum: 1, pageSize: 999}).then(res => {
+ dispatchOrderId: row.id, financeType: 2,
+ pageNum: 1, pageSize: 999
+ }).then(res => {
boxTableData.value = res.rows || [];
@@ -2439,15 +2350,15 @@
boxForm.value = {
dispatchOrderId: row.id,
dataSource: 0,
- financeType:2,
+ financeType: 2,
}
})
}
const handleGenerate = () => {
- let ids = selectionList.value.map((item:any) => item.id);
+ let ids = selectionList.value.map((item: any) => item.id);
initGenerate(ids).then(res => {
- boxTableData.value = res.data|| [];
+ boxTableData.value = res.data || [];
optionType.value = 'generate';
pageF.open = true;
pageF.title = '鐢熸垚搴旀敹搴斾粯璐圭敤鏁版嵁';
@@ -2457,7 +2368,7 @@
const submitGenerate = () => {
pageF.isUploading = true;
- let ids = selectionList.value.map((item:any) => item.id);
+ let ids = selectionList.value.map((item: any) => item.id);
generateTmsDispatchOrder(ids).then(res => {
pageF.isUploading = false;
@@ -2467,7 +2378,7 @@
})
cancelBox();
onLoad(page.value);
- }).finally(()=>{
+ }).finally(() => {
pageF.isUploading = false;
})
}
@@ -2475,7 +2386,7 @@
* 鐢╂寕
*/
const handleDropHook = () => {
- title.value = '璋冨害鍗曠敥鎸�';
+ title.value = '璋冨害鍗曠敥鎸�';
open.value = true;
form.value = selectionList.value[0];
optionType.value = 'dropHook';
@@ -2501,14 +2412,14 @@
})
cancelBox2();
onLoad(page.value);
- }).finally(()=>{
+ }).finally(() => {
pageF.isUploading = false;
})
- }else{
+ } else {
connectHang({
- dispatchId:form.value.id,
- vehicleId:form.value.vehicleId,
- driverId:form.value.driverId
+ dispatchId: form.value.id,
+ vehicleId: form.value.vehicleId,
+ driverId: form.value.driverId
}).then(res => {
ElMessage({
message: "鎻愪氦鎴愬姛锛�",
@@ -2516,7 +2427,7 @@
})
cancelBox2();
onLoad(page.value);
- }).finally(()=>{
+ }).finally(() => {
pageF.isUploading = false
})
}
@@ -2528,13 +2439,13 @@
}
const handleAddGoods = (row: any) => {
- listTmsGoodsDetail({dispatchId: row.id,pageSize:999,pageNum:1}).then(res=>{
- goodsTableData.value = res.rows || [];
+ listTmsGoodsDetail({dispatchId: row.id, pageSize: 999, pageNum: 1}).then(res => {
+ goodsTableData.value = res.rows || [];
form.value = row;
open2.value = true;
})
}
-const rowGoodsUpdate = (row:any,index:any,done:any, loading:any) => {
+const rowGoodsUpdate = (row: any, index: any, done: any, loading: any) => {
updateTmsGoodsDetail(row).then(res => {
ElMessage({
message: "淇敼鎴愬姛锛�",
@@ -2543,14 +2454,14 @@
handleAddGoods(form.value);
onLoad(page.value);
done();
- }).catch(()=>{
+ }).catch(() => {
loading()
})
}
-const rowGoodsSave = (row:any, done:any, loading:any) => {
+const rowGoodsSave = (row: any, done: any, loading: any) => {
row.dispatchId = form.value.id;
row.dispatchNo = form.value.dispatchNo;
- addTmsGoodsDetail(row).then(res=>{
+ addTmsGoodsDetail(row).then(res => {
ElMessage({
message: "鏂板鎴愬姛锛�",
type: 'success'
@@ -2558,12 +2469,16 @@
handleAddGoods(form.value);
onLoad(page.value);
done();
- }).catch(()=>{
+ }).catch(() => {
loading()
})
}
-const rowGoodsDel = (row:any) => {
- ElMessageBox.confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎锛�", '绯荤粺鎻愮ず', {confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', type: 'warning'}).then(() => {
+const rowGoodsDel = (row: any) => {
+ ElMessageBox.confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎锛�", '绯荤粺鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
return delTmsGoodsDetail(row.id);
}).then(() => {
handleAddGoods(form.value);
@@ -2574,14 +2489,14 @@
});
}
-const handleActual = (row:any) => {
- actualForm.value = row;
- open3.value = true;
+const handleActual = (row: any) => {
+ actualForm.value = row;
+ open3.value = true;
}
-const submitForm3 = ()=>{
- updateTmsDispatchOrder(actualForm.value).then(res=>{
+const submitForm3 = () => {
+ updateTmsDispatchOrder(actualForm.value).then(res => {
ElMessage({
message: "鎿嶄綔鎴愬姛锛�",
type: 'success'
@@ -2590,7 +2505,7 @@
onLoad(page.value)
})
}
-const countChange = (row:any) => {
+const countChange = (row: any) => {
row.sum = Number(row.price) * Number(row.count);
}
@@ -2598,5 +2513,526 @@
selectionList2.value = selection;
}
+const onShipperLoad = ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ if (value) {
+ let id = value;
+ if (Array.isArray(value)) {
+ id = value[0]
+ }
+ getTmsConsignor(id).then(res => {
+ return callback(res.data || {})
+ })
+ } else {
+ if (form.value.startRegionCode) {
+ const split = form.value.startRegionCode.split(',');
+ const [provinceId, cityId, districtId, streetId] = split;
+
+ if (provinceId) data.provinceId = provinceId;
+ if (cityId) data.cityId = cityId;
+ if (districtId) data.districtId = districtId;
+ if (streetId) data.streetId = streetId;
+ }
+ listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ return callback({
+ total: res.total,
+ data: res.rows || [],
+ })
+ })
+ }
+}
+const onConsignorLoad = ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ if (value) {
+ let id = value;
+ if (Array.isArray(value)) {
+ id = value[0]
+ }
+ getTmsConsignor(id).then(res => {
+ return callback(res.data || {})
+ })
+ } else {
+ if (form.value.endRegionCode) {
+ const split = form.value.endRegionCode.split(',');
+ const [provinceId, cityId, districtId, streetId] = split;
+
+ if (provinceId) data.provinceId = provinceId;
+ if (cityId) data.cityId = cityId;
+ if (districtId) data.districtId = districtId;
+ if (streetId) data.streetId = streetId;
+ }
+ listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ return callback({
+ total: res.total,
+ data: res.rows || [],
+ })
+ })
+ }
+}
+const changeShipper = ({value}: any) => {
+
+ if (value) {
+ let id = value;
+ if (Array.isArray(value)) {
+ id = value[0]
+ }
+ getTmsConsignor(id).then(res => {
+ let active = res.data || {};
+ let shipperRegionCode = '';
+ if (active.provinceId) {
+ shipperRegionCode = active.provinceId;
+ }
+ if (active.cityId) {
+ shipperRegionCode = shipperRegionCode + "," + active.cityId;
+
+ }
+ if (active.districtId) {
+ shipperRegionCode = shipperRegionCode + "," + active.districtId;
+
+ }
+ if (active.streetId) {
+ shipperRegionCode = shipperRegionCode + "," + active.streetId;
+ }
+ Object.assign(form.value, {
+ shipperId: active.id,
+ shipperName: active.consignorName,
+ shipperRegionLabel: active.regionLabel,
+ shipperAddress: active.addressDetail,
+ shipperMobile: active.contactPhone,
+ shipperRegionCode: shipperRegionCode
+ });
+ })
+ }
+}
+const changeReceiver = ({value}: any) => {
+
+ if (value) {
+ let id = value;
+ if (Array.isArray(value)) {
+ id = value[0]
+ }
+ getTmsConsignor(id).then(res => {
+ let active = res.data || {};
+ let receiverRegionCode = '';
+ if (active.provinceId) {
+ receiverRegionCode = active.provinceId;
+ }
+ if (active.cityId) {
+ receiverRegionCode = receiverRegionCode + "," + active.cityId;
+
+ }
+ if (active.districtId) {
+ receiverRegionCode = receiverRegionCode + "," + active.districtId;
+
+ }
+ if (active.streetId) {
+ receiverRegionCode = receiverRegionCode + "," + active.streetId;
+ }
+
+ Object.assign(form.value, {
+ receiverId: active.id,
+ receiverName: active.consignorName,
+ receiverRegionLabel: active.regionLabel,
+ receiverAddress: active.addressDetail,
+ receiverMobile: active.contactPhone,
+ receiverRegionCode: receiverRegionCode,
+ });
+ })
+ }
+}
+const consignorAddOption =ref({
+ labelWidth: 120,
+ group: [
+ {
+ label: '鍩虹淇℃伅',
+ prop: 'jcxx',
+ column:{
+ // consignorCode: {
+ // label: '瑁呭嵏璐х偣缂栫爜',minWidth: 150,
+ // addDisplay: false, disabled: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // hide: false,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "瑁呭嵏璐х偣缂栫爜涓嶈兘涓虹┖", trigger: "blur"
+ // }
+ // ],
+ // },
+ consignorName: {
+ label: '瑁呭嵏璐х偣鍚嶇О',minWidth: 150,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "瑁呭嵏璐х偣鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ customerName:{
+ label: '鎵�灞炲鎴�',minWidth: 150,disabled: true,
+ },
+ // customerId: {
+ // label: '鎵�灞炲鎴�',minWidth: 150,
+ // addDisplay: true,
+ // editDisplay: true,suffixIcon:'search',
+ // viewDisplay: true,
+ // hide: true,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "鎵�灞炲鎴蜂笉鑳戒负绌�", trigger: "change"
+ // }
+ // ],
+ // type: 'table',
+ // children:{
+ // border: true,
+ // searchMenuSpan: 5,
+ // column:{
+ // customerType: {
+ // label: '瀹㈡埛绫诲瀷', minWidth: 120,
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
+ // search: true,
+ // },
+ // customerShortName: {
+ // label: '瀹㈡埛绠�绉�', minWidth: 130,
+ // search: true,
+ // },
+ // customerCode: {
+ // label: '瀹㈡埛缂栧彿',minWidth: 120,
+ // search: true,
+ // },
+ // contactName: {
+ // label: '鑱旂郴浜哄鍚�',minWidth: 120,
+ // },
+ // signCompanyName: {
+ // label: '绛剧害鍏徃', minWidth: 150,
+ // },
+ // },
+ //
+ // },
+ // props:{
+ // label: 'customerShortName',
+ // value: 'id'
+ // },
+ // onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback:any) => {
+ // if (value){
+ // let id = value;
+ // if (Array.isArray(value)){
+ // id = value[0]
+ // }
+ // getTmsCustomerInfo(id).then(res=>{
+ // return callback(res.data||{})
+ // })
+ // }else{
+ // listTmsCustomerInfo({pageSize:page.pageSize,pageNum:page.currentPage,...data}).then(res=>{
+ // return callback({
+ // total: res.total,
+ // data: res.rows||[],
+ // })
+ // })
+ // }
+ //
+ // },
+ // change: ({value}: any) => {
+ // if(value){
+ // getTmsCustomerInfo(value).then(res=>{
+ // let active = res.data || {};
+ // if (active){
+ // console.log(dialForm.value)
+ // form2.value.customerId = active.id
+ // form2.value.customerSysCode = active.customerCode
+ // form2.value.customerName = active.customerShortName
+ // }
+ // })
+ // }
+ // },
+ // },
+ // customerSysCode: {
+ // label: '瀹㈡埛缂栫爜',minWidth: 150,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // hide: false,
+ // search: true,
+ // disabled: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "瀹㈡埛缂栫爜涓嶈兘涓虹┖", trigger: "blur"
+ // }
+ // ],
+ // },
+ consignorType: {
+ label: '瑁呭嵏璐х偣绫诲瀷',minWidth: 150,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "瑁呭嵏璐х偣绫诲瀷涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ },
+ }
+ },
+ {
+ label: '鑱旂郴浜轰俊鎭�',
+ prop: 'lxrxx',
+ column:{
+ contactName: {
+ label: '鑱旂郴浜哄鍚�',minWidth: 150,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "鑱旂郴浜哄鍚嶄笉鑳戒负绌�", trigger: "blur"
+ }
+ ],
+ },
+ contactPhone: {
+ label: '鑱旂郴浜虹數璇�',minWidth: 150,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: true,
+ search: false,
+ },
+ contactEmail: {
+ label: '鑱旂郴浜洪偖绠�',minWidth: 150,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: true,
+ search: false,
+ },
+ }
+ },
+ {
+ label: '鍦板潃淇℃伅',
+ prop: 'dzxx',
+ column:{
+
+ mapLocationDetail: {
+ label: '鍦板浘浣嶇疆',minWidth: 150,
+ addDisplay: true,
+ editDisplay: true,span:24,
+ viewDisplay: true,
+ hide: true,
+ search: false,
+ type: 'map',
+ // mapChange: async (params:any)=>{
+ // if (params.info === "OK") {
+ // let { province, city, district, township } = params.regeocode.addressComponent || {};
+ // const res = await getAddressCode({province, city, district, township});
+ // const {provinceCode, cityCode, districtCode, townshipCode} = res.data || {};
+ // form2.value.regionLabel = province + " / " + city + " / " + district + " / " + township;
+ // //form2.value.region = [provinceCode, cityCode, districtCode, townshipCode];
+ // form2.value.provinceId = provinceCode;
+ // form2.value.cityId = cityCode;
+ // form2.value.districtId = districtCode;
+ // form2.value.streetId = townshipCode;
+ // form2.value.dispatchTransportArea = params.regeocode.formattedAddress;
+ // console.log(form2.value,"form2")
+ // }
+ // },
+ change: async ({value}:any)=>{
+ if (Array.isArray(value) && value.length === 3){
+ mapRegeo(value[1], value[0]).then(async res => {
+ let params = res.data || {};
+ if (params.info === "OK") {
+ let {province, city, district, township} = params.regeocode.addressComponent || {};
+ const res = await getAddressCode({province, city, district, township});
+ const {provinceCode, cityCode, districtCode, townshipCode} = res.data || {};
+ form2.value.regionLabel = province + " / " + city + " / " + district + " / " + township;
+ form2.value.provinceId = provinceCode;
+ form2.value.cityId = cityCode;
+ form2.value.districtId = districtCode;
+ form2.value.streetId = townshipCode;
+ form2.value.dispatchTransportArea = params.regeocode.formatted_address || params.regeocode.formattedAddress;
+ console.log(form2.value, "form2")
+ }
+ });
+ }
+ },
+ },
+ // dispatchTransportArea: {
+ // label: '璋冨害鍗曡繍杈撳湴',
+ // addDisplay: true,minWidth: 150,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // hide: false,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "璋冨害鍗曡繍杈撳湴涓嶈兘涓虹┖", trigger: "blur"
+ // }
+ // ],
+ // },
+ electronicFenceRange: {
+ label: '鐢靛瓙鍥存爮鑼冨洿',
+ addDisplay: true,minWidth: 150,
+ editDisplay: true,
+ viewDisplay: true,append:'绫�',
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "鐢靛瓙鍥存爮鑼冨洿涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ }
+ },
+ {
+ label: '鍏朵粬淇℃伅',
+ prop: 'qtyxx',
+ column:{
+ remark: {
+ label: '澶囨敞',minWidth: 150,
+ type: 'textarea', minRows: 3, maxRows: 5,
+ addDisplay: true,
+ editDisplay: true,span:24,
+ viewDisplay: true,
+ hide: true,
+ search: false,
+ },
+ }
+ }
+ ],
+})
+const form2 = ref<any>({});
+const dialForm = ref();
+
+const handleAddShipper = () => {
+ if (!form.value.customerId){
+ return ElMessage.error('璇峰厛閫夋嫨杩愯緭璺嚎');
+ }
+ form2.value = {
+ customerId: form.value.customerId,
+ customerSysCode: form.value.customerCode,
+ customerName: form.value.customerName,
+ };
+ dialForm.value = $DialogForm(appContext)({
+ title: '鏂板瑁呰揣鍦�',
+ data:form2.value,
+ width: '80%',
+ option: consignorAddOption.value,
+ menuPosition: 'right',
+ callback: (res:any,) => {
+ let data1 = res.data;
+ if (data1.mapLocationDetail){
+ data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ data1.addressDetail = data1.mapLocationDetail[2]
+ }
+ addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ let active = res2.data || {};
+ if (active) {
+ let shipperRegionCode = '';
+ if (active.provinceId){
+ shipperRegionCode = active.provinceId;
+ }
+ if (active.cityId){
+ shipperRegionCode =shipperRegionCode+ ","+active.cityId;
+
+ }
+ if (active.districtId){
+ shipperRegionCode =shipperRegionCode+ ","+active.districtId;
+
+ }
+ if (active.streetId){
+ shipperRegionCode =shipperRegionCode+ ","+active.streetId;
+ }
+ Object.assign(form.value, {
+ shipperId: active.id,
+ shipperName: active.consignorName,
+ shipperRegionLabel: active.regionLabel,
+ shipperAddress: active.addressDetail,
+ shipperMobile: active.contactPhone,
+ shipperRegionCode:shipperRegionCode
+ });
+ }
+ dialForm.value.close();
+ res.done();
+ }).catch(err=>{
+ res.done();
+ })
+ },
+ })
+}
+
+const handleAddReceiver = () => {
+ if (!form.value.customerId){
+ return ElMessage.error('璇峰厛閫夋嫨杩愯緭璺嚎');
+ }
+ form2.value = {
+ customerId: form.value.customerId,
+ customerSysCode: form.value.customerCode,
+ customerName: form.value.customerName,
+ };
+ dialForm.value = $DialogForm(appContext)({
+ title: '鏂板鍗歌揣鍦�',
+ data:form2.value,
+ width: '80%',
+ option: consignorAddOption.value,
+ menuPosition: 'right',
+ callback: (res:any,) => {
+ let data1 = res.data;
+ if (data1.mapLocationDetail){
+ data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ data1.addressDetail = data1.mapLocationDetail[2]
+ }
+ addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ let active = res2.data || {};
+ if (active) {
+ let receiverRegionCode = '';
+ if (active.provinceId){
+ receiverRegionCode = active.provinceId;
+ }
+ if (active.cityId){
+ receiverRegionCode =receiverRegionCode+ ","+active.cityId;
+
+ }
+ if (active.districtId){
+ receiverRegionCode =receiverRegionCode+ ","+active.districtId;
+
+ }
+ if (active.streetId){
+ receiverRegionCode =receiverRegionCode+ ","+active.streetId;
+ }
+
+ Object.assign(form.value, {
+ receiverId: active.id,
+ receiverName: active.consignorName,
+ receiverRegionLabel: active.regionLabel,
+ receiverAddress: active.addressDetail,
+ receiverMobile: active.contactPhone,
+ receiverRegionCode:receiverRegionCode,
+ });
+ }
+ dialForm.value.close();
+ res.done();
+ }).catch(err=>{
+ res.done();
+ })
+ },
+ })
+}
+
</script>
\ No newline at end of file
--
Gitblit v1.8.0