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

md

Browse Source
This commit is contained in:
linfso 2024-12-05 20:07:40 +08:00
parent 573d2856f4
commit 33eebea3aa
3 changed files with 124 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
View File

@ -176,7 +176,7 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :close-on-click-modal="false" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsCostFeeForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsCostFeeForm>
<EmisTmsCostFeeForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsCostFeeForm>
</el-dialog>
</XdPageContainer>
@ -186,11 +186,11 @@
import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisTmsCostFeeView from '@/views/emis/emisTmsCostFee/emisTmsCostFeeView';
import emisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
import EmisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
export default {
name: "emisTmsCostFee",
components: { elDateSimplePicker,emisTmsCostFeeForm },
components: { elDateSimplePicker,EmisTmsCostFeeForm },
dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_trans_carrier','emis_payment_type'],
data() {
return {

103
src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
View File

@ -2,7 +2,18 @@
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<el-form-item label="运输批次" prop="batchNo">
<EmisTmsSiteBatchPicker v-model="form.batchNo" @onChange="onSelecTmsBatch"></EmisTmsSiteBatchPicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费用类型" prop="feeType">
<el-select clearable v-model="form.feeType" placeholder="请选择" style="width:100%">
<el-option
@ -12,39 +23,22 @@
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总费用" prop="costFee">
<el-input-number v-model="form.costFee" style="width:100%" placeholder="总费用" :min="1" :controls="false" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="成本产生日期" prop="tradeDate" label-width="120px">
<el-date-picker
style="width:100%"
clearable
v-model="form.tradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="成本日期">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="成本名称" prop="costName">
<el-input v-model="form.costName" placeholder="请输入成本名称" />
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="毛重(kg)" prop="realTotalWeight">
<el-form-item label="承运重量" prop="realTotalWeight">
<el-input-number v-model="form.realTotalWeight" style="width:100%" placeholder="结算重量" :min="1" :controls="false" :precision="2">
</el-input-number>
</el-form-item>
@ -74,7 +68,19 @@
<el-input v-model="form.destPlace" placeholder="请输入目的地" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="交易日期" prop="tradeDate" >
<el-date-picker
style="width:100%"
clearable
v-model="form.tradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="交易日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
<el-form-item label="运输方式" prop="transType">
@ -89,7 +95,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运输单号" prop="transSignNo">
<el-form-item label="运输号" prop="transSignNo">
<el-input v-model="form.transSignNo" placeholder="提单号/车次号/船次号/单号" />
</el-form-item>
</el-col>
@ -230,6 +236,8 @@
<script>
import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
import EmisTmsSiteBatchPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchPicker';
import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
export default {
name: "emisTmsCostFeeForm",
@ -238,7 +246,7 @@ export default {
type:Number
}
},
components: { },
components: { EmisTmsSiteBatchPicker },
dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_trans_carrier','emis_payment_type'],
data() {
return {
@ -249,6 +257,9 @@ export default {
form: {},
// 表单校验
rules: {
batchNo: [
{ required: true, message: "批次不能为空", trigger: ["blur","change"] }
],
feeType: [
{ required: true, message: "成本类型不能为空", trigger: ["blur","change"] }
],
@ -300,6 +311,51 @@ export default {
};
}
},
async onSelecTmsBatch(item){
console.log("==111==>==>",item);
// 基础信息
this.form.realTotalWeight=item.transWeight;
this.form.realPieceNumber=item.packNum;
this.form.transType=item.transType;
this.form.transSignNo=item.carNo;
this.form.sendPlace=item.startSiteName;
this.form.destPlace=item.nextSiteName;
this.form.tradeDate=item.carTime;
this.form.billRelList=[];
// 运单列表信息
this.loading = true;
let billCodeStr="";
let resBatch=await listEmisTmsSiteBatchDtl({batchNo: item.batchNo});
if(resBatch.code==200){
if(resBatch.rows&&resBatch.rows.length>0){
billCodeStr=resBatch.rows.map( item=> item.billCode).join();
}
}
console.log("==billCodeStr==>",billCodeStr);
let qParam={
billCode:billCodeStr,
pageNum:1,
pageSize:2000
}
// 查询子账单
let res=await listEmisSettleSubBill(qParam);
if(res.code==200){
let subBillList = res.rows;
for(let i=0;i<subBillList.length;i++){
let itemSubBill=subBillList[i];
let relItem={...itemSubBill};
this.form.billRelList.push(relItem);
};
}
this.loading = false;
},
initData() {
@ -326,6 +382,7 @@ export default {
id: null,
costNo: null,
costName: null,
batchNo:null,
feeType: null,
splitType: null,
transType: null,

111
src/views/emis/emisWaybill/UserOrderList.vue
View File

@ -205,10 +205,9 @@
size="mini"
:disabled="single"
@click="handleCancelOrder"
v-hasPermi="['emis:emisWaybill:edit']"
>取消订单</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm' && $store.getters.ownerSiteCode== '88888'" >
<el-col :span="1.5" v-if="activeTab=='waitConfirm'" >
<el-popover
trigger="click"
ref="popoverRef1"
@ -218,7 +217,7 @@
>
<div style="text-align: center;">
<div style="font-weight: 600;color: black;margin-bottom: 10px;">选择指派网点</div>
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
<EmisSiteSimplePicker1 v-model="dispSendSiteCode" ></EmisSiteSimplePicker1>
<el-button
style="margin-top: 10px;margin-bottom: 10px;"
type="primary"
@ -230,8 +229,7 @@
slot="reference"
type="primary"
size="mini"
:disabled="single"
v-hasPermi="['emis:emisWaybill:edit']"
:disabled="multiple"
>指派网点</el-button>
</el-popover>
</el-col>
@ -246,7 +244,7 @@
<div style="text-align: center;">
<div style="font-weight: 600;color: black;margin-bottom: 10px;">选择取件员</div>
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="dispTakeManCode" postCode="RSD"></EmisUserSimplePicker1>
<el-button
style="margin-top: 10px;margin-bottom: 10px;"
type="primary"
@ -259,8 +257,7 @@
type="primary"
plain
size="mini"
:disabled="single"
v-hasPermi="['emis:emisWaybill:edit']"
:disabled="multiple"
>指派取件员</el-button>
</el-popover>
@ -274,45 +271,6 @@
@click="handleDownWarehouseIn"
>下载进仓单</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleView"
>查看</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleView"
>预览面单</el-button>
</el-col> -->
<!--
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleView"
>下载打印pdf</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-print"
size="mini"
:disabled="single"
@click="handleView"
>打印</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
@ -916,37 +874,50 @@ export default {
handleSetSite(){
this.$refs.popoverRef1.doClose();
let item0=this.selectionList[0];
if(item0.orderStatus==1){
this.$modal.msgError("已接单，不允许操作");
return;
}
this.selectionList.forEach(item=>{
if(item.orderStatus==1){
this.$modal.msgError("已接单，不允许操作");
return;
}
if(item.orderStatus==2){
this.$modal.msgError("已取消，不允许操作");
return;
}
// let orderSn=this.selectionList[0].orderSn;
let orderSn=item.orderSn;
console.log("====>handleSetSite=orderSn=>",orderSn);
assignSendSite({orderSn:orderSn,sendSiteCode:this.dispSendSiteCode}).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
let orderSn=this.selectionList[0].orderSn;
console.log("====>handleSetTakeMan=orderSn=>",orderSn);
assignSendSite({orderSn:orderSn,sendSiteCode:this.queryParams.sendSiteCode}).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
},
handleSetTakeMan(){
this.$refs.popoverRef2.doClose();
let item0=this.selectionList[0];
if(item0.orderStatus==1){
this.$modal.msgError("已接单，不允许操作");
return;
}
this.selectionList.forEach(item=>{
if(item.orderStatus==1){
this.$modal.msgError("已接单，不允许操作");
return;
}
if(item.orderStatus==2){
this.$modal.msgError("已取消，不允许操作");
return;
}
let orderSn=this.selectionList[0].orderSn;
console.log("====>handleSetSite=orderSn=>",orderSn);
assignTakeMan({orderSn:orderSn,takePieceEmployeeCode:this.queryParams.takePieceEmployeeCode}).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
let orderSn=item.orderSn;
console.log("====>handleSetTakeMan=orderSn=>",orderSn);
assignTakeMan({orderSn:orderSn,takePieceEmployeeCode:this.dispTakeManCode}).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
});
},