aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '报价批量录入列调整' (#20) from master-模板替换 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/20
This commit is contained in:
wuteng 2025-07-09 14:27:57 +08:00
commit 400eac264c
2 changed files with 14 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/views/emis/emisQuotePrice/batchTransQuotePrice.vue
View File

@ -76,7 +76,7 @@
</el-table-column>
<el-table-column label="费用名称" align="center" prop="feeType" width="100" >
</el-table-column>
<el-table-column label="费用币种" align="center" prop="currency" width="100" />
<el-table-column label="使用网点" align="center" prop="useSiteName" width="100" />
<el-table-column label="所属线路" align="center" prop="transLine" width="100" />
<el-table-column label="产品类型" align="center" prop="prodName" width="100" />
@ -94,18 +94,8 @@
<el-table-column label="报价开始" align="center" prop="startDate" width="170" />
<el-table-column label="报价结束" align="center" prop="endDate" width="170" />
<el-table-column label="寄件区域" align="center" prop="sendAreaName" min-width="100" />
<el-table-column label="寄件网点" align="center" prop="sendAreaSite" :show-overflow-tooltip="true" min-width="100" />
<el-table-column label="派件区域" align="center" prop="dispAreaName" min-width="100" />
<el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/>
<el-table-column label="计算规则" align="center" prop="exprJson" width="470"/>
<el-table-column label="计算规则" align="center" prop="exprJson" width="400" :show-overflow-tooltip="true"/>
</XdTable>
<el-dialog title="上传文件" :visible.sync="openUploadForm" width="50%" v-dialogDrag :destroy-on-close="true" :close-on-click-modal="false" append-to-body>
@ -147,22 +137,12 @@
</template>
<script>
import { draftQuotePrice } from "@/api/emis/emisQuotePrice";;
import { parseTime } from "@/utils/custom";
import {timeDiffTime,timeFormat,excelDateToJSDate } from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import { draftQuotePrice } from "@/api/emis/emisQuotePrice";
import {timeDiffTime,excelDateToJSDate } from '@/utils/dateUtils'
import XLSX from 'xlsx'
export default {
name: "BatchWaybillRecord",
components: {
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
],
data() {
return {
resetRefreshId:null,
@ -179,13 +159,11 @@ export default {
// 总条数
total: 0,
// 运单列表表格数据
// 报价列表表格数据
emisQuotePriceList: [],
tmpDataList: [],
selectionList:[],
selectionIndexList: [],
form:{},
rules:{},
@ -200,14 +178,6 @@ export default {
pageSize: 20
},
};
},
created() {
if(this.$store.getters.ownerSiteCode!='88888'){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
},
mounted() {
},
methods: {
getUUID() {
@ -225,7 +195,7 @@ export default {
calcDeliveryTime(startData,endDate){
return timeDiffTime(startData,endDate)
},
//标红table指定行
//标红table指定行
tableRowClassName(row, index) {
row.row.index = row.rowIndex;
if (row.uploadStatus=='1') {
@ -236,7 +206,7 @@ export default {
}
return '';
},
/** 查询运单列表列表 */
/** 查询报价列表 */
getList() {
this.loading = true;
},
@ -291,12 +261,8 @@ export default {
let loadingInstance = this.$loading({
text: '正在解析 ' + _index + ' 数据...'
})
this.emisQuotePriceList = [];
this.tmpDataList = [];
let lastOrderSn = '';
let orderIndex = 0;
// 组装提交的数据
for (let index = 0; index < results.length; index++) {
const element = results[index]
@ -382,16 +348,6 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
// this.queryParams.pageNum = 1;
// this.getList();
},
/** 重置按钮操作 */
resetQuery() {
// this.resetForm("queryForm");
// this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -427,13 +383,7 @@ export default {
}).then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
}
}
};
</script>

62
src/views/emis/emisQuotePrice/batchVipTransQuotePrice.vue
View File

@ -75,8 +75,8 @@
</template>
</el-table-column>
<el-table-column label="费用名称" align="center" prop="feeType" width="100" >
</el-table-column>
</el-table-column>
<el-table-column label="费用币种" align="center" prop="currency" width="100" />
<el-table-column label="使用网点" align="center" prop="useSiteName" width="100" />
<el-table-column label="客户名称" align="center" prop="custName" width="160" :show-overflow-tooltip="true" />
<el-table-column label="所属线路" align="center" prop="transLine" width="100" />
@ -95,18 +95,8 @@
<el-table-column label="报价开始" align="center" prop="startDate" width="170" />
<el-table-column label="报价结束" align="center" prop="endDate" width="170" />
<el-table-column label="寄件区域" align="center" prop="sendAreaName" min-width="100" />
<el-table-column label="寄件网点" align="center" prop="sendAreaSite" :show-overflow-tooltip="true" min-width="100" />
<el-table-column label="派件区域" align="center" prop="dispAreaName" min-width="100" />
<el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/>
<el-table-column label="计算规则" align="center" prop="exprJson" width="470"/>
<el-table-column label="计算规则" align="center" prop="exprJson" width="400" :show-overflow-tooltip="true"/>
</XdTable>
<el-dialog title="上传文件" :visible.sync="openUploadForm" width="50%" v-dialogDrag :destroy-on-close="true" :close-on-click-modal="false" append-to-body>
@ -148,22 +138,12 @@
</template>
<script>
import { draftQuotePrice } from "@/api/emis/emisQuotePrice";;
import { parseTime } from "@/utils/custom";
import {timeDiffTime,timeFormat,excelDateToJSDate } from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import { draftQuotePrice } from "@/api/emis/emisQuotePrice";
import {excelDateToJSDate } from '@/utils/dateUtils'
import XLSX from 'xlsx'
export default {
name: "BatchWaybillRecord",
components: {
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
],
data() {
return {
resetRefreshId:null,
@ -201,14 +181,6 @@ export default {
pageSize: 20
},
};
},
created() {
if(this.$store.getters.ownerSiteCode!='88888'){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
},
mounted() {
},
methods: {
getUUID() {
@ -222,9 +194,6 @@ export default {
this.uploadExcelDataInfo="";
this.fileName="";
},
calcDeliveryTime(startData,endDate){
return timeDiffTime(startData,endDate)
},
//标红table指定行
tableRowClassName(row, index) {
@ -297,8 +266,6 @@ export default {
this.emisQuotePriceList = [];
this.tmpDataList = [];
let lastOrderSn = '';
let orderIndex = 0;
// 组装提交的数据
for (let index = 0; index < results.length; index++) {
const element = results[index]
@ -386,16 +353,6 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
// this.queryParams.pageNum = 1;
// this.getList();
},
/** 重置按钮操作 */
resetQuery() {
// this.resetForm("queryForm");
// this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -411,7 +368,6 @@ export default {
this.queryParams.isAsc = column.order;
this.getList();
},
cancel(){
this.openUploadForm = false;
},
@ -431,13 +387,7 @@ export default {
}).then(() => {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
}
}
};
</script>