|
|
@@ -1551,7 +1551,7 @@
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
+ v-for="(dict, index) in fDNameOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -1897,7 +1897,7 @@
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
+ v-for="(dict, index) in fCNameOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -2435,7 +2435,7 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 28px; font-weight: bold; border: none"
|
|
|
>
|
|
|
- 青岛大木进仓单
|
|
|
+ 青岛{{company}}进仓单
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -2458,7 +2458,7 @@
|
|
|
<td width="450" colspan="3" class="zzss">地址：{{ fAddr }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td width="200" colspan="2" class="zzss">保管方：大木有限公司</td>
|
|
|
+ <td width="200" colspan="2" class="zzss">保管方：{{company}}有限公司</td>
|
|
|
<td width="200" colspan="2" class="zzss">
|
|
|
联系人：{{ form.fContacts }}
|
|
|
</td>
|
|
|
@@ -2564,7 +2564,7 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 26px; font-weight: bold; border: none"
|
|
|
>
|
|
|
- 大木国际物流(青岛)有限公司收货单
|
|
|
+ {{company}}国际物流(青岛)有限公司收货单
|
|
|
</td>
|
|
|
</tr>
|
|
|
<!-- <div v-for="{{}}" :key="index"> -->
|
|
|
@@ -2652,10 +2652,22 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 20px; font-weight: bold; border: none"
|
|
|
>
|
|
|
- 大木国际物流(青岛)有限公司作业单
|
|
|
+ {{company}}国际物流(青岛)有限公司作业单
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
+ <td colspan="5"
|
|
|
+ style="font-size: 20px; font-weight: bold; border: none"
|
|
|
+ ></td>
|
|
|
+ <td v-if="!fSerialNumber"
|
|
|
+ style="font-size: 20px; font-weight: bold; border: none"
|
|
|
+ >流水号:</td>
|
|
|
+ <td v-else
|
|
|
+ style="font-size: 20px; font-weight: bold; border: none"
|
|
|
+ >流水号:{{fSerialNumber.slice(8,11)}}</td>
|
|
|
+ </tr>
|
|
|
+
|
|
|
+ <tr>
|
|
|
<td
|
|
|
width="900"
|
|
|
colspan="2"
|
|
|
@@ -2690,7 +2702,7 @@
|
|
|
<td width="200">提单号</td>
|
|
|
<td width="200">品牌/规格/产地</td>
|
|
|
<td width="200">净重(kg)</td>
|
|
|
- <td width="200">件数(50KG)</td>
|
|
|
+ <td width="200">件数/规格</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in printinglist" :key="index">
|
|
|
<td width="200">{{ item.fTruckno }}</td>
|
|
|
@@ -2698,7 +2710,7 @@
|
|
|
<td width="200">{{ item.fMblno }}</td>
|
|
|
<td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
|
|
|
<td width="200">{{item.fNetweight}}</td>
|
|
|
- <td width="200">{{ item.fQty }}</td>
|
|
|
+ <td width="200">{{ item.fQty }}/{{item.fPackagespecs}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="1400" colspan="6"> </td>
|
|
|
@@ -2818,6 +2830,10 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ company:'',
|
|
|
+ fSerialNumber:'',
|
|
|
+ fDNameOptions:[],
|
|
|
+ fCNameOptions:[],
|
|
|
closeButton:true,
|
|
|
businessType:'',
|
|
|
fCartype:'',
|
|
|
@@ -3084,159 +3100,6 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
- bind(el, binding, vnode, oldVnode) {
|
|
|
- //弹框可拉伸最小宽高
|
|
|
- let minWidth = 400;
|
|
|
- let minHeight = 300;
|
|
|
- //初始非全屏
|
|
|
- let isFullScreen = false;
|
|
|
- //当前宽高
|
|
|
- let nowWidth = 0;
|
|
|
- let nowHight = 0;
|
|
|
- //当前顶部高度
|
|
|
- let nowMarginTop = 0;
|
|
|
- //获取弹框头部（这部分可双击全屏）
|
|
|
- const dialogHeaderEl = el.querySelector('.el-dialog__header');
|
|
|
- let hasSetBodyHight = false;
|
|
|
- //弹窗
|
|
|
- const dragDom = el.querySelector('.el-dialog');
|
|
|
- //给弹窗加上overflow auto；不然缩小时框内的标签可能超出dialog；
|
|
|
- // dragDom.style.overflow = "auto";
|
|
|
- //清除选择头部文字效果
|
|
|
- dialogHeaderEl.onselectstart = new Function("return false");
|
|
|
- //头部加上可拖动cursor
|
|
|
- dialogHeaderEl.style.cursor = 'move';
|
|
|
-
|
|
|
- // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
|
|
|
- const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
|
|
|
-
|
|
|
- //头部插入最大化最小化元素
|
|
|
- let maxMin = document.createElement("button");
|
|
|
- maxMin.className +=' el-dialog__headerbtn el-dialog__minmax';
|
|
|
- maxMin.style.right = '40px';
|
|
|
- maxMin.style.color = '#909399';
|
|
|
- maxMin.title='最大化';
|
|
|
- maxMin.innerHTML = '<i class="el-icon-full-screen" onMouseOver="this.style.color=\'#409EFF\'" onMouseOut="this.style.color=\'inherit\'"></i>';
|
|
|
- dialogHeaderEl.insertBefore(maxMin,dialogHeaderEl.childNodes[1]);
|
|
|
-
|
|
|
- let moveDown = (e) => {
|
|
|
- // 鼠标按下，计算当前元素距离可视区的距离
|
|
|
- const disX = e.clientX - dialogHeaderEl.offsetLeft;
|
|
|
- const disY = e.clientY - dialogHeaderEl.offsetTop;
|
|
|
-
|
|
|
- // 获取到的值带px 正则匹配替换
|
|
|
- let styL, styT;
|
|
|
-
|
|
|
- // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
|
|
|
- if (sty.left.includes('%')) {
|
|
|
- styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
|
|
|
- styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
|
|
|
- } else {
|
|
|
- styL = +sty.left.replace(/\px/g, '');
|
|
|
- styT = +sty.top.replace(/\px/g, '');
|
|
|
- };
|
|
|
-
|
|
|
- document.onmousemove = function (e) {
|
|
|
- // 通过事件委托，计算移动的距离
|
|
|
- const l = e.clientX - disX;
|
|
|
- const t = e.clientY - disY;
|
|
|
-
|
|
|
- // 移动当前元素
|
|
|
- dragDom.style.left = `${l + styL}px`;
|
|
|
- dragDom.style.top = `${t + styT}px`;
|
|
|
-
|
|
|
- //将此时的位置传出去
|
|
|
- //binding.value({x:e.pageX,y:e.pageY})
|
|
|
- };
|
|
|
-
|
|
|
- document.onmouseup = function (e) {
|
|
|
- document.onmousemove = null;
|
|
|
- document.onmouseup = null;
|
|
|
- };
|
|
|
- }
|
|
|
- dialogHeaderEl.onmousedown = moveDown;
|
|
|
- let bodyHeight = 'auto';
|
|
|
- function setMaxMin(){
|
|
|
- if (isFullScreen == false) {
|
|
|
- let i = maxMin.querySelector('.el-icon-full-screen');
|
|
|
- i.classList.remove('el-icon-full-screen');
|
|
|
- i.classList.add('el-icon-crop');
|
|
|
- maxMin.title = '还原';
|
|
|
- bodyHeight = dragDom.querySelector('.el-dialog__body').offsetHeight+'px';
|
|
|
- nowHight = dragDom.clientHeight;
|
|
|
- nowWidth = dragDom.clientWidth;
|
|
|
- nowMarginTop = dragDom.style.marginTop;
|
|
|
- dragDom.style.left = 0;
|
|
|
- dragDom.style.top = 0;
|
|
|
- dragDom.style.height = "100VH";
|
|
|
- dragDom.style.width = "100VW";
|
|
|
- dragDom.style.marginTop = 0;
|
|
|
- isFullScreen = true;
|
|
|
- dialogHeaderEl.style.cursor = 'initial';
|
|
|
- dialogHeaderEl.onmousedown = null;
|
|
|
- if(!hasSetBodyHight) {
|
|
|
- dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - '+dialogHeaderEl.offsetHeight+'px)';
|
|
|
- hasSetBodyHight = true;
|
|
|
- }
|
|
|
- } else {
|
|
|
- let i = maxMin.querySelector('.el-icon-crop');
|
|
|
- i.classList.remove('el-icon-crop');
|
|
|
- i.classList.add('el-icon-full-screen');
|
|
|
- maxMin.innerHTML = '<i class="el-icon-full-screen"></i>';
|
|
|
- maxMin.title = '最大化';
|
|
|
- dragDom.style.height = "auto";
|
|
|
- dragDom.style.width = nowWidth + 'px';
|
|
|
- dragDom.style.marginTop = nowMarginTop;
|
|
|
- isFullScreen = false;
|
|
|
- dialogHeaderEl.style.cursor = 'move';
|
|
|
- dialogHeaderEl.onmousedown = moveDown;
|
|
|
- dragDom.querySelector('.el-dialog__body').style.height = bodyHeight;
|
|
|
- hasSetBodyHight = false;
|
|
|
- }
|
|
|
- }
|
|
|
- //点击放大缩小效果
|
|
|
- maxMin.onclick = setMaxMin;
|
|
|
- //双击头部效果
|
|
|
- dialogHeaderEl.ondblclick = setMaxMin;
|
|
|
-
|
|
|
-
|
|
|
- //拉伸
|
|
|
- let resizeEl=document.createElement("div");
|
|
|
- dragDom.appendChild(resizeEl);
|
|
|
- //在弹窗右下角加上一个10-10px的控制块
|
|
|
- resizeEl.style.cursor = 'se-resize';
|
|
|
- resizeEl.style.position = 'absolute';
|
|
|
- resizeEl.style.height = '10px';
|
|
|
- resizeEl.style.width = '10px';
|
|
|
- resizeEl.style.right = '0px';
|
|
|
- resizeEl.style.bottom = '0px';
|
|
|
- //鼠标拉伸弹窗
|
|
|
- resizeEl.onmousedown = (e) => {
|
|
|
- // 记录初始x位置
|
|
|
- const clientX = e.clientX;
|
|
|
- // 鼠标按下，计算当前元素距离可视区的距离
|
|
|
- const disX = e.clientX - resizeEl.offsetLeft;
|
|
|
- const disY = e.clientY - resizeEl.offsetTop;
|
|
|
- document.onmousemove = function (e) {
|
|
|
- e.preventDefault(); // 移动时禁用默认事件
|
|
|
- // 通过事件委托，计算移动的距离
|
|
|
- const x = e.clientX - disX + (e.clientX - clientX);//这里 由于elementUI的dialog控制居中的，所以水平拉伸效果是双倍
|
|
|
- const y = e.clientY - disY;
|
|
|
- //比较是否小于最小宽高
|
|
|
- dragDom.style.width = x > minWidth ? `${x}px` : minWidth + 'px';
|
|
|
- dragDom.style.height = y > minHeight ? `${y}px` : minHeight + 'px';
|
|
|
- if(!hasSetBodyHight) {
|
|
|
- dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - '+dialogHeaderEl.offsetHeight+'px)';
|
|
|
- hasSetBodyHight = true;
|
|
|
- }
|
|
|
- };
|
|
|
- //拉伸结束
|
|
|
- document.onmouseup = function (e) {
|
|
|
- document.onmousemove = null;
|
|
|
- document.onmouseup = null;
|
|
|
- };
|
|
|
- }
|
|
|
- },
|
|
|
created() {
|
|
|
this.getList();
|
|
|
this.getDicts("storage_type").then((response) => {
|
|
|
@@ -3267,6 +3130,7 @@ export default {
|
|
|
this.jFeetunitOptions = response.data;
|
|
|
});
|
|
|
this.getDicts("st_out_type").then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.businessTypeOption = response.data;
|
|
|
});
|
|
|
this.getDicts("sys_car_type").then((response) => {
|
|
|
@@ -3282,6 +3146,7 @@ export default {
|
|
|
this.warehouseOptions = response.data
|
|
|
})
|
|
|
this.warehousesssMethod()
|
|
|
+ this.company = localStorage.getItem('companyName')
|
|
|
},
|
|
|
activated() {
|
|
|
this.adoPt()
|
|
|
@@ -3372,6 +3237,14 @@ export default {
|
|
|
adoPt(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if (this.approval){
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ });
|
|
|
+ let query = { pageNum: 1, pageSize: 10, fDc:'D'};
|
|
|
+ listFees(query).then((response) => {
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset();
|
|
|
this.doNot = true
|
|
|
this.closeButton = false
|
|
|
@@ -3545,6 +3418,7 @@ export default {
|
|
|
},
|
|
|
// 新增作业费协议
|
|
|
addAgreement(kye,status) {
|
|
|
+
|
|
|
this.costStatus = status
|
|
|
if (!this.form.fCorpid) {
|
|
|
this.$message({ message: "请维护货权方", type: "warning", });
|
|
|
@@ -3675,10 +3549,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // if (!haveGoods) {
|
|
|
- // console.log("111")
|
|
|
- //
|
|
|
- // }
|
|
|
getFees(feeId).then((response) => {
|
|
|
this.fWbuOptions = []
|
|
|
let queryParams = { pageNum: 1, pageSize: 10 };
|
|
|
@@ -3699,6 +3569,10 @@ export default {
|
|
|
// qty=(qty/1000).toFixed(2);
|
|
|
let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
|
|
|
if(this.costStatus == '3' ){
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'D'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.warehouseDrList.push({
|
|
|
fQty: qty,
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
@@ -3714,7 +3588,12 @@ export default {
|
|
|
fMarks:this.form.fMarks,
|
|
|
fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
|
|
|
})
|
|
|
+
|
|
|
}else{
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.warehouseCrList.push({
|
|
|
fQty: qty,
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
@@ -3730,6 +3609,7 @@ export default {
|
|
|
fMarks:this.form.fMarks,
|
|
|
fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
})
|
|
|
+
|
|
|
}
|
|
|
// if (this.costStatus === 'Cr' ) {
|
|
|
// this.warehouseCrList.push({
|
|
|
@@ -3992,6 +3872,7 @@ export default {
|
|
|
this.openPrintJobSheet = true
|
|
|
this.fBstime = this.form.fBstime
|
|
|
}, 200);
|
|
|
+ this.fSerialNumber = this.dataList[0].fSerialNumber
|
|
|
for(let item in this.businessTypeOption){
|
|
|
if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
|
|
|
this.businessType = this.businessTypeOption[item].dictLabel
|
|
|
@@ -4064,9 +3945,9 @@ export default {
|
|
|
fBusinessType: this.form.fBusinessType
|
|
|
});
|
|
|
this.fWbuOptions = []
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10,fDc:'D'};
|
|
|
listFees(queryParams).then((response) => {
|
|
|
- this.fWbuOptions = response.rows;
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -4101,9 +3982,9 @@ export default {
|
|
|
fBusinessType: this.form.fBusinessType
|
|
|
});
|
|
|
this.fWbuOptions = []
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
listFees(queryParams).then((response) => {
|
|
|
- this.fWbuOptions = response.rows;
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -4323,6 +4204,14 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ });
|
|
|
+ let query = { pageNum: 1, pageSize: 10, fDc:'D'};
|
|
|
+ listFees(query).then((response) => {
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset();
|
|
|
// if (this.dataList.length === 0){
|
|
|
// this.contrOl = true
|
|
|
@@ -4654,6 +4543,7 @@ export default {
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
+
|
|
|
addWhgenleg(formData).then((response) => {
|
|
|
this.fid = response.data.fPid;
|
|
|
// 暂时注释掉，后续可能会加回来 仓储费得出的明细
|
|
|
@@ -4671,7 +4561,6 @@ export default {
|
|
|
this.$refs.tableList.clearSelection();
|
|
|
this.formBrowseStatus = true;
|
|
|
this.contrOl = true
|
|
|
- this.form.fBillstatus = 40
|
|
|
for (let li in listSelection) {
|
|
|
for (let i in this.dataList) {
|
|
|
if (listSelection[li].fId == this.dataList[i].fId) {
|
|
|
@@ -4746,7 +4635,6 @@ export default {
|
|
|
this.title = "修改仓入库";
|
|
|
this.warehousesssMethod()
|
|
|
});
|
|
|
-
|
|
|
this.$refs['form'].validate((valid) => {
|
|
|
for (let li in this.dataList) {
|
|
|
for(let list in this.fStorageTypeOptions){
|
|
|
@@ -4778,7 +4666,6 @@ export default {
|
|
|
this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
- this.$set(this.form, 'fBusinessType', Date.parse(this.form.fChargedate))
|
|
|
this.dataList = response.data.warehousebillsitems
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
@@ -5099,9 +4986,7 @@ export default {
|
|
|
for(let item in this.warehouseDrList) {
|
|
|
if (!this.warehouseDrList[item].fCorpid) {
|
|
|
if (item === 'fBusinessType') {
|
|
|
- console.log(item)
|
|
|
} else {
|
|
|
- console.log(this.warehouseDrList[item].fCorpid)
|
|
|
this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
|
|
|
return false
|
|
|
}
|
|
|
@@ -5322,7 +5207,9 @@ export default {
|
|
|
}
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
listFees(queryParams).then((response) => {
|
|
|
- this.fWbuOptions = response.rows;
|
|
|
+ this.fDNameOptions = response.rows;
|
|
|
+ this.fCNameOptions = response.rows;
|
|
|
+ this.fWbuOptions = response.rows
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询经营单位 */
|
qukaidi
