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

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-05-13 20:16:01 +08:00
commit 70a5c9e631
26 changed files with 1167 additions and 1024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -1,2 +1,3 @@
rm -rf dist
git pull
yarn run build:prod

10
src/App.vue
View File

@ -33,8 +33,16 @@ export default {
}
</script>
<style scoped>
<style lang="scss" scoped>
body .el-table th.gutter{
display: table-cell!important;
}
body .el-table {
th.gutter, colgroup.gutter {
width: 5px !important;
}
}
body .el-table__header colgroup col[name="gutter"] {
display: table-cell !important;
}
</style>

98
src/assets/ext/dticonfont/demo_index.html
View File

@ -54,6 +54,30 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe653;</span>
<div class="name">收</div>
<div class="code-name">&amp;#xe653;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe654;</span>
<div class="name">寄</div>
<div class="code-name">&amp;#xe654;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe691;</span>
<div class="name">收</div>
<div class="code-name">&amp;#xe691;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe655;</span>
<div class="name">寄</div>
<div class="code-name">&amp;#xe655;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">dizhibao</div>
@ -2250,9 +2274,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1714125383903') format('woff2'),
url('iconfont.woff?t=1714125383903') format('woff'),
url('iconfont.ttf?t=1714125383903') format('truetype');
src: url('iconfont.woff2?t=1715591649936') format('woff2'),
url('iconfont.woff?t=1715591649936') format('woff'),
url('iconfont.ttf?t=1715591649936') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -2278,6 +2302,42 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-shou"></span>
<div class="name">
收
</div>
<div class="code-name">.icon-shou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-ji"></span>
<div class="name">
寄
</div>
<div class="code-name">.icon-ji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shou1"></span>
<div class="name">
收
</div>
<div class="code-name">.icon-shou1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-ji1"></span>
<div class="name">
寄
</div>
<div class="code-name">.icon-ji1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-dizhibao"></span>
<div class="name">
@ -5572,6 +5632,38 @@
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shou"></use>
</svg>
<div class="name">收</div>
<div class="code-name">#icon-shou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-ji"></use>
</svg>
<div class="name">寄</div>
<div class="code-name">#icon-ji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shou1"></use>
</svg>
<div class="name">收</div>
<div class="code-name">#icon-shou1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-ji1"></use>
</svg>
<div class="name">寄</div>
<div class="code-name">#icon-ji1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-dizhibao"></use>

22
src/assets/ext/dticonfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1592989 */
src: url('iconfont.woff2?t=1714125383903') format('woff2'),
url('iconfont.woff?t=1714125383903') format('woff'),
url('iconfont.ttf?t=1714125383903') format('truetype');
src: url('iconfont.woff2?t=1715591649936') format('woff2'),
url('iconfont.woff?t=1715591649936') format('woff'),
url('iconfont.ttf?t=1715591649936') format('truetype');
}
.iconfont {
@ -13,6 +13,22 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shou:before {
content: "\e653";
}
.icon-ji:before {
content: "\e654";
}
.icon-shou1:before {
content: "\e691";
}
.icon-ji1:before {
content: "\e655";
}
.icon-dizhibao:before {
content: "\e651";
}

2
src/assets/ext/dticonfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

28
src/assets/ext/dticonfont/iconfont.json
View File

@ -5,6 +5,34 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "6334001",
"name": "收",
"font_class": "shou",
"unicode": "e653",
"unicode_decimal": 58963
},
{
"icon_id": "7945718",
"name": "寄",
"font_class": "ji",
"unicode": "e654",
"unicode_decimal": 58964
},
{
"icon_id": "10715991",
"name": "收",
"font_class": "shou1",
"unicode": "e691",
"unicode_decimal": 59025
},
{
"icon_id": "25151894",
"name": "寄",
"font_class": "ji1",
"unicode": "e655",
"unicode_decimal": 58965
},
{
"icon_id": "25775765",
"name": "dizhibao",

BIN
src/assets/ext/dticonfont/iconfont.ttf
View File

Binary file not shown.

BIN
src/assets/ext/dticonfont/iconfont.woff
View File

Binary file not shown.

BIN
src/assets/ext/dticonfont/iconfont.woff2
View File

Binary file not shown.

6
src/assets/styles/custom.scss
View File

@ -445,11 +445,13 @@
}
.form-group-title {
border-left: 4px solid #b12e29;
padding-left: 5px;
font-size: 14px;
font-weight: 600;
margin-bottom: 6px;
.title{
padding-left: 5px;
border-left: 4px solid #b12e29;
}
}

2
src/views/emis/EmisBaseTools/CountryPicker.vue
View File

@ -9,7 +9,7 @@
@blur="onBlur"
@change="onChange"
>
<el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.code+'-'+item.nameEn+')'" :value="item.code" ></el-option>
<el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
</el-select>
<!-- style="width:100%" -->
</template>

22
src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
View File

@ -108,11 +108,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
watch: {
value(newVal,oldVal) {
this.svalue = newVal;
console.log("xxx1=>"+newVal)
console.log("xxx2=>"+oldVal)
if(newVal!=oldVal && this.firstFlag){
this.initData();
}
},
postCode(newVal){
// this.getList();
@ -188,15 +184,24 @@ import { getStaffList } from "@/api/emis/emisStaff";
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
},
initData(){
if(this.svalue && this.firstFlag ){
// && this.firstFlag
if(this.svalue){
let queryParams = {
empCode:this.svalue
}
getStaffList(queryParams).then(response => {
// this.dataList=response.rows;
if(response.rows.length > 0) {
const curItem = response.rows[0];
// this.slable=curItem.empName;
this.showItem(curItem);
}else{
const curItem ={
empCode:this.svalue,
empName:''
};
this.showItem(curItem);
}
this.firstFlag = false;
});
}
@ -220,7 +225,10 @@ import { getStaffList } from "@/api/emis/emisStaff";
});
},
showItem(item){
this.slable=item.empCode+'-'+item.empName;
console.log(item);
// this.slable=item.empCode+'-'+item.empName;
this.slable=item.empName;
this.$emit("input", this.svalue);
this.$emit("onChange",item);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);

6
src/views/emis/EmisBaseTools/TransProductCasPicker.vue
View File

@ -71,7 +71,7 @@ export default {
else if(level==1){
let obj = {
value: item.prodCode,
label: item.prodName,
label: item.prodName+"("+item.agingDesc+")",
leaf: true,
};
nodes.push(obj);
@ -95,7 +95,7 @@ export default {
},
svalue(newVal, oldVal) {
if (newVal !== oldVal) {
this.$emit("input", this.svalue);
}
},
countryCode(newVal) {
@ -141,6 +141,8 @@ export default {
},
handleChange(value) {
console.log(value);
this.$emit("input", this.svalue);
this.$emit("onChange", this.svalue);
},
},
};

218
src/views/emis/emisBrand/emisBrandForm.vue
View File

@ -1,218 +0,0 @@
<template>
<div >
<el-row :gutter="0">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="24">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="英文名称" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="logo" prop="logo">
<el-input v-model="form.logo" placeholder="请输入logo" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="url" prop="url">
<el-input v-model="form.url" placeholder="请输入url" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="排序" prop="sortOrder">
<el-input v-model="form.sortOrder" placeholder="请输入排序" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="0-未开放" prop="status">
<el-input v-model="form.status" placeholder="请输入0-未开放" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="品牌图片(多图;号隔开)" prop="brandImg">
<el-input v-model="form.brandImg" placeholder="请输入品牌图片(多图;号隔开)" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="删除标志（0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
</el-form-item>
</el-col>
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisBrandOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
</el-form>
</el-row>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisBrand, getEmisBrand, delEmisBrand, addEmisBrand, updateEmisBrand } from "@/api/emis/emisBrand";
export default {
name: "emisBrandForm",
props:{
id:undefined
},
components: { },
dicts: [
],
data() {
return {
emisBrandOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "名称不能为空", trigger: "blur" }
],
nameEn: [
{ required: true, message: "英文名称不能为空", trigger: "blur" }
],
logo: [
{ required: true, message: "logo不能为空", trigger: "blur" }
],
url: [
{ required: true, message: "url不能为空", trigger: "blur" }
],
sortOrder: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "0-未开放不能为空", trigger: "blur" }
],
brandImg: [
{ required: true, message: "品牌图片(多图;号隔开)不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
initData() {
this.reset();
if(this.id !=undefined) {
this.loading = true;
getEmisBrand(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}
this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
name: null,
nameEn: null,
logo: null,
url: null,
sortOrder: null,
status: null,
brandImg: null,
remark: null,
tenantId: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisBrand(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisBrand(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
/** 转换菜单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.idName,
children: node.children
};
},
/** 查询菜单下拉树结构 */
getTreeselect() {
const queryParams = {}
listEmisBrand(queryParams).then(response => {
this.emisBrandOptions = [];
const rootItem = { idId: 0, emisBrandName: '-', children: [] };
rootItem.children = this.handleTree(response.data, "id");
this.emisBrandOptions.push(rootItem);
if(this.parentId != undefined) {
this.form.parentId = this.parentId;
}
});
},
}
};
</script>

4
src/views/emis/emisBrand/index.vue
View File

@ -201,12 +201,10 @@
<script>
import { listEmisBrand, getEmisBrand, delEmisBrand, addEmisBrand, updateEmisBrand,changeBrandStatus } from "@/api/emis/emisBrand";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisBrandForm from '@/views/emis/emisBrand/emisBrandForm';
export default {
name: "emisBrand",
components: { elDateSimplePicker,emisBrandForm },
components: { },
dicts: ['sys_normal_disable'],
data() {
return {

3
src/views/emis/emisCountry/index.vue
View File

@ -357,6 +357,9 @@ export default {
nameEn: [
{ required: true, message: "英文名称不能为空", trigger: "blur" }
],
continentId: [
{ required: true, message: "区域不能为空", trigger: ["blur",'change'] }
],
code: [
{ required: true, message: "国家编码不能为空", trigger: "blur" },
{ validator: this.validateCountryCode, trigger: "blur" }

137
src/views/emis/emisCustomerUser/emisCustomerUserView.vue
View File

@ -1,137 +0,0 @@
<template>
<div class="">
<el-row>
<el-button icon="el-icon-arrow-left" size="small" @click="backClick">返回</el-button>
<el-button size="small" @click="successOrder">操作</el-button>
</el-row>
<el-descriptions title="基本信息：" class="margin-top" :column="1" border>
<el-descriptions-item label="id">{{ emisCustomerUser.id }}</el-descriptions-item>
<el-descriptions-item label="客户编码">{{ emisCustomerUser.customerCode }}</el-descriptions-item>
<el-descriptions-item label="客户名称">{{ emisCustomerUser.shortName }}</el-descriptions-item>
<el-descriptions-item label="英文简称">{{ emisCustomerUser.customerNameEn }}</el-descriptions-item>
<el-descriptions-item label="寄件人">{{ emisCustomerUser.customerFullName }}</el-descriptions-item>
<el-descriptions-item label="客户类型">{{ emisCustomerUser.customerType }}</el-descriptions-item>
<el-descriptions-item label="用户类型">{{ emisCustomerUser.userType }}</el-descriptions-item>
<el-descriptions-item label="所属公司">{{ emisCustomerUser.company }}</el-descriptions-item>
<el-descriptions-item label="部门id">{{ emisCustomerUser.deptId }}</el-descriptions-item>
<el-descriptions-item label="手机号">{{ emisCustomerUser.mobile }}</el-descriptions-item>
<el-descriptions-item label="电话">{{ emisCustomerUser.phone }}</el-descriptions-item>
<el-descriptions-item label="头像">{{ emisCustomerUser.avatar }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ emisCustomerUser.sex }}</el-descriptions-item>
<el-descriptions-item label="邀请人">{{ emisCustomerUser.invitationInfo }}</el-descriptions-item>
<el-descriptions-item label="最后登录ip">{{ emisCustomerUser.loginIp }}</el-descriptions-item>
<el-descriptions-item label="最后登录日期">{{ emisCustomerUser.loginDate }}</el-descriptions-item>
<el-descriptions-item label="称呼">{{ emisCustomerUser.nickName }}</el-descriptions-item>
<el-descriptions-item label="union_id">{{ emisCustomerUser.unionId }}</el-descriptions-item>
<el-descriptions-item label="wxopenid">{{ emisCustomerUser.openid }}</el-descriptions-item>
<el-descriptions-item label="主月结卡号">{{ emisCustomerUser.monthlyPayCode }}</el-descriptions-item>
<el-descriptions-item label="登录账号">{{ emisCustomerUser.userName }}</el-descriptions-item>
<el-descriptions-item label="登录密码">{{ emisCustomerUser.password }}</el-descriptions-item>
<el-descriptions-item label="归属站点">{{ emisCustomerUser.ownerSite }}</el-descriptions-item>
<el-descriptions-item label="归属站点密码">{{ emisCustomerUser.siteCode }}</el-descriptions-item>
<el-descriptions-item label="结算类型">{{ emisCustomerUser.balanceMode }}</el-descriptions-item>
<el-descriptions-item label="联系人">{{ emisCustomerUser.linkman }}</el-descriptions-item>
<el-descriptions-item label="传真">{{ emisCustomerUser.fax }}</el-descriptions-item>
<el-descriptions-item label="地址">{{ emisCustomerUser.address }}</el-descriptions-item>
<el-descriptions-item label="email">{{ emisCustomerUser.email }}</el-descriptions-item>
<el-descriptions-item label="国家">{{ emisCustomerUser.country }}</el-descriptions-item>
<el-descriptions-item label="省份">{{ emisCustomerUser.province }}</el-descriptions-item>
<el-descriptions-item label="城市">{{ emisCustomerUser.city }}</el-descriptions-item>
<el-descriptions-item label="区县">{{ emisCustomerUser.district }}</el-descriptions-item>
<el-descriptions-item label="镇">{{ emisCustomerUser.town }}</el-descriptions-item>
<el-descriptions-item label="发件国">{{ emisCustomerUser.sendCountry }}</el-descriptions-item>
<el-descriptions-item label="发件省">{{ emisCustomerUser.sendProvince }}</el-descriptions-item>
<el-descriptions-item label="发件区">{{ emisCustomerUser.sendDistrict }}</el-descriptions-item>
<el-descriptions-item label="发件镇">{{ emisCustomerUser.sendTown }}</el-descriptions-item>
<el-descriptions-item label="邮编">{{ emisCustomerUser.postCode }}</el-descriptions-item>
<el-descriptions-item label="启用状态">{{ emisCustomerUser.status }}</el-descriptions-item>
<el-descriptions-item label="真实姓名">{{ emisCustomerUser.realName }}</el-descriptions-item>
<el-descriptions-item label="身份证号">{{ emisCustomerUser.idNo }}</el-descriptions-item>
<el-descriptions-item label="回款联系人">{{ emisCustomerUser.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人">{{ emisCustomerUser.salesmen }}</el-descriptions-item>
<el-descriptions-item label="创建人">{{ emisCustomerUser.createMan }}</el-descriptions-item>
<el-descriptions-item label="创建网点">{{ emisCustomerUser.createSite }}</el-descriptions-item>
<el-descriptions-item label="创建网点代码">{{ emisCustomerUser.createSiteCode }}</el-descriptions-item>
<el-descriptions-item label="修改站点代码">{{ emisCustomerUser.modifySiteCode }}</el-descriptions-item>
<el-descriptions-item label="是否开通oms">{{ emisCustomerUser.blOpenOms }}</el-descriptions-item>
<el-descriptions-item label="是否短信">{{ emisCustomerUser.blSms }}</el-descriptions-item>
<el-descriptions-item label="所属业务员">{{ emisCustomerUser.operationEmployee }}</el-descriptions-item>
<el-descriptions-item label="所属业务员编号">{{ emisCustomerUser.operationEmployeeCode }}</el-descriptions-item>
<el-descriptions-item label="创建人代码">{{ emisCustomerUser.createManCode }}</el-descriptions-item>
<el-descriptions-item label="修改人">{{ emisCustomerUser.modifier }}</el-descriptions-item>
<el-descriptions-item label="修改人代码">{{ emisCustomerUser.modifierCode }}</el-descriptions-item>
<el-descriptions-item label="修改站点">{{ emisCustomerUser.modifySite }}</el-descriptions-item>
<el-descriptions-item label="排序">{{ emisCustomerUser.orderNum }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ emisCustomerUser.remark }}</el-descriptions-item>
<el-descriptions-item label="删除标志（0代表存在">{{ emisCustomerUser.delFlag }}</el-descriptions-item>
<el-descriptions-item label="创建者">{{ emisCustomerUser.createBy }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ emisCustomerUser.createTime }}</el-descriptions-item>
<el-descriptions-item label="更新者">{{ emisCustomerUser.updateBy }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ emisCustomerUser.updateTime }}</el-descriptions-item>
</el-descriptions>
</div>
</template>
<script>
import { getEmisCustomerUser } from "@/api/emis/emisCustomerUser";
export default {
name: "emisCustomerUserView",
props:{
id:undefined
},
dicts: [],
data() {
return {
// 遮罩层
loading: true,
// 快递客户用户表格数据
emisCustomerUser: {}
};
},
created() {
this.initData();
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
methods: {
/** 查询快递客户用户列表 */
initData() {
this.loading = true;
getEmisCustomerUser(this.id).then(response => {
this.emisCustomerUser = response.data;
this.loading = false;
});
},
}
};
</script>
<style rel="stylesheet/scss" lang="scss">
.margin-top{
margin-top: 20px;
}
.el-descriptions-item__label.is-bordered-label {
min-width: 80px;
}
.printMeClass {
font-family: SimHei;
label {
font-weight: normal;
}
}
</style>

108
src/views/emis/emisCustomerUser/emisCustomerUserForm.vue → src/views/emis/emisCustomerUser/moneyUserForm.vue
View File

@ -1,6 +1,6 @@
<template>
<div >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
@ -18,12 +18,8 @@
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属站点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="结算类型" prop="settledType">
<el-select v-model="form.settledType" placeholder="请选择">
<el-option
@ -34,7 +30,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="称呼" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入称呼" />
@ -47,7 +43,6 @@
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入email" />
@ -69,11 +64,11 @@
<el-input v-model="form.userType" placeholder="请输入用户类型" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="月结卡号" prop="monthlyPayCode">
<el-input v-model="form.monthlyPayCode" placeholder="月结卡号" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="16">
<el-form-item label="所属公司" prop="company">
<el-input v-model="form.company" placeholder="请输入所属公司" />
@ -135,12 +130,12 @@
<el-col :span="8">
<el-form-item label="所属国家" prop="countryCode">
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="省市区" prop="">
<el-form-item label="省市区" prop="areaInfo">
<div style="display: inline-flex">
<ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
<CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
@ -224,20 +219,25 @@
<el-input v-model="form.idNo" placeholder="请输入身份证号" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="所属站点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" disabled></EmisSiteSimplePicker>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="专属业务员" prop="opEmpCode" label-width="100px">
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
<el-form-item label="所属业务员" prop="opEmpCode" label-width="100px">
<EmisUserSimplePicker0 :placeholder="$t('所属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="回款联系人" prop="payee" label-width="90px">
<el-form-item label="回款联系人" prop="payee" label-width="100px">
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- postCode="OP" -->
<el-form-item label="销售联系人" prop="salesmen" label-width="90px">
<el-form-item label="销售联系人" prop="salesmen" label-width="100px">
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
</el-col>
@ -247,25 +247,25 @@
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" label-width="80px">
<!-- <el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" label-width="100px">
<el-radio-group v-model="form.blOpenOms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="是否短信" prop="blSms">
<el-radio-group v-model="form.blSms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="是否启用" prop="status">
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
@ -335,8 +335,53 @@ export default {
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
customerName: [
{ required: true, message: "客户名称不能为空", trigger: ["blur",'change'] }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
],
customerType: [
{ required: true, message: "客户类型不能为空", trigger: "blur" }
],
// settledType: [
// { required: true, message: "结算类型不能为空", trigger: "blur" }
// ],
// monthlyPayCode: [
// { required: true, message: "主月结卡号不能为空", trigger: "blur" }
// ],
ownerSite: [
{ required: true, message: "归属站点不能为空", trigger: ["blur",'change'] }
],
areaInfo: [
{ validator: this.validateMuti,message: "省份不能为空", trigger: ["blur",'change'] }
],
country: [
{ required: true, message: "国家不能为空", trigger: ["blur",'change'] }
],
// province: [
// { required: true, message: "省份不能为空", trigger: ["blur",'change'] }
// ],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "启用状态不能为空", trigger: ["blur",'change'] }
],
payee: [
{ required: true, message: "回款联系人不能为空", trigger: ["blur",'change'] }
],
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
blOpenOms: [
{ required: true, message: "是否开通oms不能为空", trigger: ["blur",'change'] }
],
blSms: [
{ required: true, message: "是否短信不能为空", trigger: ["blur",'change']}
],
opEmpCode: [
{ required: true, message: "专属业务员不能为空", trigger: ["blur",'change'] }
],
}
};
@ -355,6 +400,17 @@ export default {
},
methods: {
validateMuti (rule, value, callback) {
// if (!this.form.country) {
// callback(new Error("国家不能为空"));
// }
if (!this.form.province) {
callback(new Error("省份不能为空"));
}
else {
callback();
}
},
initData() {
if(this.id !=null) {
this.loading = true;
@ -381,7 +437,7 @@ export default {
phone: null,
mobile: null,
customerType: this.customerType,
settledType: null,
settledType: '1',
userType: null,
company: null,
deptId: null,

7
src/views/emis/emisCustomerUser/moneyUserList.vue
View File

@ -191,7 +191,7 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="60%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCustomerUserForm :id="currentId" customerType="1" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerUserForm>
<moneyUserForm :id="currentId" customerType="1" @on-changed="handleFormChanged" @on-cancel="cancelForm"></moneyUserForm>
</el-dialog>
@ -201,12 +201,11 @@
<script>
import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
import emisCustomerUserForm from '@/views/emis/emisCustomerUser/emisCustomerUserForm';
import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm';
export default {
name: "moneyUserList",
components: { elDateSimplePicker,emisCustomerUserForm },
components: { elDateSimplePicker,moneyUserForm },
dicts: [
],
data() {

400
src/views/emis/emisCustomerUser/monthUserForm.vue Normal file
View File

@ -0,0 +1,400 @@
<template>
<div >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item label="客户编码" prop="customerCode">
<el-input v-model="form.customerCode" placeholder="自动生成" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话号码" prop="phone" label-width="80px">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属站点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结算类型" prop="settledType">
<el-select v-model="form.settledType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_cus_settled_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="称呼" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入称呼" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="英文简称" prop="customerNameEn">
<el-input v-model="form.customerNameEn" placeholder="请输入英文简称" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入email" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="客户类型" prop="customerType">
<el-input v-model="form.customerType" placeholder="请输入客户类型" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户类型" prop="userType">
<el-input v-model="form.userType" placeholder="请输入用户类型" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="月结卡号" prop="monthlyPayCode">
<el-input v-model="form.monthlyPayCode" placeholder="月结卡号" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="所属公司" prop="company">
<el-input v-model="form.company" placeholder="请输入所属公司" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="省市区" prop="areaInfo">
<div style="display: inline-flex">
<ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
<CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
<DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
<!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专属业务员" prop="opEmpCode" label-width="100px">
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="回款联系人" prop="payee" label-width="90px">
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- postCode="OP" -->
<el-form-item label="销售联系人" prop="salesmen" label-width="90px">
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="启用状态" prop="status">
<el-input v-model="form.status" placeholder="请输入启用状态" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" label-width="80px">
<el-radio-group v-model="form.blOpenOms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否短信" prop="blSms">
<el-radio-group v-model="form.blSms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!--
<el-col :span="8">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
export default {
name: "emisCustomerUserForm",
props:{
id:{
type:Number
},
customerType:{
type:[Number,String],
required: true
}
},
components: {
CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
},
dicts: ['emis_cus_settled_type'],
data() {
return {
emisCustomerUserOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
customerName: [
{ required: true, message: "客户名称不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
],
customerType: [
{ required: true, message: "客户类型不能为空", trigger: "blur" }
],
settledType: [
{ required: true, message: "结算类型不能为空", trigger: "blur" }
],
monthlyPayCode: [
{ required: true, message: "主月结卡号不能为空", trigger: "blur" }
],
ownerSite: [
{ required: true, message: "归属站点不能为空", trigger: "blur" }
],
areaInfo: [
{ required: true, message: "省份不能为空", trigger: "blur" },
{ validator: this.validateMuti, trigger: ["blur",'change'] }
],
country: [
{ required: true, message: "国家不能为空", trigger: "blur" }
],
// province: [
// { required: true, message: "省份不能为空", trigger: "blur" }
// ],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "启用状态不能为空", trigger: "blur" }
],
payee: [
{ required: true, message: "回款联系人不能为空", trigger: "blur" }
],
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: "blur" }
],
blOpenOms: [
{ required: true, message: "是否开通oms不能为空", trigger: "blur" }
],
blSms: [
{ required: true, message: "是否短信不能为空", trigger: "blur" }
],
opEmpCode: [
{ required: true, message: "专属业务员不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
validateMuti (rule, value, callback) {
// if (!this.form.country) {
// callback(new Error("国家不能为空"));
// }
if (!this.form.province) {
callback(new Error("省份不能为空"));
}
else {
callback();
}
},
initData() {
if(this.id !=null) {
this.loading = true;
getEmisCustomerUser(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
customerCode: null,
customerName: null,
customerNameEn: null,
phone: null,
mobile: null,
customerType: this.customerType,
settledType: '2',
userType: null,
company: null,
deptId: null,
avatar: null,
sex: null,
invitationInfo: null,
loginIp: null,
loginDate: null,
nickName: null,
unionId: null,
openid: null,
monthlyPayCode: null,
userName: null,
password: null,
ownerSite: null,
country: null,
province: null,
city: null,
county: null,
town: null,
address: null,
email: null,
sendCountry: null,
sendProvince: null,
sendCity: null,
sendCounty: null,
sendTown: null,
postCode: null,
status: null,
realName: null,
idNo: null,
payee: null,
salesmen: null,
blOpenOms: null,
blSms: null,
opEmpCode: null,
orderNum: null,
remark: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisCustomerUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisCustomerUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
}
};
</script>
<style lang="scss" scoped>
// .el-row{
// display:flex;
// flex-wrap: wrap;
// }
// .el-col{
// min-height: 1px;
// }
</style>

12
src/views/emis/emisCustomerUser/monthUserList.vue
View File

@ -174,16 +174,10 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="60%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCustomerUserForm :id="currentId" customerType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerUserForm>
<monthUserForm :id="currentId" customerType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></monthUserForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCustomerUserView :id="id" ></EmisCustomerUserView>
</el-dialog>
-->
</div>
</template>
@ -191,11 +185,11 @@
import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
import emisCustomerUserForm from '@/views/emis/emisCustomerUser/emisCustomerUserForm';
import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
export default {
name: "monthUserList",
components: { elDateSimplePicker,emisCustomerUserForm },
components: { elDateSimplePicker,monthUserForm },
dicts: [
],
data() {

32
src/views/emis/emisQuoteExpression/quoteExpressionPanel.vue
View File

@ -35,23 +35,6 @@
<el-table size="mini" v-loading="loading" :data="emisQuoteExpressionList" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="center" width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column> -->
<!--
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
-->
<!-- <el-table-column label="报价序号" align="center" prop="quoteSequence" min-width="100" /> -->
<!-- <el-table-column label="使用站点代码" align="center" prop="useSiteCode" min-width="100" />
<el-table-column label="使用站点名称" align="center" prop="useSite" min-width="100" />
<el-table-column label="起始重量" align="center" prop="startWeight" min-width="100" />
<el-table-column label="结束重量" align="center" prop="endWeight" min-width="100" /> -->
<el-table-column label="序号" align="center" prop="quoteSequence" width="60" />
<el-table-column label="范围" align="center" prop="conditionExpression" width="150">
<template slot-scope="scope">
@ -59,7 +42,7 @@
</template>
</el-table-column>
<el-table-column label="公式" align="center" prop="calculateExpression" width="100" />
<el-table-column label="首重(s)" align="center" prop="initialWeight" width="100" />
<el-table-column label="首重费(s)" align="center" prop="initialWeight" width="100" />
<el-table-column label="续重单价(d)" align="center" prop="additionalWeight" width="100" />
<!-- <el-table-column label="条件表达式" align="center" prop="conditionExpression" min-width="100" /> -->
@ -93,7 +76,7 @@
<el-alert
title="填写说明"
type="info"
description="计算公式中只能包含(s,w,d数字,+,.*,/).示例:0-1公斤 首重5元，1-3 公斤 每公斤2元加上首重,计算公式: 5+(w-1)*2"
description="计算公式中只能包含(s,w,d数字,+,.*,/).示例:0-1公斤 首重费(s):5元，续重单价(d):每公斤2元 ,则计算公式: s+(w-1)*d"
show-icon
:closable="false"
style="margin-bottom: 10px;"
@ -121,7 +104,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="首重(s)" prop="initialWeight">
<el-form-item label="首重费(s)" prop="initialWeight">
<el-input v-model="form.initialWeight" placeholder="" />
</el-form-item>
</el-col>
@ -290,9 +273,12 @@ export default {
this.form.additionalWeight=0;
if(quoteSequence==2){
this.form.calculateExpression='1+(w-1)*2';
}else{
this.form.calculateExpression='w*2';
this.form.initialWeight=lastData.calculateExpression;
this.form.calculateExpression='s+(w-'+lastData.endWeight+')*d';
}
else if(quoteSequence>2){
// this.form.initialWeight=lastData.initialWeight;
this.form.calculateExpression='w*d';
}

7
src/views/emis/emisTransProduct/emisTransProductForm.vue
View File

@ -1,7 +1,7 @@
<template>
<div >
<el-row :gutter="0">
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<el-form-item label="类型名称" prop="prodName">
<el-input v-model="form.prodName" placeholder="请输入名称" />
@ -86,9 +86,8 @@
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-form>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>

56
src/views/emis/emisTransProduct/index.vue
View File

@ -58,7 +58,7 @@
</el-select>
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-select v-model="queryParams.status" no-match-text filterable placeholder="启用状态" @change="handleQuery">
<el-select v-model="queryParams.status" filterable clearable placeholder="启用状态" @change="handleQuery">
<el-option key="0" label="停用" :value="0" />
<el-option key="1" label="启用" :value="1" />
</el-select>
@ -129,48 +129,6 @@
</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="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<!-- <el-table-column label="类型代码" align="center" prop="prodCode" min-width="100" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodCode}}</div>
</template>
</el-table-column> -->
<el-table-column label="类型名称" align="left" prop="prodName" min-width="150" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodName}}</div>
@ -178,18 +136,10 @@
</el-table-column>
<el-table-column label="英文名称" align="center" prop="prodNameEn" min-width="100" />
<el-table-column label="时效标识" align="center" prop="agingDesc" min-width="100" />
<el-table-column label="最小时效" align="center" prop="minAging" width="80" />
<el-table-column label="最大时效" align="center" prop="maxAging" width="80" />
<el-table-column label="所属路线" align="center" prop="transLine" min-width="100" />
<el-table-column label="所属国家" align="center" prop="countryName" min-width="100" />
<!-- <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column> -->
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>

468
src/views/emis/emisWaybill/emisWaybillRecord.vue
View File

@ -1,20 +1,27 @@
<template>
<div class="app-container">
<el-form ref="form" size="small" :model="form" :rules="rules" label-width="90px">
<el-row :gutter="0" >
<el-col :span="24">
<div class="form-group-title">{{ $t('发货信息') }}</div>
<el-form ref="form" size="small" :model="form" :rules="rules" label-width="100px">
<el-collapse v-model="activeNames">
<el-collapse-item title="" name="1">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('基础信息') }}</span></div>
</template>
<div>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="18">
<el-form-item label="运单号" prop="billCode" >
<div style="display:inline-flex">
<!-- @keyup.enter.native="initData" -->
<div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
<div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="目的国" prop="reciever.country">
<CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
</el-form-item>
@ -24,16 +31,13 @@
<TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-col :span="12">
<el-form-item label="产品类型" prop="productType">
<TransProductCasPicker v-model="form.productType" :countryCode="form.reciever.country" ></TransProductCasPicker>
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
<!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="form.sendDate" placeholder="" readonly="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="报关方式" prop="customsEclaration">
@ -59,9 +63,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取件类型" prop="pickupMethod">
<el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="form.pickupMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_qujian_fangshi"
@ -72,18 +75,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<el-col :span="6" v-if="form.pickupMethod==1">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
<el-radio
@ -91,7 +94,8 @@
:key="dict.value"
:label="dict.value"
>
<span style="font-size:10px" >{{dict.label}}</span>
<!-- style="font-size:10px" -->
<span >{{dict.label}}</span>
</el-radio>
</el-radio-group>
</el-form-item>
@ -118,18 +122,29 @@
</el-col> -->
</el-row>
<el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
</div>
</el-collapse-item>
<el-collapse-item title="" name="2">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
</template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
<el-col :span="12">
<el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
<el-col :span="24" style="display:inline-flex">
<div class="form-group-title" style="width:50%">寄件人</div>
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%">
<span style="border-radius: 15px;
padding: 5px 15px;
background: black;
font-size: 13px;
color: white;">寄件</span>
</div>
<div style="width:50%;text-align:right;padding-right: 15px;">
<!-- icon="el-icon-edit" -->
<el-button
size="mini"
type="text"
style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
class="iconfont icon-dizhibao"
@click="handleSelectCustomerAddress(1)"
>寄件地址薄</el-button>
@ -189,8 +204,14 @@
<el-col :span="12">
<el-row :gutter="0" style="padding: 8px;">
<el-col :span="24" style="display:inline-flex">
<div class="form-group-title" style="width:50%">收件人</div>
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%">
<span style="border-radius: 15px;
padding: 5px 15px;
background: #b12e29;
font-size: 13px;
color: white;">收件</span>
</div>
<div style="width:50%;text-align:right;padding-right: 15px;">
<el-button
size="mini"
@ -229,12 +250,6 @@
<el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="国家" prop="reciever.country">
<country-picker2 v-model="form.reciever.country"></country-picker2>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="国家地区" prop="reciever.province">
<div style="display:inline-flex">
@ -280,218 +295,106 @@
</el-col>
</el-row>
<el-row :gutter="0" style="border-radius: 5px;margin-top:10px">
</el-collapse-item>
<el-collapse-item title="" name="3">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('货物信息') }}</span>
</div>
</template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<el-col :span="24">
<div class="form-group-title">货物信息</div>
</el-col>
<div class="form-row-group-panel">
<el-col :span="24">
<el-form-item label="货物描述" prop="goodsType">
<GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange"></GoodsPicker>
<el-input v-model="form.goodsInfo" type="textarea" placeholder="货物描述" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="包装类型" prop="packType">
<el-select v-model="form.packType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_tab_packing_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="件数" prop="parcelQty">
<el-input v-model="form.parcelQty" style="text-align: right;" placeholder="请输入件数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际重量" prop="billWeight">
<el-input v-model="form.billWeight" @blur="calcSettlementWeightByRemote()" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="体积" prop="totalVolume" label-width="60px" >
<div style="display:inline-flex">
<el-input v-model="form.length" style="width:80px" placeholder="长" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.width" style="margin-left:5px;width:80px" placeholder="宽" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.height" style="margin-left:5px;width:80px" placeholder="高" >
<span slot="suffix">(cm)</span>
</el-input>
</div>
<div style="">
<el-input v-model="form.totalVolume" @blur="calcSettlementWeightByRemote()" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体积重量" prop="volumeWeight">
<el-input v-model="form.volumeWeight" placeholder="" disabled>
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结算重量" prop="settlementWeight">
<el-input v-model="form.settlementWeight" placeholder="" disabled >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="" prop="blOverWeight">
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="超重件数" prop="overWeightNumber">
<el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否生成子单" prop="blGenSubbill" label-width="120px">
<el-radio-group v-model="form.blGenSubbille">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
<el-col :span="12" class="cargoList">
<div>体积信息</div>
<el-table
:cell-style="{
'padding': '0px!important',
'padding-left': '0px!important',
'padding-right': '0px!important',
'font-size':'11px'
}"
:header-cell-style="{
'font-size':'11px'
}"
border
stripe
:data="form.cargoList"
size="mini"
style="width: 100%"
>
<!-- @cell-mouse-enter="handleCellEnter"
@cell-mouse-leave="handleCellLeave" -->
<!-- "goodsCode": "货物代码:eg 123",
"goodsName": "货物名称",
"cargoQty": "货物数量: 10",
"unit": "件",
"price": "1.2",
"currency": "CNY",
"nationArea": "中国",
"taxNo": "行邮税号",
"hscode": "海关编码",
"brand": "品牌",
"material": "材质",
"purpose": "用途",
"ingredients": "成分",
"goodsModel": "规格",
"orderNum": "序号",
"supplier": "供应商",
"isSave": "是否保存 1-保存"
-->
<el-table-column label="序号" align="center" width="50">
<template slot-scope="scope">
<span>{{ scope.$index+1 }} </span>
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- v-if="scope.row.isEdit" -->
<!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="子单号" prop="billCodeSub">
<el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同号" prop="custOrderId">
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="进仓单" prop="warehouseInNo">
<WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="运单备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="" />
</el-form-item>
</el-col>
<el-table-column prop="length" label="长(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="width" label="宽(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="height" label="高(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.height" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="cargoQty" label="件数" 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 prop="volumn" label="体积(m³)" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volumn" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="描述" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
</div>
</el-col>
<el-col :span="12">
<el-col :span="24">
<div class="form-group-title">收费信息</div>
</el-col>
<div class="form-row-group-panel">
<el-col :span="24">
<el-divider content-position="left"><span style="font-size: 12px;color: gray;">收费项明细</span></el-divider>
<el-row>
<el-col :span="24" v-for="item in this.form.feeItems" :key="item.code" >
<el-form-item v-if="item.feeCode=='1001'" :label="item.feeName" prop="fee" >
<div style="display:inline-flex">
<div style="width:50%">
<el-input v-model="item.fee" placeholder="" disabled>
<span slot="append">CNY</span>
</el-input>
</div>
<div style="font-size: 12px;color: gray;width:50%">
(计算说明:{{item.calcExp}},续重单价:{{item.addWeightPrice}})
</div>
</div>
</el-form-item>
<el-form-item v-else :label="item.feeName" prop="fee" >
<el-input v-model="item.fee" placeholder="" disabled>
<span slot="append">CNY</span>
</el-input>
</el-form-item>
</el-table>
</el-col>
</el-row>
</el-col>
</el-collapse-item>
<el-collapse-item title="" name="4">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收费信息') }}</span></div>
</template>
</el-collapse-item>
</el-collapse>
<!-- <el-select size="mini" v-model="item.fee.currency" slot="append" placeholder="请选择">
<el-option label="CNY" value="CNY"></el-option>
<el-option label="USD" value="USD"></el-option>
</el-select> -->
<el-col :span="24">
<el-divider content-position="left"><span style="font-size: 12px;color: gray;">付款方式</span></el-divider>
<el-row>
<el-col :span="24">
<el-form-item label="付款方式" prop="paymentType">
<el-select v-model="form.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-form-item label="月结账号" prop="thirdCustomerCode" label-width="80px">
<EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="回款联系人" prop="payee" label-width="100px">
<el-input v-model="form.payee" placeholder="回款联系人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售联系人" prop="salesmen" label-width="100px">
<el-input v-model="form.salesmen" placeholder="销售联系人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="计费方式" prop="calcFeeType" >
<!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
<el-radio-group v-model="form.calcFeeType" >
<el-radio
v-for="dict in dict.type.emis_calc_fee_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-divider content-position="left">收费明细</el-divider>
<el-form-item label="总运费" prop="freight">
<el-input v-model="form.freight" placeholder="" >
</el-input>
</el-form-item>
<el-form-item label="费用备注" prop="feeRemaker">
<el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</div>
</el-col>
</el-row>
</el-form>
<!-- </el-row> -->
@ -519,6 +422,8 @@ import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue'
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@ -570,6 +475,8 @@ components: {
GoodsPicker,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
EmisUserSimplePicker3,
// CustomerPicker0,
// CustomerPicker1,
// CustomerPicker2,
@ -594,12 +501,12 @@ dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_calc_fee_type','emis_print_type'],
data() {
return {
activeNames:['1','2','3','4'],
billCode:null,
emisWaybillOptions: [],
addressType:null,
// 遮罩层
loading: true,
// 表单参数
form: {},
timer:null,
@ -816,6 +723,9 @@ created() {
this.initData();
},
methods: {
openCollapse(index){
},
initData() {
this.reset();
// this.timer=setInterval(this.showLocalTime, 1000);
@ -830,8 +740,30 @@ methods: {
this.loading = true;
getWaybillDetail(this.billCode).then(response => {
this.form = response.data;
this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
this.loading = false;
});
}else{
let cargo={
"goodsCode": "货物代码:eg 123",
"goodsName": "货物名称",
"cargoQty": "货物数量: 10",
"unit": "件",
"price": "1.2",
"currency": "CNY",
"nationArea": "中国",
"taxNo": "行邮税号",
"hscode": "海关编码",
"brand": "品牌",
"material": "材质",
"purpose": "用途",
"ingredients": "成分",
"goodsModel": "规格",
"orderNum": "序号",
"supplier": "供应商",
"isSave": "是否保存 1-保存"
};
this.form.cargoList.push(cargo);
}
},
@ -884,6 +816,7 @@ methods: {
paymentType: null,
calcFeeType: '1',
custNo: null,
productTypeSelArr: null,
transLine: null,
productType: null,
customsClear: null,
@ -935,7 +868,12 @@ methods: {
this.resetForm("form");
},
onTransLineChange(item){
this.form.meterType = item.meterRate;
// this.form.meterType = item.meterRate;
},
onProductChange(item){
console.log(item);
this.form.transLine=item[0];
this.form.productType=item[1];
},
/** 提交按钮 */
submitForm() {
@ -1008,14 +946,15 @@ methods: {
});
}
},
calcVolume(){
// 计算体积
calcVolume(){
if(this.form.length && this.form.width && this.form.height){
let totalVolume=parseFloat(this.form.length)*parseFloat(this.form.width)*parseFloat(this.form.height);
this.form.totalVolume = totalVolume/1000000;
this.calcVolumeWeightByTotalVolume();
}
},
// 计算体积重量
calcVolumeWeightByTotalVolume(){
let postData={
productType: this.form.productType,
@ -1023,28 +962,26 @@ methods: {
}
calcVolumeWeight(postData).then(response => {
console.log(response);
this.form.volumeWeight = response.data.volumeWeight;
});
},
// 计算计算重量
calcSettlementWeightByRemote(){
if(this.form.billWeight
&& this.form.totalVolume
&& this.form.productType
){
let postData={
productType: this.form.productType,
totalVolume: this.form.totalVolume,
volumeWeight: this.form.volumeWeight,
billWeight: this.form.billWeight,
}
// console.log(postData);
calcSetteldWeight(postData).then(response => {
console.log(response);
// this.form.volumeWeight = response.data.volumeWeight;
this.form.settlementWeight = response.data.settlementWeight;
// this.form.feeWeight = this.form.settlementWeight ;
this.form.feeWeight = this.form.settlementWeight ;
});
}
@ -1150,7 +1087,7 @@ methods: {
.form-row-group-panel{
margin-right: 5px;
padding: 8px;
border-right: 1px solid #ededed;
// border-right: 1px solid #ededed;
}
@ -1170,5 +1107,46 @@ methods: {
}
}
.el-collapse {
border-top: none!important;
border-bottom: none!important;
}
.el-table .el-table__cell:first-child .cell {
padding: 0px;
}
.el-table .cell {
padding: 0px;
}
.cargoList{
.el-input__inner {
height: 28px;
line-height: 28px;
border: none;
background: #ffffcd;
font-size: 10px;
padding: 0px;
text-align: center;
}
}
.el-collapse-item__content {
padding-bottom: 0px;
}
.el-collapse-item__header{
pointer-events: none;
}
.el-collapse-item__arrow {
pointer-events: auto;
}
</style>

28
src/views/emis/emisWaybill/waybillList.vue
View File

@ -1313,7 +1313,9 @@
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
<el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.billCode}}</div>
<router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
<span>{{ scope.row.billCode }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
@ -1470,32 +1472,8 @@
<el-table-column :label="$t('时区偏差')" align="center" prop="timezoneOffset" min-width="100" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWaybill:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWaybill:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWaybillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillForm>
</el-dialog> -->
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWaybillView :id="id" ></EmisWaybillView>