From 933046f7fd7fa9104bc33862951d570d88d7e2df Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期二, 10 三月 2026 16:32:43 +0800
Subject: [PATCH] 按钮添加
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 1450 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 809 insertions(+), 641 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index 051f5ba..9f0dccb 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -1,25 +1,10 @@
<template>
<basicContainer>
- <avue-crud
- :option="option"
- :table-loading="pageF.loading"
- :data="tableData"
- :page="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form" v-model:search="queryParams"
- ref="crudRef"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @refresh-change="refreshChange"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @on-load="onLoad"
- >
+ <avue-crud :option="option" :table-loading="pageF.loading" :data="tableData" :page="page"
+ :permission="permissionList" :before-open="beforeOpen" v-model="form" v-model:search="queryParams" ref="crudRef"
+ @row-update="rowUpdate" @row-save="rowSave" @refresh-change="refreshChange" @row-del="rowDel"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @on-load="onLoad">
<template #menu-left>
<!-- <el-button-->
<!-- type="success"-->
@@ -36,184 +21,195 @@
<!-- v-hasPermi="['tms:tmsDispatchOrder:remove']"-->
<!-- >鍒犻櫎-->
<!-- </el-button>-->
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['tms:tmsDispatchOrder:export']"
- >瀵煎嚭
+ <el-button type="warning" plain icon="Download" @click="handleExport"
+ v-hasPermi="['tms:tmsDispatchOrder:export']">瀵煎嚭
</el-button>
- <el-button
- type="info"
- icon="Upload"
- @click="handleImport"
- v-hasPermi="['tms:tmsDispatchOrder:import']">瀵煎叆</el-button>
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- icon="Promotion"-->
-<!-- :disabled="pageF.multiple"-->
-<!-- @click="handleGenerate"-->
-<!-- v-hasPermi="['tms:tmsDispatchOrder:generate']"-->
-<!-- >鐢熸垚搴旀敹搴斾粯璐圭敤-->
-<!-- </el-button>-->
- <el-button
- type="warning"
- icon="Female"
- :disabled="pageF.single"
- @click="handleDropHook"
- v-hasPermi="['tms:tmsDispatchOrder:dropHook']"
- >鐢╂寕
+ <el-button type="info" icon="Upload" @click="handleImport"
+ v-hasPermi="['tms:tmsDispatchOrder:import']">瀵煎叆</el-button>
+ <el-button type="info" plain icon="Document" @click="handleImportLog">瀵煎叆鏃ュ織</el-button>
+ <!-- <el-button-->
+ <!-- type="success"-->
+ <!-- icon="Promotion"-->
+ <!-- :disabled="pageF.multiple"-->
+ <!-- @click="handleGenerate"-->
+ <!-- v-hasPermi="['tms:tmsDispatchOrder:generate']"-->
+ <!-- >鐢熸垚搴旀敹搴斾粯璐圭敤-->
+ <!-- </el-button>-->
+ <el-button type="warning" icon="Female" :disabled="pageF.single" @click="handleDropHook"
+ v-hasPermi="['tms:tmsDispatchOrder:dropHook']">鐢╂寕
</el-button>
- <el-button
- type="primary"
- icon="Male"
- :disabled="pageF.single"
- @click="handleConnectHang"
- v-hasPermi="['tms:tmsDispatchOrder:connectHang']"
- >鎺ユ寕
+ <el-button type="primary" icon="Male" :disabled="pageF.single" @click="handleConnectHang"
+ v-hasPermi="['tms:tmsDispatchOrder:connectHang']">鎺ユ寕
</el-button>
- <el-button
- type="warning"
- icon="Avatar"
- :disabled="!( isCustoms == 0)"
- @click="handleCustoms"
- v-hasPermi="['tms:tmsDispatchOrder:customs']"
- >濮旀墭鎶ュ叧淇℃伅
+ <el-button type="warning" icon="Avatar" :disabled="!(isCustoms == 0)" @click="handleCustoms"
+ v-hasPermi="['tms:tmsDispatchOrder:customs']">濮旀墭鎶ュ叧淇℃伅
</el-button>
- <el-button
- type="primary"
- icon="UserFilled"
- :disabled="!( isLoad == 0)"
- @click="handleLoading"
- v-hasPermi="['tms:tmsDispatchOrder:loading']"
- >濮旀墭鍗歌揣淇℃伅
+ <el-button type="primary" icon="UserFilled" :disabled="!(isLoad == 0)" @click="handleLoading"
+ v-hasPermi="['tms:tmsDispatchOrder:loading']">濮旀墭鍗歌揣淇℃伅
</el-button>
- <el-button
- type="primary"
- icon="UserFilled"
- :disabled="pageF.single"
- @click="handleZZ"
- v-hasPermi="['tms:tmsDispatchOrder:zzdj']"
- >澧炲�间綔涓氱櫥璁�
+ <el-button type="primary" icon="UserFilled" :disabled="pageF.single" @click="handleZZ"
+ v-hasPermi="['tms:tmsDispatchOrder:zzdj']">澧炲�间綔涓氱櫥璁�
</el-button>
- <el-button
- type="primary"
- icon="Printer"
- :disabled="pageF.single"
- @click="handlePrint"
- v-hasPermi="['tms:tmsDispatchOrder:print']"
- >鎵胯繍鍗曟墦鍗�
+ <el-button type="primary" icon="Printer" :disabled="pageF.single" @click="handlePrint"
+ v-hasPermi="['tms:tmsDispatchOrder:print']">鎵胯繍鍗曟墦鍗�
</el-button>
- <el-button
- type="primary"
- icon="UserFilled"
- :disabled="!zxhdjSingle"
- @click="handleZXHDJ"
- v-hasPermi="['tms:tmsDispatchOrder:zzdj']"
- >瑁呭嵏璐х偣鐧昏
+ <el-button type="primary" icon="UserFilled" :disabled="!zxhdjSingle" @click="handleZXHDJ"
+ v-hasPermi="['tms:tmsDispatchOrder:zzdj']">瑁呭嵏璐х偣鐧昏
</el-button>
- </template>
- <template #menu-before="{row}">
- <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
- v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0,1,2].includes(row.status)"
- :underline="false" icon="el-icon-document-add">杩愯緭璐у搧鐧昏
- </el-link>
- <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
- v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0,1,2].includes(row.status)"
- :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" v-if="[0,1,2].includes(row.status)" @click="handleClose(row)" class="link-btn"
- v-hasPermi="['tms:tmsDispatchOrder:closeOrder']"
- :underline="false" icon="el-icon-close">浣滃簾
- </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" v-hasPermi="['tms:tmsFinanceDetail:add']"-->
-<!-- :underline="false" icon="el-icon-edit-pen">璐圭敤鐧昏-->
-<!-- </el-link>-->
- </template>
- <template #menu="{row}">
- <el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" :underline="false"
- icon="el-icon-tickets">鏃ュ織
- </el-link>
</template>
- <template #shipperId-form="{disabled}">
+ <template #loadingServiceProviderName="{ row }">
+ <template v-if="String(row.isCustoms).trim() === '0' && !row.loadingServiceProviderName">
+ <el-link type="primary" underline="never" @click="handleCustomsAdd(row)"
+ style="font-weight: bold; cursor: pointer; color: #409eff;">
+ 寰呮坊鍔�
+ </el-link>
+ </template>
+
+ <template v-else>
+ <span>{{ row.loadingServiceProviderName }}</span>
+ </template>
+ </template>
+
+ <!-- 鍗歌揣鏈嶅姟 -->
+ <template #customsServiceProviderName="{ row }">
+ <template v-if="String(row.isLoad).trim() === '0' && !row.customsServiceProviderName">
+ <el-link type="primary" underline="never" @click="handleLoadingAdd(row)"
+ style="font-weight: bold; cursor: pointer; color: #409eff;">
+ 寰呮坊鍔�
+ </el-link>
+ </template>
+
+ <template v-else>
+ <span>{{ row.customsServiceProviderName }}</span>
+ </template>
+ </template>
+
+
+
+ <template #menu="{ row, index, size }">
+ <el-tooltip content="鏌ョ湅" placement="top" :enterable="false">
+ <el-link type="primary" icon="el-icon-view" :underline="false" class="link-btn"
+ @click="$refs.crudRef.rowView(row, index)">
+ </el-link>
+ </el-tooltip>
+
+ <el-tooltip content="缂栬緫" placement="top" :enterable="false">
+ <el-link type="primary" icon="el-icon-edit" :underline="false" class="link-btn"
+ @click="$refs.crudRef.rowEdit(row, index)">
+ </el-link>
+ </el-tooltip>
+
+ </template>
+ <template #menu-before="{ row }">
+ <el-tooltip content="杩愯緭璐у搧鐧昏" placement="top">
+ <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
+ v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
+ icon="el-icon-document-add">
+ </el-link>
+ </el-tooltip>
+
+ <el-tooltip content="瀹為檯杩愯緭璁板綍" placement="top">
+ <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
+ icon="el-icon-set-up">
+ </el-link>
+ </el-tooltip>
+
+ <el-tooltip content="纭畾" placement="top">
+ <el-link size="small" type="primary" @click="handleConfirm(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:confirmOrder']" v-if="row.status == 0" :underline="false"
+ icon="el-icon-set-up">
+ </el-link>
+ </el-tooltip>
+
+ <el-tooltip content="浣滃簾" placement="top">
+ <el-link size="small" type="primary" @click="handleClose(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:closeOrder']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
+ icon="el-icon-close">
+ </el-link>
+ </el-tooltip>
+
+ <el-tooltip content="澶嶅埗" placement="top">
+ <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-tooltip>
+
+
+ <el-tooltip content="涓婁紶琛岀▼" placement="top">
+ <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-tooltip>
+
+ <el-tooltip content="鏌ョ湅琛岀▼" placement="top">
+ <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-tooltip>
+
+ <el-tooltip content="瀹屾垚琛岀▼" placement="top">
+ <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-tooltip>
+
+ <!-- <el-tooltip content="鏃ュ織" placement="top">
+ <el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" :underline="false"
+ icon="el-icon-tickets">
+ </el-link>
+ </el-tooltip> -->
+ </template>
+
+ <!-- <template #menu="{row}">
+
+</template> -->
+
+ <template #shipperId-form="{ disabled }">
<div style="display:flex; align-items: center;justify-content: space-between">
- <avue-input-table :props="consignorProps" dataType="string"
- :children="consignorOption" :disabled="disabled"
- :on-load="onShipperLoad" suffixIcon="search"
- v-model="form.shipperId" style="width: 80%"
- @change="changeShipper"
- placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
- <el-button icon="plus" :disabled="disabled" @click="handleAddShipper"></el-button>
+ <avue-input-table :props="consignorProps" dataType="string" :children="consignorOption" :disabled="disabled"
+ :on-load="onShipperLoad" suffixIcon="search" v-model="form.shipperId" style="width: 80%"
+ @change="changeShipper" placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
+ <el-button icon="plus" :disabled="disabled" @click="handleAddShipper"></el-button>
</div>
</template>
- <template #receiverId-form="{disabled}">
+ <template #receiverId-form="{ disabled }">
<div style="display:flex; align-items: center;justify-content: space-between">
- <avue-input-table :props="consignorProps"
- :children="consignorOption" dataType="string"
- :on-load="onConsignorLoad" suffixIcon="search"
- v-model="form.receiverId" :disabled="disabled"
- @change="changeReceiver" style="width: 80%"
- placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
- <el-button icon="plus" :disabled="disabled" @click="handleAddReceiver"></el-button>
+ <avue-input-table :props="consignorProps" :children="consignorOption" dataType="string"
+ :on-load="onConsignorLoad" suffixIcon="search" v-model="form.receiverId" :disabled="disabled"
+ @change="changeReceiver" style="width: 80%" placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
+ <el-button icon="plus" :disabled="disabled" @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"
- @selection-change="selectionChange2"
- >
- <template #count="{row}">
+ <avue-crud v-if="optionType == 'addFinance'" :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>
+ min="0"></el-input-number>
</template>
</avue-crud>
- <h2 v-if="optionType == 'addFinance'">瀹炴姤瀹為攢璐圭敤</h2>
+ <h2 v-if="optionType == 'addFinance'">瀹炴姤瀹為攢璐圭敤1</h2>
<avue-form v-if="optionType == 'addItinerary' || optionType == 'addFinance'" v-model="boxForm" ref="boxFormRef"
- :option="boxFormOption">
+ :option="boxFormOption">
</avue-form>
- <avue-crud
- :option="boxTableOption"
- :data="boxTableData"
- >
+ <avue-crud :option="boxTableOption" :data="boxTableData">
</avue-crud>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" v-if="optionType == 'addItinerary' || optionType == 'addFinance'"
- :loading="pageF.isUploading" @click="submitForm">
+ :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>
@@ -223,10 +219,7 @@
<el-dialog :title="title" v-model="open" class="avue-dialog avue-dialog--top" width="40%">
<div v-if="optionType === 'dropHook'">
- <el-descriptions
- :column="2"
- border
- >
+ <el-descriptions :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>
@@ -237,10 +230,7 @@
</el-descriptions>
</div>
<div v-if="optionType == 'connectHang'">
- <el-descriptions style="margin-bottom: 20px"
- :column="2"
- border
- >
+ <el-descriptions style="margin-bottom: 20px" :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>
@@ -252,10 +242,7 @@
</div>
<div v-if="optionType == 'customs'">
- <el-descriptions style="margin-bottom: 20px"
- :column="2"
- border
- >
+ <el-descriptions style="margin-bottom: 20px" :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.projectName }}</el-descriptions-item>
@@ -267,10 +254,7 @@
</div>
<div v-if="optionType == 'loading'">
- <el-descriptions style="margin-bottom: 20px"
- :column="2"
- border
- >
+ <el-descriptions style="margin-bottom: 20px" :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.projectName }}</el-descriptions-item>
@@ -292,14 +276,8 @@
<el-dialog title="璐у搧淇℃伅鐧昏" v-model="open2" class="avue-dialog avue-dialog--top" width="80%">
- <avue-crud
- :option="goodsTableOption"
- v-model="goodsForm"
- @row-update="rowGoodsUpdate"
- @row-save="rowGoodsSave"
- @row-del="rowGoodsDel"
- :data="goodsTableData" ref="goodsCrudRef"
- >
+ <avue-crud :option="goodsTableOption" v-model="goodsForm" @row-update="rowGoodsUpdate" @row-save="rowGoodsSave"
+ @row-del="rowGoodsDel" :data="goodsTableData" ref="goodsCrudRef">
</avue-crud>
<!-- <template #footer>-->
<!-- <div class="dialog-footer">-->
@@ -312,9 +290,7 @@
</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>
@@ -331,47 +307,59 @@
<el-dialog title="澧炲�间綔涓氱櫥璁�" v-model="open4" class="avue-dialog avue-dialog--top" width="80%">
<el-descriptions :column="3" border>
- <el-descriptions-item label="璋冨害鍗曞彿">{{form.dispatchNo}}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛鍚嶇О">{{form.customerName}}</el-descriptions-item>
- <el-descriptions-item label="椤圭洰鍚嶇О">{{form.projectName}}</el-descriptions-item>
- <el-descriptions-item label="杩愯緭璺嚎">{{form.transportLine}}</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.dispatchNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ form.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰鍚嶇О">{{ form.projectName }}</el-descriptions-item>
+ <el-descriptions-item label="杩愯緭璺嚎">{{ form.transportLine }}</el-descriptions-item>
+ <el-descriptions-item label="杞﹀瀷">{{ form.$actualVehicleType }}</el-descriptions-item>
+ <el-descriptions-item label="杞︾墝">{{ form.licensePlate }}</el-descriptions-item>
</el-descriptions>
- <avue-tabs :option="tabsOption" ref="tabsOptionRef"
- @change="handleChange"></avue-tabs>
+ <avue-tabs :option="tabsOption" ref="tabsOptionRef" @change="handleChange"></avue-tabs>
- <avue-crud v-if="active !== 'tab4'"
- :option="zzItemsTableOption" ref="itemsTableRef"
- :data="zzItemsTableData"
- >
- <template #count="{row}">
- <el-input-number v-model="row.count" placeholder="璁¤垂鏁伴噺"
- :min="0"></el-input-number>
- </template>
- <template #remark="{row}">
- <el-input v-model="row.remark" placeholder="澶囨敞" ></el-input>
- </template>
+ <avue-crud v-if="active !== 'tab4'" :option="zzItemsTableOption" ref="itemsTableRef" :data="zzItemsTableData">
+ <template #count="{ row }">
+ <el-input-number v-model="row.count" placeholder="璁¤垂鏁伴噺" :min="0"></el-input-number>
+ </template>
+ <template #remark="{ row }">
+ <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
+ </template>
- </avue-crud>
+ </avue-crud>
<div v-if="active === 'tab4'">
<h2>瀹炴姤瀹為攢璐圭敤</h2>
- <avue-form v-model="boxForm" ref="boxFormRef"
- :option="boxFormOption">
+ <!-- <avue-form v-model="boxForm" ref="boxFormRef" :option="boxFormOption">
- </avue-form>
- <avue-crud
- :option="boxTableOption"
- :data="boxTableData"
- >
+ </avue-form> -->
+ <avue-crud :option="expenditureTableOption" :data="tmsFinanceDetails">
+ <template #actualFeeAmount="{ row }">
+ <el-input-number v-model="row.actualFeeAmount" :precision="2" :min="0" controls-position="right"
+ placeholder="杈撳叆閲戦" style="width: 100%" />
+ </template>
+
+ <template #currency="{ row }">
+ <el-radio-group v-model="row.currency">
+ <el-radio v-for="item in sys_currency" :key="item.value" :label="item.value">
+ {{ item.label }}
+ </el-radio>
+ </el-radio-group>
+ </template>
+ <template #voucherUrl="{ row }">
+ <avue-upload v-model="row.voucherUrl" :action="'/common/upload2'" type="upload" accept="image/*"
+ @upload-after="(res, done, loading, column) => handleUploadAfter(res, done, loading, column, row)"></avue-upload>
+ </template>
+ <template #remark="{ row }">
+ <el-input v-model="row.remark" placeholder="濉啓澶囨敞" clearable />
+ </template>
+ </avue-crud>
+ <avue-crud :option="boxTableOption" :data="boxTableData">
+
</avue-crud>
</div>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary"
- :loading="pageF.isUploading" @click="submitTabForm">
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitTabForm">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
@@ -382,22 +370,20 @@
<el-dialog title="璋冨害鍗曚綔搴�" v-model="open5" class="avue-dialog avue-dialog--top" width="80%">
<el-descriptions :column="3" border>
- <el-descriptions-item label="璋冨害鍗曞彿">{{form.dispatchNo}}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛鍚嶇О">{{form.customerName}}</el-descriptions-item>
- <el-descriptions-item label="椤圭洰鍚嶇О">{{form.projectName}}</el-descriptions-item>
- <el-descriptions-item label="杩愯緭璺嚎">{{form.transportLine}}</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.dispatchNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ form.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰鍚嶇О">{{ form.projectName }}</el-descriptions-item>
+ <el-descriptions-item label="杩愯緭璺嚎">{{ form.transportLine }}</el-descriptions-item>
+ <el-descriptions-item label="杞﹀瀷">{{ form.$actualVehicleType }}</el-descriptions-item>
+ <el-descriptions-item label="杞︾墝">{{ form.licensePlate }}</el-descriptions-item>
</el-descriptions>
- <avue-form v-model="boxForm" ref="boxFormRef"
- :option="boxFormOption">
+ <avue-form v-model="boxForm" ref="boxFormRef" :option="boxFormOption">
</avue-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary"
- :loading="pageF.isUploading" @click="submitForm5">
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitForm5">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
@@ -409,32 +395,31 @@
<el-dialog title="鎵胯繍鍗曟墦鍗�" v-model="open6" class="avue-dialog avue-dialog--top cydprint" width="80%">
<div v-if="print == 0">
<el-descriptions :column="3" border>
- <el-descriptions-item label="璁㈠崟鍙�">{{form.dispatchNo}}</el-descriptions-item>
- <el-descriptions-item label="鎵胯繍鏃ユ湡">{{form.orderTime}}</el-descriptions-item>
- <el-descriptions-item label="杞︾墝">{{form.licensePlate}}</el-descriptions-item>
- <el-descriptions-item label="璁㈣溅绫诲瀷">{{form.$actualVehicleType}}</el-descriptions-item>
+ <el-descriptions-item label="璁㈠崟鍙�">{{ form.dispatchNo }}</el-descriptions-item>
+ <el-descriptions-item label="鎵胯繍鏃ユ湡">{{ form.orderTime }}</el-descriptions-item>
+ <el-descriptions-item label="杞︾墝">{{ form.licensePlate }}</el-descriptions-item>
+ <el-descriptions-item label="璁㈣溅绫诲瀷">{{ form.$actualVehicleType }}</el-descriptions-item>
- <el-descriptions-item label="鍙告満濮撳悕">{{form.mainDriverName}}</el-descriptions-item>
- <el-descriptions-item label="鐢佃瘽">{{form.mainDriverMobile}}</el-descriptions-item>
- <el-descriptions-item label="鎵樻灦鍙�/鏌滃彿">{{form.shelfCode}}/ {{form.containerNo}}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛鍚嶇О">{{form.customerName}}</el-descriptions-item>
- <el-descriptions-item label="璧锋璺嚎">{{form.transportLine}}</el-descriptions-item>
- <el-descriptions-item label="璋冨害鍛�">{{form.createBy}}</el-descriptions-item>
- <el-descriptions-item label="鏄惁鎵撳嵃">{{form.$isPrint}}</el-descriptions-item>
- <el-descriptions-item label="鍘嗗彶鎵撳嵃娆℃暟">{{form.printCount}}</el-descriptions-item>
+ <el-descriptions-item label="鍙告満濮撳悕">{{ form.mainDriverName }}</el-descriptions-item>
+ <el-descriptions-item label="鐢佃瘽">{{ form.mainDriverMobile }}</el-descriptions-item>
+ <el-descriptions-item label="鎵樻灦鍙�/鏌滃彿">{{ form.shelfCode }}/ {{ form.containerNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ form.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="璧锋璺嚎">{{ form.transportLine }}</el-descriptions-item>
+ <el-descriptions-item label="璋冨害鍛�">{{ form.createBy }}</el-descriptions-item>
+ <el-descriptions-item label="鏄惁鎵撳嵃">{{ form.$isPrint }}</el-descriptions-item>
+ <el-descriptions-item label="鍘嗗彶鎵撳嵃娆℃暟">{{ form.printCount }}</el-descriptions-item>
</el-descriptions>
<h3 class="title" style="color: #333;font-weight: bold;">鍗曟嵁淇℃伅</h3>
- <avue-form v-model="boxForm" ref="boxFormRef"
- :option="boxFormOption">
+ <avue-form v-model="boxForm" ref="boxFormRef" :option="boxFormOption">
</avue-form>
</div>
<div v-else>
<div id="print">
<img src="@/assets/img.png" alt="" style="width: 168px;height: 68px">
- <h3 class="title" >鐝犳捣甯傛眹鐣呬氦閫氭姇璧勬湁闄愬叕鍙�</h3>
+ <h3 class="title">鐝犳捣甯傛眹鐣呬氦閫氭姇璧勬湁闄愬叕鍙�</h3>
<div class="header">
- <div class="order">璁㈠崟鍙凤細{{boxForm.dispatchNo}}</div>
+ <div class="order">璁㈠崟鍙凤細{{ boxForm.dispatchNo }}</div>
<div class="sub-title">璐х墿鎵胯繍鍗曡瘉</div>
</div>
<table>
@@ -444,7 +429,7 @@
</tr>
<tr>
<td>杞︾墝锛歿{ boxForm.licensePlate }}</td>
- <td>璁㈣溅杞﹀瀷: {{boxForm.$actualVehicleType}}</td>
+ <td>璁㈣溅杞﹀瀷: {{ boxForm.$actualVehicleType }}</td>
</tr>
<tr>
<td>鍙告満濮撳悕锛歿{ boxForm.mainDriverName }}</td>
@@ -452,7 +437,7 @@
</tr>
<tr>
- <td>鎵樻灦鍙�/鏌滃彿锛歿{boxForm.shelfCode}}/ {{boxForm.containerNo}}</td>
+ <td>鎵樻灦鍙�/鏌滃彿锛歿{ boxForm.shelfCode }}/ {{ boxForm.containerNo }}</td>
<td>琛岄┒鍙ｅ哺锛歿{ boxForm.portName }}</td>
</tr>
<tr>
@@ -462,7 +447,7 @@
<tr>
<td>瀹㈡埛锛歿{ boxForm.customerName }}</td>
- <td>鑱旂粶浜猴細{{ boxForm.contactName }} {{ boxForm.contactPhone }} </td>
+ <td>鑱旂粶浜猴細{{ boxForm.contactName }} {{ boxForm.contactPhone }} </td>
</tr>
<tr>
<td colspan="2">
@@ -476,8 +461,8 @@
</tr>
<tr>
<td>
- <div style="line-height: 24px">璋冨害鍛橈細{{boxForm.createBy}}</div>
- <div style="line-height: 42px">鎵胯繍鍙告満锛歿{boxForm.mainDriverName}}</div>
+ <div style="line-height: 24px">璋冨害鍛橈細{{ boxForm.createBy }}</div>
+ <div style="line-height: 42px">鎵胯繍鍙告満锛歿{ boxForm.mainDriverName }}</div>
</td>
<td>鏀惰揣浜虹瀛�/鐩栫珷锛�</td>
</tr>
@@ -489,7 +474,7 @@
<div>3.涓�鍒囦氦鏄撳潎鎸夋湰鍏徃涔嬫爣鍑嗙粡钀ユ潯娆句负鍑嗭紝鏈叕鍙镐箣璐ｄ换鍦ㄦ煇浜涙儏鍐典笅浼氳璞佸厤鎴栭檺 (鍒跺鏈夐』瑕侊紝娆㈣繋绱㈠彇)锛�</div>
</div>
-
+
</div>
@@ -497,9 +482,8 @@
<template #footer>
<div class="dialog-footer">
<el-button @click="print = 0" v-if="print == 1">閲嶆柊濉啓</el-button>
- <el-button type="primary"
- :loading="pageF.isUploading" @click="submitForm6">
- {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitForm6">
+ {{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�2' }}
</el-button>
<el-button @click="open6 = false">鍙� 娑�</el-button>
@@ -509,24 +493,16 @@
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
<el-dialog title="璋冨害鍗曞鍏�" v-model="upload.open" width="400px" append-to-body>
- <el-upload
- ref="uploadRef"
- :limit="1"
- accept=".xlsx, .xls"
- :headers="upload.headers"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- :auto-upload="false"
- drag
- >
+ <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
<template #tip>
<div class="el-upload__tip text-center">
<span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+ @click="importTemplate">涓嬭浇妯℃澘</el-link>
</div>
</template>
</el-upload>
@@ -540,49 +516,36 @@
<el-dialog title="棰勯厤璁㈠崟瑁呭嵏璐х偣鐧昏" v-model="open7" class="avue-dialog avue-dialog--top" width="80%">
- <avue-form v-model="shipperReceiverForm"
- ref="shipperReceiverFormRef"
- :option="shipperReceiverFormOption">
- <template #dispatchNos="{disabled}">
- <div class="dispatchNos">
- <el-tag
- v-for="tag in shipperReceiverForm.dispatchNos"
- :key="tag"
- closable
- @close="handleCloseDispatchNo(tag)"
- >
- {{ tag }}
- </el-tag>
- </div>
+ <avue-form v-model="shipperReceiverForm" ref="shipperReceiverFormRef" :option="shipperReceiverFormOption">
+ <template #dispatchNos="{ disabled }">
+ <div class="dispatchNos">
+ <el-tag v-for="tag in shipperReceiverForm.dispatchNos" :key="tag" closable
+ @close="handleCloseDispatchNo(tag)">
+ {{ tag }}
+ </el-tag>
+ </div>
</template>
- <template #shipperId="{disabled}">
+ <template #shipperId="{ disabled }">
<div style="display:flex; align-items: center;justify-content: space-between">
- <avue-input-table :props="consignorProps" dataType="string"
- :children="consignorOption" :disabled="disabled"
- :on-load="onShipperLoad" suffixIcon="search"
- v-model="shipperReceiverForm.shipperId" style="width: 80%"
- @change="changeShipper2"
- placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
- <el-button icon="plus" :disabled="disabled" @click="handleAddShipper2"></el-button>
+ <avue-input-table :props="consignorProps" dataType="string" :children="consignorOption" :disabled="disabled"
+ :on-load="onShipperLoad" suffixIcon="search" v-model="shipperReceiverForm.shipperId" style="width: 80%"
+ @change="changeShipper2" placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
+ <el-button icon="plus" :disabled="disabled" @click="handleAddShipper2"></el-button>
</div>
</template>
- <template #receiverId="{disabled}">
+ <template #receiverId="{ disabled }">
<div style="display:flex; align-items: center;justify-content: space-between">
- <avue-input-table :props="consignorProps"
- :children="consignorOption" dataType="string"
- :on-load="onConsignorLoad" suffixIcon="search"
- v-model="shipperReceiverForm.receiverId" :disabled="disabled"
- @change="changeReceiver2" style="width: 80%"
- placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
- <el-button icon="plus" :disabled="disabled" @click="handleAddReceiver2"></el-button>
+ <avue-input-table :props="consignorProps" :children="consignorOption" dataType="string"
+ :on-load="onConsignorLoad" suffixIcon="search" v-model="shipperReceiverForm.receiverId"
+ :disabled="disabled" @change="changeReceiver2" style="width: 80%" placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
+ <el-button icon="plus" :disabled="disabled" @click="handleAddReceiver2"></el-button>
</div>
</template>
</avue-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary"
- :loading="pageF.isUploading" @click="submitZxForm">
+ <el-button type="primary" :loading="pageF.isUploading" @click="submitZxForm">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
@@ -591,6 +554,10 @@
</template>
</el-dialog>
+ <el-dialog title="瀵煎叆鏃ュ織" v-model="importLogVisible" width="80%">
+ <avue-crud :data="importLogData" :option="importLogOption" :table-loading="importLogLoading"
+ @on-load="getImportLogList"></avue-crud>
+ </el-dialog>
</basicContainer>
</template>
@@ -615,46 +582,50 @@
checkCloseOrder,
closeOrder,
printDispatchOrder,
- importTemplateTmsDispatchOrder,ypdddjSumbit
+ importTemplateTmsDispatchOrder, ypdddjSumbit,
+ tmsTmsDispatchOrderImportLog,
+ saveTmsFinanceDetail2
} from "@/api/tms/tmsDispatchOrder";
import useCurrentInstance from "@/utils/useCurrentInstance";
-import {computed, onMounted, reactive, ref, toRefs, watch, getCurrentInstance, nextTick} from "vue";
-import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
-import {usePagePlus} from "@/hooks/usePagePlus";
-import {hasPermission} from "@/utils/permissionUtils";
-import {getTmsProject, listTmsProject} from "@/api/tms/tmsProject";
-import {getTmsServiceProvider, listTmsServiceProvider} from "@/api/tms/tmsServiceProvider";
-import {getTmsLoadingServiceProvider, listTmsLoadingServiceProvider} from "@/api/tms/tmsLoadingServiceProvider";
-import {getTmsCustomsServiceProvider, listTmsCustomsServiceProvider} from "@/api/tms/tmsCustomsServiceProvider";
-import {getTmsDriver, listTmsDriver} from "@/api/tms/tmsDriver";
-import {getTmsVehicle, listTmsVehicle} from "@/api/tms/tmsVehicle";
-import {getTmsContainer, listTmsContainer} from "@/api/tms/tmsContainer";
-import {getTmsShelf, listTmsShelf} from "@/api/tms/tmsShelf";
-import {addTmsConsignor, getTmsConsignor, listTmsConsignor} from "@/api/tms/tmsConsignor";
-import {ElMessage, ElMessageBox, type ElUpload} from "element-plus";
-import {addTmsTrip, listTmsTrip} from "@/api/tms/tmsTrip";
+import { computed, onMounted, reactive, ref, toRefs, watch, getCurrentInstance, nextTick } from "vue";
+import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
+import { usePagePlus } from "@/hooks/usePagePlus";
+import { hasPermission } from "@/utils/permissionUtils";
+import { getTmsProject, listTmsProject } from "@/api/tms/tmsProject";
+import { getTmsServiceProvider, listTmsServiceProvider } from "@/api/tms/tmsServiceProvider";
+import { getTmsLoadingServiceProvider, listTmsLoadingServiceProvider } from "@/api/tms/tmsLoadingServiceProvider";
+import { getTmsCustomsServiceProvider, listTmsCustomsServiceProvider } from "@/api/tms/tmsCustomsServiceProvider";
+import { getTmsDriver, listTmsDriver } from "@/api/tms/tmsDriver";
+import { getTmsVehicle, listTmsVehicle } from "@/api/tms/tmsVehicle";
+import { getTmsContainer, listTmsContainer } from "@/api/tms/tmsContainer";
+import { getTmsShelf, listTmsShelf } from "@/api/tms/tmsShelf";
+import { addTmsConsignor, getTmsConsignor, listTmsConsignor } from "@/api/tms/tmsConsignor";
+import { ElMessage, ElMessageBox, type ElUpload } from "element-plus";
+import { addTmsTrip, listTmsTrip } from "@/api/tms/tmsTrip";
import {
addTmsFinanceDetail,
listTmsFinanceDetail,
saveTmsFinanceDetail,
updateTmsFinanceDetail
} from "@/api/tms/tmsFinanceDetail";
-import {getTmsProductInfo, listTmsProductInfo} from "@/api/tms/tmsProductInfo";
-import {addTmsGoodsDetail, delTmsGoodsDetail, listTmsGoodsDetail, updateTmsGoodsDetail} from "@/api/tms/tmsGoodsDetail";
-import {getTransportRouteVi, listTransportRouteVi} from "@/api/tms/tmsTransportRouteVi";
-import {listTmsQuoteItem} from "@/api/tms/tmsQuotePlanItem";
-import {$DialogForm, randomId} from '@smallwei/avue'
-import {getTmsCustomerInfo, listTmsCustomerInfo} from "@/api/tms/tmsCustomerInfo";
-import {getAddressCode} from "@/api/tms/tmsRegion";
-import {mapRegeo} from "@/api/common";
-import {getDicts} from "@/api/system/dict/data";
-import {pushTmsQuoteFee} from "@/api/tms/tmsQuoteFee";
+import { getTmsProductInfo, listTmsProductInfo } from "@/api/tms/tmsProductInfo";
+import { addTmsGoodsDetail, delTmsGoodsDetail, listTmsGoodsDetail, updateTmsGoodsDetail } from "@/api/tms/tmsGoodsDetail";
+import { getTransportRouteVi, listTransportRouteVi } from "@/api/tms/tmsTransportRouteVi";
+import { listTmsQuoteItem } from "@/api/tms/tmsQuotePlanItem";
+import { $DialogForm, randomId } from '@smallwei/avue'
+import { getTmsCustomerInfo, listTmsCustomerInfo } from "@/api/tms/tmsCustomerInfo";
+import { getAddressCode } from "@/api/tms/tmsRegion";
+import { mapRegeo } from "@/api/common";
+import { getDicts } from "@/api/system/dict/data";
+import { pushTmsQuoteFee } from "@/api/tms/tmsQuoteFee";
import { $Print } from '@smallwei/avue'
-import {getToken} from "@/utils/auth";
+import { getToken } from "@/utils/auth";
-const {appContext} = getCurrentInstance();
+const { appContext } = getCurrentInstance();
-const {proxy} = useCurrentInstance();
+const { proxy } = useCurrentInstance(
+);
+const { fee_type, sys_currency } = proxy.useDict('fee_type', 'sys_currency')
const crudRef = ref();
const boxFormRef = ref();
const goodsCrudRef = ref();
@@ -696,20 +667,28 @@
goodsForm: <any>{},
open3: false,
actualForm: <any>{},
- isCustoms:<any> -1,
+ isCustoms: <any>-1,
isLoad: -1,
- open5:false,
- open6:false,
- open7:false,
- zxhdjSingle:false,
+ open5: false,
+ open6: false,
+ open7: false,
+ zxhdjSingle: false,
})
const {
queryParams, form, page, selectionList, open3,
boxTableData, optionType,
boxFormOption, boxForm, boxTableOption, title, open, open2,
- goodsTableData, goodsForm, actualForm, selectionList2,isCustoms,isLoad,open5,open6,open7,zxhdjSingle
+ goodsTableData, goodsForm, actualForm, selectionList2, isCustoms, isLoad, open5, open6, open7, zxhdjSingle
} = toRefs(data);
const option = ref({
+ menuType: 'icon',
+ viewBtn: false, // 鍏抽棴鍘熺敓鏌ョ湅
+ editBtn: false, // 鍏抽棴鍘熺敓缂栬緫
+
+ searchIndex: 7, // 鍏抽敭锛氭姌鍙犳椂鏄剧ず鐨勪釜鏁帮紙鏍规嵁浣犵殑瀛楁鏁伴噺璋冩暣锛�
+ searchIcon: true, // 鍏抽敭锛氭樉绀烘姌鍙�/灞曞紑鎸夐挳
+ searchMenuSpan: 6, // 鎼滅储鎸夐挳鏍忓崰浣嶏紙鍙�夛級
+
pageKey: 'TmsDispatchOrder',
rowKey: 'id',
labelWidth: 130,
@@ -732,7 +711,7 @@
message: "璇烽�夋嫨杩愯緭璺嚎", trigger: "change"
}
],
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
change: (val: any) => {
const table = crudRef.value?.getPropRef?.('quoteDetailId')?.$refs?.temp;
if (!table) return;
@@ -799,7 +778,7 @@
label: 'transportRoute',
value: 'quoteDetailId'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -809,7 +788,7 @@
return callback(res.data || {})
})
} else {
- listTransportRouteVi({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTransportRouteVi({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -856,7 +835,7 @@
message: "璁㈠崟绫诲瀷涓嶈兘涓虹┖", trigger: "change"
}
],
- change: ({value}: any) => {
+ change: ({ value }: any) => {
option.value.group.forEach((item: any) => {
if (item.prop == 'pcxx') {
item.column.shipperId.rules.forEach((cItem: any) => {
@@ -1046,7 +1025,7 @@
],
},
isUrgent: {
- label: '鏄惁绱ф��',value: '1',
+ label: '鏄惁绱ф��', value: '1',
display: true,
type: 'radio', dicUrl: '/system/dict/data/type/sys_number_is', dataType: 'string',
rules: [
@@ -1121,7 +1100,7 @@
message: "鏄惁鏄嚜钀ヨ溅闃熶笉鑳戒负绌�", trigger: "change"
}
],
- change: ({value}: any) => {
+ change: ({ value }: any) => {
console.log(value)
option.value.group.forEach((item: any) => {
if (item.prop == 'pcxx') {
@@ -1139,7 +1118,7 @@
},
},
- commissionModel:{
+ commissionModel: {
label: '鎻愭垚妯″紡',
display: true, type: 'radio', dicUrl: '/system/dict/data/type/commission_model', dataType: 'string',
rules: [
@@ -1170,7 +1149,7 @@
});
}
},
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchLabelWidth: 100,
@@ -1214,7 +1193,7 @@
label: 'serviceShortName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1224,7 +1203,7 @@
return callback(res.data || {})
})
} else {
- listTmsServiceProvider({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsServiceProvider({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -1281,7 +1260,7 @@
label: 'driverName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1294,7 +1273,7 @@
listTmsDriver({
pageSize: page.pageSize,
pageNum: page.currentPage, ...data,
- carrierType: form.value.operationMode,vehicleProviderId:form.value.vehicleProviderId
+ carrierType: form.value.operationMode, vehicleProviderId: form.value.vehicleProviderId
}).then(res => {
return callback({
total: res.total,
@@ -1347,7 +1326,7 @@
label: 'driverName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1359,7 +1338,7 @@
} else {
listTmsDriver({
pageSize: page.pageSize,
- pageNum: page.currentPage, ...data,vehicleProviderId:form.value.vehicleProviderId,
+ pageNum: page.currentPage, ...data, vehicleProviderId: form.value.vehicleProviderId,
carrierType: form.value.operationMode
}).then(res => {
return callback({
@@ -1433,7 +1412,7 @@
label: 'licensePlate',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1446,7 +1425,7 @@
listTmsVehicle({
pageSize: page.pageSize,
pageNum: page.currentPage, ...data,
- carrierType: form.value.operationMode,serviceProviderId:form.value.vehicleProviderId
+ carrierType: form.value.operationMode, serviceProviderId: form.value.vehicleProviderId
}).then(res => {
return callback({
total: res.total,
@@ -1528,7 +1507,7 @@
});
}
},
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchLabelWidth: 100,
@@ -1562,7 +1541,7 @@
label: 'containerCode',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1572,7 +1551,7 @@
return callback(res.data || {})
})
} else {
- listTmsContainer({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsContainer({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -1602,7 +1581,7 @@
});
}
},
- type: 'table', suffixIcon: 'search',dataType: 'string',
+ type: 'table', suffixIcon: 'search', dataType: 'string',
children: {
border: true,
searchLabelWidth: 100,
@@ -1634,7 +1613,7 @@
label: 'shelfCode',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -1644,7 +1623,7 @@
return callback(res.data || {})
})
} else {
- listTmsShelf({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsShelf({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -1740,17 +1719,54 @@
display: false,
search: true,
},
+ licensePlate: {
+ label: '杞︾墝鍙�', minWidth: 120,
+ display: false,
+ search: true,
+ },
customerName: {
label: '瀹㈡埛',
display: false, minWidth: 120,
search: true,
},
+ mainDriverName: {
+ label: '涓婚┚椹跺憳',
+ display: false, minWidth: 120,
+ search: true,
+ },
+ requiredVehicleTypes: {
+ label: '涓嬪崟杞﹀瀷', minWidth: 130,
+ display: false, type: 'select', search: true,
+ dicUrl: '/system/dict/data/type/vehicle_type',
+ dataType: 'string',
+ },
+ createTimeRange: {
+ label: '鍒涘缓鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
+ updateTimeRange: {
+ label: '鏇存柊鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
+ loadingServiceProviderName: {
+ label: '瑁呰揣鏈嶅姟鍟嗗悕绉�', minWidth: 150,
+ display: false,
+ search: true,
+ },
+ customsServiceProviderName: {
+ label: '鎶ュ叧鏈嶅姟鍟嗗悕绉�', minWidth: 150,
+ display: false,
+ search: true,
+ },
projectName: {
label: '椤圭洰鍚嶇О',
display: false, minWidth: 120,
search: true,
},
+
contractName: {
label: '鍏宠仈鍚堝悓鍚嶇О', minWidth: 120,
display: false,
@@ -1784,16 +1800,7 @@
search: true,
},
- loadingServiceProviderName: {
- label: '瑁呰揣鏈嶅姟鍟嗗悕绉�', minWidth: 150,
- display: false,
- search: true,
- },
- customsServiceProviderName: {
- label: '鎶ュ叧鏈嶅姟鍟嗗悕绉�', minWidth: 150,
- display: false,
- search: true,
- },
+
isUrgent: {
label: '鏄惁绱ф��',
display: false, minWidth: 100,
@@ -1822,24 +1829,13 @@
type: 'select', dicUrl: '/system/dict/data/type/sys_number_is', dataType: 'string',
},
- mainDriverName: {
- label: '涓婚┚椹跺憳',
- display: false, minWidth: 120,
- search: true,
- },
// requiredVehicleTypes: {
// label: '瑕佹眰杩愯緭宸ュ叿绫诲瀷',
// display: false,
// search: true,
// },
- requiredVehicleTypes: {
- label: '涓嬪崟杞﹀瀷',minWidth: 130,
- display: false, type: 'select', search: true,
- dicUrl: '/system/dict/data/type/vehicle_type',
- dataType: 'string',
- },
actualVehicleType: {
label: '娲惧嚭杞﹀瀷', minWidth: 130,
display: false,
@@ -1848,11 +1844,7 @@
},
- licensePlate: {
- label: '杞︾墝鍙�', minWidth: 120,
- display: false,
- search: true,
- },
+
shipperName: {
label: '瑁呰揣鐐瑰悕绉�',
@@ -1897,7 +1889,7 @@
inStatusList: {
label: '鐘舵��', minWidth: 150,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/tms_dispatch_order_status',
- display: false,multiple:true,
+ display: false, multiple: true,
hide: true,
search: true,
@@ -1930,11 +1922,7 @@
hide: false,
search: false,
},
- createTimeRange: {
- label: '鍒涘缓鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
- format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
- valueFormat: 'YYYY-MM-DD',
- },
+
updateBy: {
label: '鏇存柊浜�', minWidth: 150,
addDisplay: false,
@@ -1951,11 +1939,7 @@
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,
@@ -1992,8 +1976,8 @@
tripType: {
label: '琛岀▼绫诲瀷',
display: true,
- change: function ({value}: any) {
- if (value == '5'){
+ change: function ({ value }: any) {
+ if (value == '5') {
itineraryOption.value.column.iscc.display = true
}
},
@@ -2140,7 +2124,7 @@
}
],
},
- currency:{
+ currency: {
label: '甯佺',
display: true,
type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/sys_currency',
@@ -2160,7 +2144,7 @@
action: '/common/upload2',
},
- remark:{
+ remark: {
label: '澶囨敞',
type: 'textarea', minRows: 3, maxRows: 5, span: 24
},
@@ -2203,7 +2187,7 @@
label: '閲戦',
display: true,
},
- currency:{
+ currency: {
label: '甯佺',
display: true,
type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/sys_currency',
@@ -2216,7 +2200,7 @@
type: 'upload',
action: '/common/upload2',
},
- remark:{
+ remark: {
label: '澶囨敞',
},
@@ -2330,7 +2314,7 @@
label: 'licensePlate',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -2340,7 +2324,7 @@
return callback(res.data || {})
})
} else {
- listTmsVehicle({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsVehicle({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -2384,7 +2368,7 @@
label: 'driverName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -2394,7 +2378,7 @@
return callback(res.data || {})
})
} else {
- listTmsDriver({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsDriver({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -2414,7 +2398,7 @@
labelWidth: 120,
column: {
customsServiceProviderId: {
- label: '鎶ュ叧鏈嶅姟鍟�', span:24,
+ label: '鎶ュ叧鏈嶅姟鍟�', span: 24,
display: true,
rules: [
{
@@ -2439,22 +2423,22 @@
border: true,
searchLabelWidth: 100,
searchMenuSpan: 5,
- column:{
+ column: {
serviceCode: {
label: '鏈嶅姟鍟嗙紪鐮�',
search: true,
},
serviceShortName: {
- label: '鏈嶅姟鍟嗙畝绉�',minWidth:150,
+ label: '鏈嶅姟鍟嗙畝绉�', minWidth: 150,
search: true,
},
serviceName: {
- label: '鏈嶅姟鍟嗗叏绉�',search: true,
+ label: '鏈嶅姟鍟嗗叏绉�', search: true,
},
serviceType: {
- label: '鏈嶅姟绫诲瀷',minWidth:150,
+ label: '鏈嶅姟绫诲瀷', minWidth: 150,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/service_type',
- multiple:true,
+ multiple: true,
search: true,
},
}
@@ -2463,7 +2447,7 @@
label: 'serviceShortName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -2473,7 +2457,7 @@
return callback(res.data || {})
})
} else {
- listTmsCustomsServiceProvider({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsCustomsServiceProvider({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -2492,7 +2476,7 @@
labelWidth: 120,
column: {
loadingServiceProviderId: {
- label: '瑁呭嵏鏈嶅姟鍟�',span:24,
+ label: '瑁呭嵏鏈嶅姟鍟�', span: 24,
display: true,
rules: [
{
@@ -2517,22 +2501,22 @@
border: true,
searchLabelWidth: 100,
searchMenuSpan: 5,
- column:{
+ column: {
serviceCode: {
label: '鏈嶅姟鍟嗙紪鐮�',
search: true,
},
serviceShortName: {
- label: '鏈嶅姟鍟嗙畝绉�',minWidth:150,
+ label: '鏈嶅姟鍟嗙畝绉�', minWidth: 150,
search: true,
},
serviceName: {
- label: '鏈嶅姟鍟嗗叏绉�',search: true,
+ label: '鏈嶅姟鍟嗗叏绉�', search: true,
},
serviceType: {
- label: '鏈嶅姟绫诲瀷',minWidth:150,
+ label: '鏈嶅姟绫诲瀷', minWidth: 150,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/service_type',
- multiple:true,
+ multiple: true,
search: true,
},
}
@@ -2541,7 +2525,7 @@
label: 'serviceShortName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -2551,7 +2535,7 @@
return callback(res.data || {})
})
} else {
- listTmsLoadingServiceProvider({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsLoadingServiceProvider({ pageSize: page.pageSize, pageNum: page.currentPage, ...data }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -2569,8 +2553,8 @@
menuBtn: false,
labelWidth: 120,
column: {
- closeWhy:{
- label: '浣滃簾鍘熷洜',span:24,
+ closeWhy: {
+ label: '浣滃簾鍘熷洜', span: 24,
type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/close_why',
rules: [
{
@@ -2579,10 +2563,10 @@
}
],
},
- closeWhyRemark:{
+ closeWhyRemark: {
label: '浣滃簾鍘熷洜璇存槑',
type: 'textarea',
- span:24,
+ span: 24,
},
}
})
@@ -2634,7 +2618,7 @@
label: 'productName',
value: 'id'
},
- onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -2908,7 +2892,7 @@
name: 'tab4',
value: '3',
}
- ]
+ ]
})
const tabsOptionRef = ref();
const active = ref('tab1');
@@ -2920,16 +2904,16 @@
menu: false,
selection: false,
column: {
- freeName:{
+ freeName: {
label: '璐圭敤鍚嶇О',
},
- unit:{
+ unit: {
label: '璁￠噺鍗曚綅',
},
- count:{
- label : '璁¤垂鏁伴噺'
+ count: {
+ label: '璁¤垂鏁伴噺'
},
- remark:{
+ remark: {
label: '澶囨敞'
}
}
@@ -2973,20 +2957,20 @@
},
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
- if (selection.length > 0){
+ if (selection.length > 0) {
isCustoms.value = selection[0].isCustoms;
- isLoad.value = selection[0].isLoad ;
- }else{
+ isLoad.value = selection[0].isLoad;
+ } else {
isCustoms.value = -1;
isLoad.value = -1;
}
isCustoms.value = isCustoms.value == 0 && !pageF.single ? 0 : -1;
isLoad.value = isLoad.value == 0 && !pageF.single ? 0 : -1;
- zxhdjSingle.value = pageF.multiple|| true;
- let yp = selection.filter((item:any) =>{
+ zxhdjSingle.value = pageF.multiple || true;
+ let yp = selection.filter((item: any) => {
return item.orderType == 0
});
- if(yp.length > 0){
+ if (yp.length > 0) {
zxhdjSingle.value = false;
}
},
@@ -2998,8 +2982,8 @@
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.orderTimeRange, 'orderTime') || {};
return params;
},
- handleBeforeOpenFunc:(type:string)=>{
- if(type == 'add'){
+ handleBeforeOpenFunc: (type: string) => {
+ if (type == 'add') {
form.value = {};
}
}
@@ -3057,8 +3041,10 @@
const handleUploadItinerary = (row: any) => {
optionType.value = 'addItinerary';
boxFormOption.value = itineraryOption.value;
+ console.log(itineraryOption.value);
+
boxTableOption.value = itineraryTableOption.value;
- listTmsTrip({dispatchOrderId: row.id, pageNum: 1, pageSize: 999}).then(res => {
+ listTmsTrip({ dispatchOrderId: row.id, pageNum: 1, pageSize: 999 }).then(res => {
boxTableData.value = res.rows || [];
pageF.open = true;
pageF.title = '涓婁紶琛岀▼';
@@ -3071,6 +3057,8 @@
vehicleNumber: row.licensePlate,
vehicleId: row.vehicleId,
}
+ console.log(boxForm.value);
+
})
}
const cancelBox = () => {
@@ -3126,7 +3114,7 @@
const handleLogItinerary = (row: any) => {
optionType.value = 'view';
boxTableOption.value = itineraryTableOption.value;
- listTmsTrip({dispatchOrderId: row.id, pageNum: 1, pageSize: 999}).then(res => {
+ listTmsTrip({ dispatchOrderId: row.id, pageNum: 1, pageSize: 999 }).then(res => {
boxTableData.value = res.rows || [];
pageF.open = true;
pageF.title = '鏌ョ湅琛岀▼';
@@ -3138,7 +3126,7 @@
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) => {
return {
@@ -3229,8 +3217,9 @@
}).finally(() => {
pageF.isUploading = false;
})
- }else if (optionType.value === 'customs') {
- customsOrder({id:form.value.id,
+ } else if (optionType.value === 'customs') {
+ customsOrder({
+ id: form.value.id,
customsServiceProviderId: form.value.customsServiceProviderId,
customsServiceProviderName: form.value.customsServiceProviderName,
}).then(res => {
@@ -3243,8 +3232,9 @@
}).finally(() => {
pageF.isUploading = false;
})
- }else if (optionType.value === 'loading') {
- loadingOrder({id:form.value.id,
+ } else if (optionType.value === 'loading') {
+ loadingOrder({
+ id: form.value.id,
loadingServiceProviderId: form.value.loadingServiceProviderId,
loadingServiceProviderName: form.value.loadingServiceProviderName,
}).then(res => {
@@ -3257,7 +3247,7 @@
}).finally(() => {
pageF.isUploading = false;
})
- }else {
+ } else {
connectHang({
dispatchId: form.value.id,
vehicleId: form.value.vehicleId,
@@ -3281,7 +3271,7 @@
}
const handleAddGoods = (row: any) => {
- listTmsGoodsDetail({dispatchId: row.id, pageSize: 999, pageNum: 1}).then(res => {
+ listTmsGoodsDetail({ dispatchId: row.id, pageSize: 999, pageNum: 1 }).then(res => {
goodsTableData.value = res.rows || [];
form.value = row;
open2.value = true;
@@ -3355,7 +3345,7 @@
selectionList2.value = selection;
}
-const onShipperLoad = ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+const onShipperLoad = ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -3374,10 +3364,10 @@
if (districtId) data.districtId = districtId;
if (streetId) data.streetId = streetId;
}
- if (shipperReceiverForm.value.customerId ){
+ if (shipperReceiverForm.value.customerId) {
form.value.customerId = shipperReceiverForm.value.customerId;
}
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data,customerId: form.value.customerId}).then(res => {
+ listTmsConsignor({ pageSize: page.pageSize, pageNum: page.currentPage, ...data, customerId: form.value.customerId }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -3385,7 +3375,7 @@
})
}
}
-const onConsignorLoad = ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+const onConsignorLoad = ({ page, value, data }: { page: any, value: any, data: any }, callback: any) => {
if (value) {
let id = value;
if (Array.isArray(value)) {
@@ -3404,10 +3394,10 @@
if (districtId) data.districtId = districtId;
if (streetId) data.streetId = streetId;
}
- if (shipperReceiverForm.value.customerId ){
+ if (shipperReceiverForm.value.customerId) {
form.value.customerId = shipperReceiverForm.value.customerId;
}
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data,customerId: form.value.customerId}).then(res => {
+ listTmsConsignor({ pageSize: page.pageSize, pageNum: page.currentPage, ...data, customerId: form.value.customerId }).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -3415,7 +3405,7 @@
})
}
}
-const changeShipper = ({value}: any) => {
+const changeShipper = ({ value }: any) => {
if (value) {
let id = value;
@@ -3450,7 +3440,7 @@
})
}
}
-const changeReceiver = ({value}: any) => {
+const changeReceiver = ({ value }: any) => {
if (value) {
let id = value;
@@ -3486,13 +3476,13 @@
})
}
}
-const consignorAddOption =ref({
+const consignorAddOption = ref({
labelWidth: 120,
group: [
{
label: '鍩虹淇℃伅',
prop: 'jcxx',
- column:{
+ column: {
// consignorCode: {
// label: '瑁呭嵏璐х偣缂栫爜',minWidth: 150,
// addDisplay: false, disabled: true,
@@ -3508,7 +3498,7 @@
// ],
// },
consignorName: {
- label: '瑁呭嵏璐х偣鍚嶇О',minWidth: 150,
+ label: '瑁呭嵏璐х偣鍚嶇О', minWidth: 150,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
@@ -3521,8 +3511,8 @@
}
],
},
- customerName:{
- label: '鎵�灞炲鎴�',minWidth: 150,disabled: true,
+ customerName: {
+ label: '鎵�灞炲鎴�', minWidth: 150, disabled: true,
},
// customerId: {
// label: '鎵�灞炲鎴�',minWidth: 150,
@@ -3617,7 +3607,7 @@
// ],
// },
consignorType: {
- label: '瑁呭嵏璐х偣绫诲瀷',minWidth: 150,
+ label: '瑁呭嵏璐х偣绫诲瀷', minWidth: 150,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
addDisplay: true,
editDisplay: true,
@@ -3636,9 +3626,9 @@
{
label: '鑱旂郴浜轰俊鎭�',
prop: 'lxrxx',
- column:{
+ column: {
contactName: {
- label: '鑱旂郴浜哄鍚�',minWidth: 150,
+ label: '鑱旂郴浜哄鍚�', minWidth: 150,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
@@ -3652,7 +3642,7 @@
],
},
contactPhone: {
- label: '鑱旂郴浜虹數璇�',minWidth: 150,
+ label: '鑱旂郴浜虹數璇�', minWidth: 150,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
@@ -3660,7 +3650,7 @@
search: false,
},
contactEmail: {
- label: '鑱旂郴浜洪偖绠�',minWidth: 150,
+ label: '鑱旂郴浜洪偖绠�', minWidth: 150,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
@@ -3672,12 +3662,12 @@
{
label: '鍦板潃淇℃伅',
prop: 'dzxx',
- column:{
+ column: {
mapLocationDetail: {
- label: '鍦板浘浣嶇疆',minWidth: 150,
+ label: '鍦板浘浣嶇疆', minWidth: 150,
addDisplay: true,
- editDisplay: true,span:24,
+ editDisplay: true, span: 24,
viewDisplay: true,
hide: true,
search: false,
@@ -3697,23 +3687,23 @@
// 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")
- }
- });
+ 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")
+ }
+ });
}
},
},
@@ -3733,9 +3723,9 @@
// },
electronicFenceRange: {
label: '鐢靛瓙鍥存爮鑼冨洿',
- addDisplay: true,minWidth: 150,
+ addDisplay: true, minWidth: 150,
editDisplay: true,
- viewDisplay: true,append:'绫�',
+ viewDisplay: true, append: '绫�',
hide: false,
search: true,
rules: [
@@ -3750,12 +3740,12 @@
{
label: '鍏朵粬淇℃伅',
prop: 'qtyxx',
- column:{
+ column: {
remark: {
- label: '澶囨敞',minWidth: 150,
+ label: '澶囨敞', minWidth: 150,
type: 'textarea', minRows: 3, maxRows: 5,
addDisplay: true,
- editDisplay: true,span:24,
+ editDisplay: true, span: 24,
viewDisplay: true,
hide: true,
search: false,
@@ -3768,7 +3758,7 @@
const dialForm = ref();
const handleAddShipper = () => {
- if (!form.value.customerId){
+ if (!form.value.customerId) {
return ElMessage.error('璇峰厛閫夋嫨杩愯緭璺嚎');
}
form2.value = {
@@ -3778,33 +3768,33 @@
};
dialForm.value = $DialogForm(appContext)({
title: '鏂板瑁呰揣鍦�',
- data:form2.value,
+ data: form2.value,
width: '80%',
option: consignorAddOption.value,
menuPosition: 'right',
- callback: (res:any,) => {
+ callback: (res: any,) => {
let data1 = res.data;
- if (data1.mapLocationDetail){
- data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ if (data1.mapLocationDetail) {
+ data1.mapLocation = data1.mapLocationDetail[0] + ',' + data1.mapLocationDetail[1];
data1.addressDetail = data1.mapLocationDetail[2]
}
- addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ addTmsConsignor({ ...form2.value, ...data1 }).then(res2 => {
let active = res2.data || {};
if (active) {
let shipperRegionCode = '';
- if (active.provinceId){
+ if (active.provinceId) {
shipperRegionCode = active.provinceId;
}
- if (active.cityId){
- shipperRegionCode =shipperRegionCode+ ","+active.cityId;
+ if (active.cityId) {
+ shipperRegionCode = shipperRegionCode + "," + active.cityId;
}
- if (active.districtId){
- shipperRegionCode =shipperRegionCode+ ","+active.districtId;
+ if (active.districtId) {
+ shipperRegionCode = shipperRegionCode + "," + active.districtId;
}
- if (active.streetId){
- shipperRegionCode =shipperRegionCode+ ","+active.streetId;
+ if (active.streetId) {
+ shipperRegionCode = shipperRegionCode + "," + active.streetId;
}
Object.assign(form.value, {
shipperId: active.id,
@@ -3812,12 +3802,12 @@
shipperRegionLabel: active.regionLabel,
shipperAddress: active.addressDetail,
shipperMobile: active.contactPhone,
- shipperRegionCode:shipperRegionCode
+ shipperRegionCode: shipperRegionCode
});
}
dialForm.value.close();
res.done();
- }).catch(err=>{
+ }).catch(err => {
res.done();
})
},
@@ -3825,7 +3815,7 @@
}
const handleAddReceiver = () => {
- if (!form.value.customerId){
+ if (!form.value.customerId) {
return ElMessage.error('璇峰厛閫夋嫨杩愯緭璺嚎');
}
form2.value = {
@@ -3835,33 +3825,33 @@
};
dialForm.value = $DialogForm(appContext)({
title: '鏂板鍗歌揣鍦�',
- data:form2.value,
+ data: form2.value,
width: '80%',
option: consignorAddOption.value,
menuPosition: 'right',
- callback: (res:any,) => {
+ callback: (res: any,) => {
let data1 = res.data;
- if (data1.mapLocationDetail){
- data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ if (data1.mapLocationDetail) {
+ data1.mapLocation = data1.mapLocationDetail[0] + ',' + data1.mapLocationDetail[1];
data1.addressDetail = data1.mapLocationDetail[2]
}
- addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ addTmsConsignor({ ...form2.value, ...data1 }).then(res2 => {
let active = res2.data || {};
if (active) {
let receiverRegionCode = '';
- if (active.provinceId){
+ if (active.provinceId) {
receiverRegionCode = active.provinceId;
}
- if (active.cityId){
- receiverRegionCode =receiverRegionCode+ ","+active.cityId;
+ if (active.cityId) {
+ receiverRegionCode = receiverRegionCode + "," + active.cityId;
}
- if (active.districtId){
- receiverRegionCode =receiverRegionCode+ ","+active.districtId;
+ if (active.districtId) {
+ receiverRegionCode = receiverRegionCode + "," + active.districtId;
}
- if (active.streetId){
- receiverRegionCode =receiverRegionCode+ ","+active.streetId;
+ if (active.streetId) {
+ receiverRegionCode = receiverRegionCode + "," + active.streetId;
}
Object.assign(form.value, {
@@ -3870,12 +3860,12 @@
receiverRegionLabel: active.regionLabel,
receiverAddress: active.addressDetail,
receiverMobile: active.contactPhone,
- receiverRegionCode:receiverRegionCode,
+ receiverRegionCode: receiverRegionCode,
});
}
dialForm.value.close();
res.done();
- }).catch(err=>{
+ }).catch(err => {
res.done();
})
},
@@ -3888,6 +3878,15 @@
form.value = selectionList.value[0];
optionType.value = 'customs';
boxFormOption.value = customsOption.value;
+
+}
+
+const handleCustomsAdd = (selectionList) => {
+ title.value = '琛ュ厖濮旀墭瑁呭嵏淇℃伅';
+ open.value = true;
+ form.value = selectionList;
+ optionType.value = 'loading';
+ boxFormOption.value = loadingOption.value;
}
const handleLoading = () => {
title.value = '琛ュ厖濮旀墭瑁呭嵏淇℃伅';
@@ -3896,32 +3895,40 @@
optionType.value = 'loading';
boxFormOption.value = loadingOption.value;
}
+const handleLoadingAdd = (selectionList) => {
+ title.value = '琛ュ厖濮旀墭瑁呭嵏淇℃伅';
+ open.value = true;
+ form.value = selectionList;
+ optionType.value = 'loading';
+ boxFormOption.value = loadingOption.value;
+}
const quotationItems = ref();
const getQuotationItems = async () => {
- let res = await getDicts("sys_quotation_items");
+ let res = await getDicts("sys_quotation_items");
quotationItems.value = res.data || [];
}
getQuotationItems();
-const getTabData = (val:string)=>{
+const getTabData = (val: string) => {
console.log(val)
- let filter = quotationItems.value.filter((item:any)=>{
+ let filter = quotationItems.value.filter((item: any) => {
return item.remark == val;
});
- if (filter.length > 0){
- zzItemsTableData.value = filter.map((item:any)=>{
- return { rowKey: randomId() ,freeName: item.dictLabel,free: item.dictValue,unit: '娆�'}
+ if (filter.length > 0) {
+ zzItemsTableData.value = filter.map((item: any) => {
+ return { rowKey: randomId(), freeName: item.dictLabel, free: item.dictValue, unit: '娆�' }
})
- }else{
+ } else {
zzItemsTableData.value = []
}
}
-const getTab4Data = ()=>{
+const getTab4Data = () => {
listTmsFinanceDetail({
dispatchOrderId: form.value.id, financeType: 2,
pageNum: 1, pageSize: 999
}).then(async res => {
+
boxTableData.value = res.rows || [];
boxForm.value = {
@@ -3934,39 +3941,76 @@
-const submitTabForm = ()=>{
- if (['tab1','tab2','tab3'].includes(active.value)){
- let quoteFeeItems = zzItemsTableData.value.filter((item:any)=>{
+const submitTabForm = () => {
+ if (['tab1', 'tab2', 'tab3'].includes(active.value)) {
+ let quoteFeeItems = zzItemsTableData.value.filter((item: any) => {
return item.count && item.count > 0;
})
- console.log(quoteFeeItems)
- pushTmsQuoteFee({...form.value,quoteFeeItems:quoteFeeItems}).then(res=>{
+ pushTmsQuoteFee({ ...form.value, quoteFeeItems: quoteFeeItems }).then(res => {
ElMessage.success('淇濆瓨鎴愬姛');
open4.value = false;
})
- }else if (active.value === 'tab4'){
- if (Array.isArray(boxForm.value.feeVoucherUrl)) {
- boxForm.value.feeVoucherUrl = boxForm.value.feeVoucherUrl.toString();
- }
+ } else if (active.value === 'tab4') {
+ // if (Array.isArray(boxForm.value.feeVoucherUrl)) {
+ // boxForm.value.feeVoucherUrl = boxForm.value.feeVoucherUrl.toString();
+ // }
//boxForm.value.rowItems = boxTableData.value;
- saveTmsFinanceDetail(boxForm.value).then(res => {
+ // console.log(tmsFinanceDetails.value);
+ // console.log(boxForm.value);
+ // 1. 鎻愬彇濉啓浜嗛噾棰濈殑鏁版嵁锛堥噾棰濆ぇ浜�0锛�
+ const validDetails = tmsFinanceDetails.value.filter(item => item.actualFeeAmount && item.actualFeeAmount > 0);
+
+ if (validDetails.length === 0) {
+ ElMessage.warning('璇疯嚦灏戝～鍐欎竴椤硅垂鐢ㄩ噾棰�');
+ return;
+ }
+
+ // 2. 鏍￠獙锛氬～鍐欎簡閲戦鐨勬槸鍚﹂兘閫変簡甯佸埗
+ const incomplete = validDetails.find(item => !item.currency);
+ if (incomplete) {
+ ElMessage.error(`璐圭敤绫诲瀷銆�${incomplete.feeTypeName}銆戝凡濉啓閲戦锛岃閫夋嫨甯佸埗锛乣);
+ return; // 鎷︽埅鎻愪氦
+ }
+
+ // 3. 澶勭悊鍑瘉 URL (濡傛灉鏈夊崟寮犳垨澶氬紶涓婁紶鐨勯�昏緫)
+ // 鍋囪鍚庣闇�瑕佺殑鏄�楀彿鍒嗛殧鐨勫瓧绗︿覆
+ const submitData = validDetails.map(item => {
+ let url = item.voucherUrl;
+ if (Array.isArray(url)) {
+ url = url.join(',');
+ }
+ return { ...item, voucherUrl: url };
+ });
+
+
+ saveTmsFinanceDetail2(submitData).then(res => {
ElMessage({
message: "鎿嶄綔鎴愬姛锛�",
type: 'success'
})
+ open4.value = false;
+ onLoad(page.value)
boxFormRef.value?.resetFields();
getTab4Data();
})
+ // saveTmsFinanceDetail(boxForm.value).then(res => {
+ // ElMessage({
+ // message: "鎿嶄綔鎴愬姛锛�",
+ // type: 'success'
+ // })
+ // boxFormRef.value?.resetFields();
+ // getTab4Data();
+ // })
}
}
-const handleChange = (column:any)=>{
+const handleChange = (column: any) => {
active.value = column.prop;
- if (['tab1','tab2','tab3'].includes(column.prop)){
+ if (['tab1', 'tab2', 'tab3'].includes(column.prop)) {
getTabData(column.value)
- }else if (column.prop === 'tab4'){
+ } else if (column.prop === 'tab4') {
getTab4Data()
}
}
@@ -3978,38 +4022,38 @@
boxFormOption.value = financeOption.value;
boxTableOption.value = financeTableOption.value;
- nextTick(()=>{
+ nextTick(() => {
tabsOptionRef.value.active = "0";
})
}
-const handleClose = (row:any) => {
+const handleClose = (row: any) => {
- if (row.status == 2){
- checkCloseOrder(row.id).then(res=>{
+ if (row.status == 2) {
+ checkCloseOrder(row.id).then(res => {
open5.value = true;
form.value = row;
boxFormOption.value = closeOption.value;
});
- }else{
+ } else {
open5.value = true;
form.value = row;
boxFormOption.value = closeOption.value;
}
}
-const submitForm5 = () =>{
- boxFormRef.value.validate((valid: boolean,done:any) => {
+const submitForm5 = () => {
+ boxFormRef.value.validate((valid: boolean, done: any) => {
console.log(valid)
- if(valid){
+ if (valid) {
boxForm.value.id = form.value.id;
- closeOrder(boxForm.value).then(res=>{
+ closeOrder(boxForm.value).then(res => {
ElMessage.success('鎿嶄綔鎴愬姛');
open5.value = false;
done();
onLoad(page.value)
- }).catch(err=>{
+ }).catch(err => {
done();
})
}
@@ -4019,54 +4063,54 @@
menuBtn: false,
labelWidth: 120,
column: {
- sixLinkNo:{
+ sixLinkNo: {
label: '鍏仈鍗曞彿',
},
- portName:{
+ portName: {
label: '琛岄┒鍙ｅ哺',
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_port',
},
- billNo:{
+ billNo: {
label: '鎻愬崟鍙稴/O',
},
- terminalName:{
+ terminalName: {
label: '鐮佸ご鍚�',
},
- cargoName:{
+ cargoName: {
label: '璐х墿鍚�',
},
- pieceCount:{
+ pieceCount: {
label: '浠舵暟',
},
- weight:{
+ weight: {
label: '閲嶉噺',
},
- contactName:{
+ contactName: {
label: '瀹㈡埛鑱旂粶浜�',
},
- contactPhone:{
+ contactPhone: {
label: '鑱旂粶浜烘墜鏈哄彿',
}
}
})
-const print =ref(0)
+const print = ref(0)
const handlePrint = () => {
- form.value = selectionList.value[0];
+ form.value = selectionList.value[0];
boxFormOption.value = printOption.value;
boxForm.value = form.value
- getTmsDriver(boxForm.value.mainDriverId).then(res=>{
+ getTmsDriver(boxForm.value.mainDriverId).then(res => {
open6.value = true;
- const driver = res.data || {};
+ const driver = res.data || {};
boxForm.value.mainDriverMobile = driver.mobile;
print.value = 0
})
}
-const submitForm6 = ()=>{
+const submitForm6 = () => {
print.value = 1;
- printDispatchOrder(boxForm.value).then(res=>{
+ printDispatchOrder(boxForm.value).then(res => {
$Print('#print');
onLoad(page.value)
})
@@ -4099,11 +4143,11 @@
importTemplateTmsDispatchOrder();
}
-const handleFileUploadProgress = (event:any, file:any) => {
+const handleFileUploadProgress = (event: any, file: any) => {
upload.isUploading = true;
};
/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
-const handleFileSuccess = (response:any, file:any) => {
+const handleFileSuccess = (response: any, file: any) => {
upload.open = false;
upload.isUploading = false;
uploadRef.value!.clearFiles();
@@ -4119,8 +4163,8 @@
const shipperReceiverFormOption = ref({
menuBtn: false, labelWidth: 140,
column: {
- dispatchNos:{
- label: '璋冨害鍗曞彿',span:24,
+ dispatchNos: {
+ label: '璋冨害鍗曞彿', span: 24,
rules: [
{
required: true,
@@ -4129,7 +4173,7 @@
],
},
shipperId: {
- label: '瑁呰揣鐐�', dataType: 'string',disabled:false,
+ label: '瑁呰揣鐐�', dataType: 'string', disabled: false,
display: true,
rules: [
{
@@ -4154,7 +4198,7 @@
},
receiverId: {
label: '鍗歌揣鐐�',
- display: true, dataType: 'string',disabled:false,
+ display: true, dataType: 'string', disabled: false,
rules: [
{
required: true,
@@ -4177,7 +4221,7 @@
}
});
-const changeShipper2 = ({value}: any) => {
+const changeShipper2 = ({ value }: any) => {
if (value) {
let id = value;
@@ -4212,7 +4256,7 @@
})
}
}
-const changeReceiver2 = ({value}: any) => {
+const changeReceiver2 = ({ value }: any) => {
if (value) {
let id = value;
@@ -4251,43 +4295,43 @@
const hasDifferentCustomer = (() => {
const customerSet = new Set(
- selectionList.value.map((item:any) => item.customerId)
+ selectionList.value.map((item: any) => item.customerId)
);
return customerSet.size > 1;
})();
-const handleZXHDJ = ()=>{
- if(hasDifferentCustomer){
+const handleZXHDJ = () => {
+ if (hasDifferentCustomer) {
ElMessage.error('鍗曟鎿嶄綔鍙兘鎿嶄綔涓�涓鎴风殑鏁版嵁');
return;
}
- let filter = selectionList.value.filter((item:any)=> !item.shipperId);
- let filter2 = selectionList.value.filter((item:any)=> !item.receiverId);
+ let filter = selectionList.value.filter((item: any) => !item.shipperId);
+ let filter2 = selectionList.value.filter((item: any) => !item.receiverId);
let zLen = filter.length || 0;
let xLen = filter2.length || 0;
- if (zLen == 0 && xLen == 0){
+ if (zLen == 0 && xLen == 0) {
ElMessage.error('閫夋嫨鐨勬暟鎹凡瀹屾垚瀵硅鍗歌揣鐐圭櫥璁�');
return;
}
- if(zLen >0 && xLen >0){
- if (zLen > xLen){
+ if (zLen > 0 && xLen > 0) {
+ if (zLen > xLen) {
ElMessage.error('閫夋嫨鐨勬暟鎹凡濉啓鍗歌揣鐐规暟鎹紝璇峰崟鐙紪杈�');
return;
}
- if (zLen < xLen){
+ if (zLen < xLen) {
ElMessage.error('閫夋嫨鐨勬暟鎹凡濉啓瑁呰揣鐐规暟鎹紝璇峰崟鐙紪杈�');
return;
}
}
- let item:any = selectionList.value[0];
+ let item: any = selectionList.value[0];
shipperReceiverForm.value.customerId = item?.customerId
shipperReceiverForm.value.customerCode = item?.customerCode
shipperReceiverForm.value.customerName = item?.customerName;
- shipperReceiverForm.value.dispatchNos = selectionList.value.map((item:any)=> item.dispatchNo) || [];
+ shipperReceiverForm.value.dispatchNos = selectionList.value.map((item: any) => item.dispatchNo) || [];
- shipperReceiverFormOption.value.column.shipperId.disabled = zLen ==0;
- shipperReceiverFormOption.value.column.shipperId.rules[0].required = zLen !=0;
- shipperReceiverFormOption.value.column.receiverId.disabled = xLen ==0;
- shipperReceiverFormOption.value.column.receiverId.rules[0].required = xLen !=0;
+ shipperReceiverFormOption.value.column.shipperId.disabled = zLen == 0;
+ shipperReceiverFormOption.value.column.shipperId.rules[0].required = zLen != 0;
+ shipperReceiverFormOption.value.column.receiverId.disabled = xLen == 0;
+ shipperReceiverFormOption.value.column.receiverId.rules[0].required = xLen != 0;
open7.value = true;
@@ -4302,33 +4346,33 @@
};
dialForm.value = $DialogForm(appContext)({
title: '鏂板瑁呰揣鍦�',
- data:form2.value,
+ data: form2.value,
width: '80%',
option: consignorAddOption.value,
menuPosition: 'right',
- callback: (res:any,) => {
+ callback: (res: any,) => {
let data1 = res.data;
- if (data1.mapLocationDetail){
- data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ if (data1.mapLocationDetail) {
+ data1.mapLocation = data1.mapLocationDetail[0] + ',' + data1.mapLocationDetail[1];
data1.addressDetail = data1.mapLocationDetail[2]
}
- addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ addTmsConsignor({ ...form2.value, ...data1 }).then(res2 => {
let active = res2.data || {};
if (active) {
let shipperRegionCode = '';
- if (active.provinceId){
+ if (active.provinceId) {
shipperRegionCode = active.provinceId;
}
- if (active.cityId){
- shipperRegionCode =shipperRegionCode+ ","+active.cityId;
+ if (active.cityId) {
+ shipperRegionCode = shipperRegionCode + "," + active.cityId;
}
- if (active.districtId){
- shipperRegionCode =shipperRegionCode+ ","+active.districtId;
+ if (active.districtId) {
+ shipperRegionCode = shipperRegionCode + "," + active.districtId;
}
- if (active.streetId){
- shipperRegionCode =shipperRegionCode+ ","+active.streetId;
+ if (active.streetId) {
+ shipperRegionCode = shipperRegionCode + "," + active.streetId;
}
Object.assign(shipperReceiverForm.value, {
shipperId: active.id,
@@ -4336,12 +4380,12 @@
shipperRegionLabel: active.regionLabel,
shipperAddress: active.addressDetail,
shipperMobile: active.contactPhone,
- shipperRegionCode:shipperRegionCode
+ shipperRegionCode: shipperRegionCode
});
}
dialForm.value.close();
res.done();
- }).catch(err=>{
+ }).catch(err => {
res.done();
})
},
@@ -4349,7 +4393,7 @@
}
const handleAddReceiver2 = () => {
- if (!form.value.customerId){
+ if (!form.value.customerId) {
return ElMessage.error('璇峰厛閫夋嫨杩愯緭璺嚎');
}
form2.value = {
@@ -4359,33 +4403,33 @@
};
dialForm.value = $DialogForm(appContext)({
title: '鏂板鍗歌揣鍦�',
- data:form2.value,
+ data: form2.value,
width: '80%',
option: consignorAddOption.value,
menuPosition: 'right',
- callback: (res:any,) => {
+ callback: (res: any,) => {
let data1 = res.data;
- if (data1.mapLocationDetail){
- data1.mapLocation = data1.mapLocationDetail[0]+','+data1.mapLocationDetail[1];
+ if (data1.mapLocationDetail) {
+ data1.mapLocation = data1.mapLocationDetail[0] + ',' + data1.mapLocationDetail[1];
data1.addressDetail = data1.mapLocationDetail[2]
}
- addTmsConsignor({...form2.value,...data1}).then(res2=>{
+ addTmsConsignor({ ...form2.value, ...data1 }).then(res2 => {
let active = res2.data || {};
if (active) {
let receiverRegionCode = '';
- if (active.provinceId){
+ if (active.provinceId) {
receiverRegionCode = active.provinceId;
}
- if (active.cityId){
- receiverRegionCode =receiverRegionCode+ ","+active.cityId;
+ if (active.cityId) {
+ receiverRegionCode = receiverRegionCode + "," + active.cityId;
}
- if (active.districtId){
- receiverRegionCode =receiverRegionCode+ ","+active.districtId;
+ if (active.districtId) {
+ receiverRegionCode = receiverRegionCode + "," + active.districtId;
}
- if (active.streetId){
- receiverRegionCode =receiverRegionCode+ ","+active.streetId;
+ if (active.streetId) {
+ receiverRegionCode = receiverRegionCode + "," + active.streetId;
}
Object.assign(shipperReceiverForm.value, {
@@ -4394,64 +4438,181 @@
receiverRegionLabel: active.regionLabel,
receiverAddress: active.addressDetail,
receiverMobile: active.contactPhone,
- receiverRegionCode:receiverRegionCode,
+ receiverRegionCode: receiverRegionCode,
});
}
dialForm.value.close();
res.done();
- }).catch(err=>{
+ }).catch(err => {
res.done();
})
},
})
}
-const handleCloseDispatchNo = (tag:string)=>{
+const handleCloseDispatchNo = (tag: string) => {
let indexOf = shipperReceiverForm.value.dispatchNos.indexOf(tag);
- shipperReceiverForm.value.dispatchNos.splice(indexOf,1);
+ shipperReceiverForm.value.dispatchNos.splice(indexOf, 1);
}
-const submitZxForm = ()=>{
- shipperReceiverFormRef.value.validate((valid: boolean,done:any) => {
- if(valid){
- ypdddjSumbit(shipperReceiverForm.value).then(res=>{
+const submitZxForm = () => {
+ shipperReceiverFormRef.value.validate((valid: boolean, done: any) => {
+ if (valid) {
+ ypdddjSumbit(shipperReceiverForm.value).then(res => {
ElMessage.success('鐧昏鎴愬姛');
open7.value = false;
onLoad(page.value);
done();
- }).catch(err=>{
+ }).catch(err => {
done();
})
}
})
}
+const importLogVisible = ref(false);
+const importLogLoading = ref(false);
+const importLogData = ref([]);
+// 寮圭獥琛ㄦ牸閰嶇疆
+const importLogOption = {
+ header: false,
+ addBtn: false,
+ menu: false, // 浠呭睍绀猴紝涓嶉渶瑕佹搷浣滃垪
+ column: [
+ { label: '瀵煎叆鏃堕棿', prop: 'importTime', type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss' },
+ { label: '瀵煎叆鏂囦欢鍚嶇О', prop: 'fileName' },
+ { label: '鎿嶄綔浜�', prop: 'operator' },
+ { label: '鎴愬姛琛屾暟', prop: 'successCount' },
+ { label: '澶辫触琛屾暟', prop: 'failureCount' },
+ { label: '澶辫触璇存槑', prop: 'failureDescription', overHidden: true }
+ ]
+};
+
+// 鎵撳紑鏃ュ織寮圭獥
+const handleImportLog = () => {
+ importLogVisible.value = true;
+};
+
+// 鑾峰彇鏃ュ織鍒楄〃鏁版嵁锛堥渶鏍规嵁瀹為檯 API 璋冩暣锛�
+const getImportLogList = () => {
+ importLogData.value = []
+ // 鍋囪鏈変竴涓� getLogApi 鐨勬帴鍙�
+ tmsTmsDispatchOrderImportLog().then(res => {
+ if (res.code == 200) {
+ importLogLoading.value = true;
+ importLogData.value = res.data;
+ importLogLoading.value = false;
+ }
+ });
+
+};
+// 1. 瀹氫箟鍞竴鐨勫彉閲忓悕
+const tmsFinanceDetails = ref([]); // 鏁版嵁婧�
+const expenditureTableOption = ref({
+ addBtn: false,
+ menu: false,
+ header: false,
+ border: true,
+ index: false,
+ selection: false,
+ column: [
+ {
+ label: '璐圭敤绫诲瀷',
+ prop: 'feeTypeName',
+ width: 150
+ },
+ {
+ label: '璐圭敤閲戦',
+ prop: 'actualFeeAmount',
+ slot: true,
+ width: 150
+ },
+ {
+ label: '甯佸埗',
+ prop: 'currency',
+ slot: true,
+ width: 200
+ },
+ {
+
+ label: '璐圭敤鍑瘉',
+ display: true,
+ span: 24,
+ accept: 'string', dataType: 'object',
+ type: 'upload',
+ // action: '/common/upload2',
+
+ prop: 'voucherUrl', // 杩欓噷鏀规垚 prop 灞炴��
+ slot: true, // 寮�鍚彃妲�
+ width: 200
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ slot: true
+ }
+ ]
+});
+// 3. 鍥炴樉鍒濆鍖�
+const initExpenditureData = () => {
+ if (fee_type.value && fee_type.value.length > 0 && tmsFinanceDetails.value.length === 0) {
+ tmsFinanceDetails.value = fee_type.value.map(item => ({
+ feeType: item.value,
+ feeTypeName: item.label,
+ feeAmount: undefined,
+ currency: '',
+ voucherUrl: '',
+ remark: ''
+ }));
+ }
+};
+// 4. 鐩戝惉鍒囨崲
+watch(() => active.value, (val) => {
+ if (val === 'tab4') {
+ initExpenditureData();
+ }
+});
+const handleUploadAfter = (res, done, loading, column, row) => {
+ // res 鏄帴鍙ｈ繑鍥炵殑瀹屾暣鏁版嵁
+ if (res && res.url) {
+ // 鎵嬪姩缁欒繖涓�琛岀殑鏁版嵁璧嬪��
+ row.voucherUrl = res.url;
+ console.log('涓婁紶鎴愬姛锛屽綋鍓嶈鏁版嵁锛�', row);
+ } else if (res.data && res.data.url) {
+ // 濡傛灉杩斿洖鐨勬暟鎹寘瑁瑰湪 data 閲�
+ row.voucherUrl = res.data.url;
+ }
+ done(); // 蹇呴』璋冪敤 done 缁撴潫涓婁紶鐘舵��
+};
</script>
<style lang="scss" scoped>
-
-::v-deep .cydprint .el-dialog__body{
- overflow: hidden;
+::v-deep .cydprint .el-dialog__body {
+ overflow: hidden;
//padding: 0;
margin: 0;
}
-#print{
- .title{
+
+#print {
+ .title {
text-align: center;
font-size: 14pt;
color: #000;
- line-height:23pt;
+ line-height: 23pt;
font-weight: bold;
margin: 0;
}
- .header{
- position: relative;
- .order{
+
+ .header {
+ position: relative;
+
+ .order {
font-size: 12pt;
color: #000;
line-height: 23pt;
}
- .sub-title{
+
+ .sub-title {
position: absolute;
left: 50%;
transform: translateX(-50%);
@@ -4466,22 +4627,29 @@
table {
width: 100%;
- border-collapse: collapse; /* 鍚堝苟杈规 */
+ border-collapse: collapse;
+ /* 鍚堝苟杈规 */
font-size: 12px;
- table-layout: fixed; /* 鍏抽敭鐐� */
+ table-layout: fixed;
+ /* 鍏抽敭鐐� */
}
- table, td {
+
+ table,
+ td {
border: 1px solid #000;
}
+
td {
padding: 4px;
vertical-align: middle;
- width: 50%; /* 寮哄埗绛夊 */
+ width: 50%;
+ /* 寮哄埗绛夊 */
word-break: break-all;
}
}
-.dispatchNos{
+
+.dispatchNos {
//border: 1px solid #ebeef5;
border-radius: 4px;
min-height: 73px;
--
Gitblit v1.8.0