aike/emis-oms-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-11-27 12:50:07 +08:00
parent 9e99668e96
commit b4aefc6b71
11 changed files with 363 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/oms/emisCustomerAddress.js
View File

@ -50,3 +50,11 @@ export function delEmisCustomerAddress(id) {
method: 'delete'
})
}
export function setDefaultAddressById(query) {
return request({
url: '/oms2c/emisCustomerAddress/setDefaultAddressById',
method: 'get',
params: query
})
}

19
src/api/oms/emisMonthpayAccount.js
View File

@ -50,3 +50,22 @@ export function delEmisMonthpayAccount(id) {
method: 'delete'
})
}
export function verifyBindMonthPayCode(query) {
return request({
url: '/oms2c/emisWaybill/verifyBindMonthPayCode',
method: 'get',
params: query
})
}
export function bindMonthPayCode(query) {
return request({
url: '/oms2c/emisWaybill/bindMonthPayCode',
method: 'get',
params: query
})
}

35
src/api/oms/emisStaff.js
View File

@ -27,6 +27,15 @@ export function listBindSalesmen(query) {
})
}
// 查询新增专属业务员
export function queryNewSalesmen(query) {
return request({
url: '/oms2c/emisWaybill/queryNewSalesmen',
method: 'get',
params: query
})
}
// 获取回款
export function getPayeeList(query) {
return request({
@ -36,5 +45,31 @@ export function getPayeeList(query) {
})
}
export function bindSalesmen(data) {
return request({
url: '/oms2c/emisWaybill/bindSalesmen',
method: 'post',
data: data
})
}
export function deleteBindSalemen(data) {
return request({
url: '/oms2c/emisWaybill/deleteBindSalemen',
method: 'post',
data: data
})
}
export function setDefaultBindSalesmen(data) {
return request({
url: '/oms2c/emisWaybill/setDefaultBindSalesmen',
method: 'post',
data: data
})
}

88
src/components/XdTable/index.vue
View File

@ -672,7 +672,7 @@ export default {
}
// 初始化默认模版到本地
this.initDefaultTplList();
// this.initDefaultTplList();
this.initStorage()
this.updateTable()
// this.initKeyDown();
@ -778,29 +778,29 @@ export default {
}
},
async initDefaultTplList() {
if(!this.isNeedDbSaveTpl){
return;
}
let queryParams = {
tagId:this.saveStorageName
};
// if(!this.isNeedDbSaveTpl){
// return;
// }
// let queryParams = {
// tagId:this.saveStorageName
// };
this.storeTplList=[];
// 获取模版列表
let res=await listSysCustomizeTpl(queryParams)
if(res.rows&&res.rows.length>0){
this.storeTplList=res.rows;
// 设置默认模版
const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' );
if(selTplItem){
this.form=selTplItem;
this.curentTbShowTpl=selTplItem.tplCode;
const tplColList=JSON.parse(this.form.tplData);
// console.log("===>initDefaultTplList=2222=>",tplColList);
// 存储到本地tpl
this.storeTplToLocal(tplColList);
}
}
// this.storeTplList=[];
// // 获取模版列表
// let res=await listSysCustomizeTpl(queryParams)
// if(res.rows&&res.rows.length>0){
// this.storeTplList=res.rows;
// // 设置默认模版
// const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' );
// if(selTplItem){
// this.form=selTplItem;
// this.curentTbShowTpl=selTplItem.tplCode;
// const tplColList=JSON.parse(this.form.tplData);
// // console.log("===>initDefaultTplList=2222=>",tplColList);
// // 存储到本地tpl
// this.storeTplToLocal(tplColList);
// }
// }
},
// 矫正模版数据
@ -817,27 +817,27 @@ export default {
this.form=tmpTplItem;
}
if (this.form.id != null) {
this.curentTbShowTpl=this.form.tplCode;
this.form.tagId=this.saveStorageName;
this.form.tplData=JSON.stringify(this.storageList);
updateSysCustomizeTpl(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.openTbShowTplDlg=false;
this.initDefaultTplList();
this.curentTbShowTpl=this.form.tplCode;
});
} else {
this.form.tplCode=genJsSeqNo();
this.form.tagId=this.saveStorageName;
this.form.tplData=JSON.stringify(this.storageList);
addSysCustomizeTpl(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.openTbShowTplDlg=false;
this.initDefaultTplList();
this.curentTbShowTpl=this.form.tplCode;
});
}
// if (this.form.id != null) {
// this.curentTbShowTpl=this.form.tplCode;
// this.form.tagId=this.saveStorageName;
// this.form.tplData=JSON.stringify(this.storageList);
// updateSysCustomizeTpl(this.form).then(response => {
// this.$modal.msgSuccess("修改成功");
// this.openTbShowTplDlg=false;
// this.initDefaultTplList();
// this.curentTbShowTpl=this.form.tplCode;
// });
// } else {
// this.form.tplCode=genJsSeqNo();
// this.form.tagId=this.saveStorageName;
// this.form.tplData=JSON.stringify(this.storageList);
// addSysCustomizeTpl(this.form).then(response => {
// this.$modal.msgSuccess("新增成功");
// this.openTbShowTplDlg=false;
// this.initDefaultTplList();
// this.curentTbShowTpl=this.form.tplCode;
// });
// }
},
delTbShowTpl(){
const ids = this.form.id;

4
src/views/login.vue
View File

@ -334,7 +334,7 @@ import { getLocalIp } from "@/utils/custom";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import FingerprintJS from '@fingerprintjs/fingerprintjs' // 引入
// import FingerprintJS from '@fingerprintjs/fingerprintjs' // 引入
// const uuidv4 = require("uuid/v4"); // 导入uuid生成插件
const { v4: uuidv4 } = require('uuid');
@ -435,7 +435,7 @@ export default {
}
this.getCode();
this.getCookie();
this.initMacId();
// this.initMacId();
},
methods: {

6
src/views/oms/EmisBaseTools/TakeEmpPicker.vue
View File

@ -19,7 +19,7 @@
>
<el-table-column label="工号" align="left" prop="empCode" width="100" />
<el-table-column label="姓名" align="center" prop="empName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="手机" align="center" prop="ownerSiteName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="所属网点" align="center" prop="ownerSiteName" width="100" :show-overflow-tooltip="true" />
</el-table>
<!-- <el-pagination v-show="pagination" small
@ -29,7 +29,7 @@
@current-change="changePage"
/> -->
<div>添加业务员</div>
<!-- <div>添加业务员</div> -->
</div>
<el-input
@ -109,7 +109,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
queryParams:{
pageNum:1,
pageSize:50,
pageSize:100,
userId:null,
searchValue:null,
}

27
src/views/oms/emisCustomerAddress/recipientAddress.vue
View File

@ -6,8 +6,6 @@
v-model="queryParams.name"
:placeholder="$t('收件人')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="收件电话" prop="phone">
@ -15,12 +13,10 @@
v-model="queryParams.phone"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('所属国家')" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country"></CountryPicker>
</el-form-item>
</SearchForm>
@ -95,7 +91,7 @@
<el-table-column :label="$t('收件电话')" align="center" prop="phone" min-width="100" />
<el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
<el-table-column :label="$t('地区')" align="left" prop="provinceName" width="200" :show-overflow-tooltip="true">
<el-table-column :label="$t('地区')" align="left" prop="provinceName" min-width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
</template>
@ -104,8 +100,19 @@
<!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
<el-table-column :label="$t('公司')" align="left" prop="company" min-width="170" :show-overflow-tooltip="true" />
<el-table-column :label="$t('email')" align="left" prop="email" min-width="100" />
<el-table-column label="是否默认" align="center" prop="blDefaultFlag" min-width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.blDefaultFlag"
active-value="1"
inactive-value="0"
@change="handleDefaultFlagChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -116,7 +123,7 @@
</template>
<script>
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/oms/emisCustomerAddress";
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress ,setDefaultAddressById} from "@/api/oms/emisCustomerAddress";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCustomerAddressView from '@/views/oms/emisCustomerAddress/emisCustomerAddressView';
import recipientAddressForm from '@/views/oms/emisCustomerAddress/recipientAddressForm';
@ -252,6 +259,12 @@ export default {
cancelForm(){
this.openForm = false;
},
handleDefaultFlagChange(row){
setDefaultAddressById({id:row.id,defaultFlag:row.blDefaultFlag}).then(response => {
this.$modal.msgSuccess(response.msg);
this.getList();
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;

39
src/views/oms/emisCustomerAddress/senderAddress.vue
View File

@ -11,7 +11,7 @@
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件电话" prop="phone">
<el-form-item label="发件电话" prop="phone">
<el-input
v-model="queryParams.phone"
:placeholder="$t('发件电话')"
@ -84,23 +84,15 @@
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件人')" align="left" prop="name" width="170" :show-overflow-tooltip="true" >
<el-table-column :label="$t('发件人')" align="left" prop="name" min-width="100" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('寄件电话')" align="center" prop="phone" min-width="100" />
<el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
<el-table-column :label="$t('地区')" align="left" prop="provinceName" width="200" :show-overflow-tooltip="true">
<el-table-column :label="$t('发件电话')" align="center" prop="phone" min-width="100" />
<el-table-column :label="$t('国家')" align="center" prop="countryName" min-width="80" />
<el-table-column :label="$t('地区')" align="left" prop="provinceName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
</template>
@ -109,9 +101,17 @@
<el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" />
<el-table-column :label="$t('公司')" align="left" prop="company" min-width="170" :show-overflow-tooltip="true" />
<el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
<!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
<!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="是否默认" align="center" prop="blDefaultFlag" min-width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.blDefaultFlag"
active-value="1"
inactive-value="0"
@change="handleDefaultFlagChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" min-width="170"/>
</XdTable>
@ -223,7 +223,12 @@ export default {
this.loading = false;
});
},
handleDefaultFlagChange(row){
setDefaultAddressById({id:row.id,defaultFlag:row.blDefaultFlag}).then(response => {
this.$modal.msgSuccess(response.msg);
this.getList();
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

192
src/views/oms/emisWaybill/OrderRecord.vue
View File

@ -99,16 +99,24 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.sendSiteName">
<!-- <el-col :span="24" v-if="form.sendSiteName">
<el-form-item :label="$t('服务网点')" prop="sendSiteCode">
<el-input v-model="form.sendSiteName" placeholder="" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="24" >
<el-form-item :label="$t('业务员')" prop="takePieceEmployeeCode">
<TakeEmpPicker v-model="form.takePieceEmployeeCode" ></TakeEmpPicker>
</el-form-item>
</el-col> -->
<el-col :span="12" >
<el-form-item :label="$t('专属业务员')" prop="takePieceEmployeeCode">
<TakeEmpPicker v-model="form.takePieceEmployeeCode" ></TakeEmpPicker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-button
type="primary"
size="small"
@click="handlePrivSalesmen"
> {{ $t('去绑定业务员') }}</el-button>
</el-col>
</el-row>
@ -174,12 +182,12 @@
<el-input v-model="form.reciever.address" type="textarea" rows="2" placeholder="" />
</el-form-item>
</el-col>
<!--
<el-col :span="24" v-if="form.dispatchUnderlingSiteName">
<el-form-item :label="$t('派件网点')" prop="dispatchUnderlingSiteName">
<el-input v-model="form.dispatchUnderlingSiteName" placeholder="" disabled />
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-col>
@ -270,11 +278,11 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item :label="$t('合同号')" prop="custOrderId" >
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
</el-col>
@ -351,11 +359,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-col :span="12" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-form-item :label="$t('月结客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-button
type="primary"
size="small"
@click="handleBindMonthPay"
> {{ $t('去绑定月结账号') }}</el-button>
</el-col>
<!-- <el-col :span="12">
@ -446,36 +461,52 @@
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="品名" align="center" width="120" :show-overflow-tooltip="true">
<el-table-column prop="goodsName" label="货物名称" align="center" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<GoodsInput v-model="scope.row.goodsName" size="mini" placeholder=""></GoodsInput>
<!-- <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
</template>
</el-table-column>
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.price" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column> -->
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.material" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
<!-- <el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.purpose" size="mini" placeholder=""></el-input>
</template>
@ -484,19 +515,19 @@
<template slot-scope="scope">
<el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.supplier" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="netWeight" label="净重" align="center" width="60" :show-overflow-tooltip="true">
<!-- <el-table-column prop="netWeight" label="净重" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.netWeight" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
<!-- <el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
</template>
@ -510,22 +541,8 @@
<template slot-scope="scope">
<el-input v-model="scope.row.height" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.price" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column> -->
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="left" min-width="50">
<template slot-scope="scope">
@ -892,12 +909,12 @@ data() {
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
takePieceEmployeeCode: [
{ required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] }
],
operateEmployeeCode: [
{ required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
],
// takePieceEmployeeCode: [
// { required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] }
// ],
// operateEmployeeCode: [
// { required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
// ],
}
};
},
@ -906,12 +923,17 @@ computed: {
watch: {
"$route": {
handler (newValue, oldValue) {
console.log("===>routeParams==>",this.$route.query.routeParams);
// 选择产品后报价
if(this.$route.query.action=="preOrderByProd"){
this.reset();
let routeParams=this.$route.query.routeParams;
let postForm=JSON.parse(routeParams);
console.log("===>postForm==>",postForm);
this.form.transLine=postForm.transLine;
this.form.billWeight=postForm.billWeight;
this.form.totalVolume=postForm.totalVolume;
@ -920,6 +942,17 @@ watch: {
this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
}
else if(this.$route.query.action=="modify"){
this.action=this.$route.query.action;
this.billCode=this.$route.query.billCode;
this.initData();
}
else if(this.$route.query.action=="add"){
this.action=this.$route.query.action;
this.billCode=null;
this.initData();
}
},
deep: true
},
@ -931,7 +964,44 @@ created() {
this.action=this.$route.query.action;
this.billCode=this.$route.query.billCode;
this.initData();
}else{
}
else if(this.$route.query.action=="preOrderByProd"){
this.reset();
let routeParams=this.$route.query.routeParams;
let postForm=JSON.parse(routeParams);
this.form.sendDate =parseTime(new Date());
this.form.transLine=postForm.transLine;
this.form.billWeight=postForm.billWeight;
this.form.totalVolume=postForm.totalVolume;
this.form.productType=postForm.productType;
this.form.reciever.country=postForm.reciever.country;
this.form.reciever.province=postForm.reciever.province;
this.form.sender.country=postForm.sender.country;
this.form.sender.province=postForm.sender.province;
this.form.customsClear=postForm.customsClear;
this.form.customsEclaration=postForm.customsEclaration;
this.form.sendSiteCode=postForm.sendSiteCode;
this.form.dispatchUnderlingSiteCode=postForm.dispatchUnderlingSiteCode;
this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
}
else{
this.initData();
}
},
@ -979,6 +1049,7 @@ methods: {
this.form.calcFeeType='1';
this.form.blMessage='1'
this.form.blAcceptMessage='1'
this.form.billWeight='1'
this.isNeedSave=true;
// 月结客户OMS登录
@ -1007,6 +1078,12 @@ methods: {
}
},
handlePrivSalesmen(row) {
this.$router.push({ path: '/BaseMgnt/PrivSalesmen', query: { }})
},
handleBindMonthPay(row){
this.$router.push({ path: '/BaseMgnt/BindMonthPay', query: { }})
},
onSelectWarehouse(item){
this.form.intoWarehouseCode=item.code;
@ -1292,7 +1369,7 @@ methods: {
let cargo={
"goodsCode": "",
"goodsName": "填写货物名称",
"goodsName": "",
"cargoQty": 1,
"length": 0,
"width": 0,
@ -1392,12 +1469,13 @@ methods: {
// this.form.dispatchUnderlingSite= item.siteName;
// },
preCalcFee(){
if(this.form.billWeight
&& this.form.transLine
if(
this.form.transLine
//&& this.form.billWeight
&& this.form.sendSiteCode
&& this.form.dispatchUnderlingSiteCode
&& this.form.customsClear
&& this.form.customsEclaration
// && this.form.customsClear
// && this.form.customsEclaration
){
let postData={
@ -1405,11 +1483,11 @@ methods: {
calcFeeType:this.form.calcFeeType,
sendSiteCode: this.form.sendSiteCode,
dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
billWeight: this.form.billWeight,
totalVolume: this.form.totalVolume,
custNo: this.form.custNo,
customsClear:this.form.customsClear,
customsEclaration:this.form.customsEclaration
billWeight: this.form.billWeight||'1',
totalVolume: this.form.totalVolume||'0.1',
custNo: this.form.custNo||'',
customsClear:this.form.customsClear||'1',
customsEclaration:this.form.customsEclaration||'1'
}
// 通过服务器其计算，保留自定义费用

12
src/views/oms/emisWaybill/SendOrderbillList.vue
View File

@ -188,7 +188,7 @@
</el-select>
</el-form-item> -->
</SearchForm>
<!-- border -->
<XdTable
slot="pageContent"
@ -198,7 +198,7 @@
row-key="id"
storageName="sendWaybillList_main_240702"
v-loading="loading"
border
size="mini"
:data="emisWaybillList"
:showSearch.sync="showSearch"
@ -223,7 +223,7 @@
>查看</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
@ -232,7 +232,7 @@
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="primary"
@ -504,7 +504,7 @@
<!-- <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="orderDate" width="170"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<!-- <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"/> -->
@ -873,7 +873,7 @@ export default {
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"orderDate");
},
/** 查询运单列表列表 */
getList() {

84
src/views/oms/emisWaybill/WaybillDetailReadOnly.vue
View File

@ -63,7 +63,7 @@
<el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
<el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
<el-descriptions-item label="体积重量" :span="4">{{ form.volumeWeight }}(kg)</el-descriptions-item>
<el-descriptions-item label="货物尺寸" :span="4">
<el-descriptions-item label="" :span="4">
<el-table
class="cargoList"
:cell-style="{
@ -83,12 +83,17 @@
max-height="300px"
>
<el-table-column :label="$t('序号')" align="center" width="60">
<el-table-column :label="$t('序号')" align="center" width="30">
<template slot-scope="scope">
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="60">
<el-table-column prop="goodsName" :label="$t('货物名称')" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.goodsName }}
</template>
</el-table-column>
<!-- <el-table-column prop="length" :label="$t('长(cm)')" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.length }}
</template>
@ -102,17 +107,67 @@
<template slot-scope="scope">
{{ scope.row.height }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.cargoQty }}
</template>
</el-table-column>
<el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.volume }}
</template>
</el-table-column> -->
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.price }}
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column> -->
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.goodsModel }}
</template>
</el-table-column>
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.brand }}
</template>
</el-table-column>
<!-- <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.material }}
</template>
</el-table-column>
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.purpose }}
</template>
</el-table-column>
<el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.ingredients }}
</template>
</el-table-column>
<el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.supplier }}
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('描述')" align="center" width="80">
<template slot-scope="scope">
@ -131,26 +186,26 @@
<el-col :span="12">
<el-col :span="24">
<el-descriptions :title="$t('收费信息')" size="small" :column="4" style="margin-top:10px">
<el-descriptions-item label="计费方式" :span="4">
<!-- <el-descriptions-item label="计费方式" :span="4">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="form.calcFeeType"/>
</el-descriptions-item>
<el-descriptions-item label="是否特殊报价" :span="1">
</el-descriptions-item> -->
<!-- <el-descriptions-item label="是否特殊报价" :span="1">
<span v-if="form.blSpecialQuote == 1"> 是 </span>
<span v-else> 否 </span>
</el-descriptions-item>
<el-descriptions-item label="是否敏感物" :span="4">
<span v-if="form.blSensitive == 1"> 是 </span>
<span v-else> 否 </span>
</el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item label="支付方式" :span="4">
<dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
</el-descriptions-item>
<!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item>
<el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item>
<!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
<el-descriptions-item label="费用明细" :span="4">
<el-table
class="cargoList"
@ -208,14 +263,13 @@
</el-descriptions-item>
<el-descriptions-item label="运费" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
<el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item>
<!-- <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item> -->
</el-descriptions>
</el-col>
</el-row>
<el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
<el-descriptions-item label="运单备注" :span="4">{{ form.remark }}</el-descriptions-item>
<el-descriptions-item label="订单备注" :span="4">{{ form.orderRemark }}</el-descriptions-item>
</el-descriptions>
</div>