|
|
@@ -198,7 +198,7 @@
|
|
|
>修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
icon="el-icon-delete"
|
|
|
@@ -208,7 +208,7 @@
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
@@ -293,7 +293,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBillstatus === 1">录入</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 2">录入</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === 2">暂存</span>
|
|
|
<span v-if="scope.row.fBillstatus === 3">驳回</span>
|
|
|
<span v-if="scope.row.fBillstatus === 4">请核</span>
|
|
|
<span v-if="scope.row.fBillstatus === 5">审核中</span>
|
|
|
@@ -471,6 +471,7 @@
|
|
|
v-model="form.fPlanqty"
|
|
|
style="width: 80%"
|
|
|
laceholder="计划件数"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
:disabled="browseStatus"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -480,7 +481,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fPlannetweight"
|
|
|
style="width: 80%"
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
laceholder="计划毛重"
|
|
|
:disabled="browseStatus"
|
|
|
/>
|
|
|
@@ -490,7 +491,7 @@
|
|
|
<el-form-item label="计划毛重" prop="fPlangrossweight">
|
|
|
<el-input
|
|
|
v-model="form.fPlangrossweight"
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
style="width: 80%"
|
|
|
laceholder="计划毛重"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -530,12 +531,12 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="唛头" prop="fMarks">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
style="width: 80%"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
- placeholder="唛头"
|
|
|
+ placeholder="品牌"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -938,12 +939,12 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
- label="*唛头"
|
|
|
+ label="*品牌"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- placeholder="唛头"
|
|
|
+ placeholder="品牌"
|
|
|
:disabled="
|
|
|
browseStatus ||
|
|
|
scope.row.fBillstatus === 20 ||
|
|
|
@@ -1006,7 +1007,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fGrossweight"
|
|
|
placeholder="入库毛重"
|
|
|
:disabled="
|
|
|
@@ -1028,7 +1029,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fNetweight"
|
|
|
placeholder="入库净重"
|
|
|
:disabled="
|
|
|
@@ -1909,6 +1910,11 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="approvalStatus" @click="addOrUpdateHandle(form)">查看审批</el-button>
|
|
|
+ <el-button type="primary" :disabled="approvalStatus" @click="addOrUpdateHand(form)">审批弹窗</el-button>
|
|
|
+ <!-- 弹窗, 新增 / 修改 -->
|
|
|
+ <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
+ <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
<el-button type="success" prop="打印" @click="showEditDialog_ss"
|
|
|
>收货单
|
|
|
</el-button>
|
|
|
@@ -1953,6 +1959,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划件数" prop="fPlanqty">
|
|
|
<el-input
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="planningList.fPlanqty"
|
|
|
style="width: 80%"
|
|
|
laceholder="计划件数"
|
|
|
@@ -1964,6 +1971,7 @@
|
|
|
<el-form-item label="计划净重" prop="fPlannetweight">
|
|
|
<el-input
|
|
|
v-model="planningList.fPlannetweight"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
style="width: 80%"
|
|
|
disabled
|
|
|
laceholder="计划毛重"
|
|
|
@@ -1974,6 +1982,7 @@
|
|
|
<el-form-item label="计划毛重" prop="fPlangrossweight">
|
|
|
<el-input
|
|
|
v-model="planningList.fPlangrossweight"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
style="width: 80%"
|
|
|
disabled
|
|
|
laceholder="计划毛重"
|
|
|
@@ -2226,7 +2235,7 @@
|
|
|
<td width="100"></td>
|
|
|
<td width="100">包</td>
|
|
|
<td width="100">吨</td>
|
|
|
- <td width="100"></td>
|
|
|
+ <td width="100">{{ fPackagespecs }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="100">序号</td>
|
|
|
@@ -2428,10 +2437,10 @@
|
|
|
<td>备注:</td>
|
|
|
<td colspan="5">{{ form.remark}}</td>
|
|
|
</tr>
|
|
|
- <tr>
|
|
|
+ <tr v-for="(item, indexe) in Collectionoptionss" :key="indexe+'index'">
|
|
|
<td>收费</td>
|
|
|
- <td>装箱费</td>
|
|
|
- <td>元</td>
|
|
|
+ <td>{{item.fFeeids}}</td>
|
|
|
+ <td>{{item.fAmount}} 元</td>
|
|
|
<td colspan="4">办单费：5元，过磅费自理</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -2461,7 +2470,20 @@
|
|
|
<td width="290" class="zzss">电话：{{ form.fTel }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
- <button @click="printSomething2">打印</button>
|
|
|
+ <div style="display: flex;
|
|
|
+ justify-content: space-between;">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ @click="printSomething2"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ @click="editDialogVisible_sss =false"
|
|
|
+ >取消
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
+
|
|
|
</el-dialog>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -2494,15 +2516,21 @@ import { listGoods } from "@/api/basicdata/goods";
|
|
|
|
|
|
import { listUser, queryUserVal } from "@/api/system/user";
|
|
|
import UploadFile from "@/components/Uploadfile";
|
|
|
+import AddOrUpdate from '@/views/viewApproval'
|
|
|
+import ApprovalComments from '@/views/startApproval'
|
|
|
export default {
|
|
|
name: "Warehousebills",
|
|
|
components: {
|
|
|
UploadFile,
|
|
|
+ AddOrUpdate,
|
|
|
+ ApprovalComments
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
// 修改查看状态
|
|
|
browseStatus: false,
|
|
|
+ // 审批状态控制
|
|
|
+ approvalStatus: false,
|
|
|
detailsHidden: false,
|
|
|
warehousingagreement: false,
|
|
|
warehousingagreements: false,
|
|
|
@@ -2523,6 +2551,7 @@ export default {
|
|
|
fGrossweight: 0,
|
|
|
fid: "",
|
|
|
fCntqty: "",
|
|
|
+ fPackagespecs: '',
|
|
|
fNetweight: 0,
|
|
|
fQty: 0,
|
|
|
mum: 0,
|
|
|
@@ -2542,6 +2571,9 @@ export default {
|
|
|
editDialogVisible_ss: false,
|
|
|
editDialogVisible_sss: false,
|
|
|
editDialogClosed_ss: false,
|
|
|
+ addOrUpdateVisible: false,
|
|
|
+ addOrUpdateVisib: false,
|
|
|
+
|
|
|
// 新增计划净重
|
|
|
weightList: false,
|
|
|
dataList: [],
|
|
|
@@ -2733,11 +2765,6 @@ export default {
|
|
|
this.getDicts("data_trademodes").then((response) => {
|
|
|
this.fTrademodeidOptions = response.data;
|
|
|
});
|
|
|
- // this.getDicts("data_unitfees").then((response) => {
|
|
|
- // this.fFeetunitOptions = response.data;
|
|
|
- // console.log(response.data)
|
|
|
- // this.jFeetunitOptions = JSON.parse(JSON.stringify(response.data));
|
|
|
- // });
|
|
|
this.getDicts("data_stltype_type").then((response) => {
|
|
|
this.fStltypeOptions = response.data;
|
|
|
});
|
|
|
@@ -2782,7 +2809,6 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
printSomething1() {
|
|
|
- console.log("22222");
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
"@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
@@ -2870,27 +2896,21 @@ export default {
|
|
|
});
|
|
|
return false;
|
|
|
}
|
|
|
- console.log(this.mum);
|
|
|
-
|
|
|
this.fPlaNnumber = this.form.fPlannetweight / this.form.fPlanqty;
|
|
|
this.fPlangNumber = this.form.fPlangrossweight / this.form.fPlanqty;
|
|
|
- console.log(this.fPlaNnumber);
|
|
|
- console.log(this.fPlangNumber);
|
|
|
(this.planningList.fPlanqty =
|
|
|
Number(this.form.fPlanqty) - Number(this.mum)),
|
|
|
(this.planningList.fPlannetweight = (
|
|
|
Number(this.fPlaNnumber) * Number(this.planningList.fPlanqty)
|
|
|
- ).toFixed(6)),
|
|
|
+ ).toFixed(2)),
|
|
|
(this.planningList.fPlangrossweight = (
|
|
|
Number(this.fPlangNumber) * Number(this.planningList.fPlanqty)
|
|
|
- ).toFixed(6)),
|
|
|
+ ).toFixed(2)),
|
|
|
(this.weightList = true);
|
|
|
- let time = null;
|
|
|
},
|
|
|
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
- console.log(this.dataListSelection);
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
this.editDialogVisible_s = true;
|
|
|
for (let aorp in this.Printinglist) {
|
|
|
@@ -2912,7 +2932,6 @@ export default {
|
|
|
}
|
|
|
|
|
|
for (let sorp in this.warehouseOptions) {
|
|
|
- console.log(this.form.fWarehouseid);
|
|
|
if (this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
|
|
|
this.$set(
|
|
|
this.form,
|
|
|
@@ -2935,8 +2954,30 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
- console.log(this.dataListSelection);
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
+ for (let li in this.Printinglist) {
|
|
|
+ if (this.dataListSelection.length > 0) {
|
|
|
+ this.fTruckno = this.dataListSelection[0].fTruckno;
|
|
|
+ this.fCntrtype = this.dataListSelection[0].fCntrtype;
|
|
|
+ this.fGoodsids = this.dataListSelection[0].fGoodsids;
|
|
|
+ this.fPackagespecs = this.dataListSelection[0].fPackagespecs;
|
|
|
+ var date = new Date(this.dataListSelection[0].fBsdate);
|
|
|
+ var Y = date.getFullYear() + "-";
|
|
|
+ var M =
|
|
|
+ (date.getMonth() + 1 < 10
|
|
|
+ ? "0" + (date.getMonth() + 1)
|
|
|
+ : date.getMonth() + 1) + "-";
|
|
|
+ var D =
|
|
|
+ (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
|
|
|
+ this.fBsdates = Y + M + D;
|
|
|
+ }
|
|
|
+ console.log(this.goodsOptions)
|
|
|
+ for(let list in this.goodsOptions) {
|
|
|
+ if(this.Printinglist[li].fGoodsid === this.goodsOptions[list].fId) {
|
|
|
+ this.$set(this.Printinglist[li], "fGoodsids", this.goodsOptions[list].fName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
this.editDialogVisible_ss = true;
|
|
|
} else {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
@@ -2944,21 +2985,46 @@ export default {
|
|
|
},
|
|
|
showEditDialog_sss() {
|
|
|
console.log(this.Printinglist);
|
|
|
+ console.log(this.dataListSelection)
|
|
|
+ console.log(this.dataList)
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let li in this.Printinglist) {
|
|
|
if (!this.Printinglist[li].fId) {
|
|
|
this.$message.error("请先保存!");
|
|
|
return false;
|
|
|
}
|
|
|
+ if (this.dataListSelection.length > 0) {
|
|
|
+ this.fTruckno = this.dataListSelection[0].fTruckno;
|
|
|
+ this.fCntrtype = this.dataListSelection[0].fCntrtype;
|
|
|
+ this.fGoodsids = this.dataListSelection[0].fGoodsids;
|
|
|
+ this.fPackagespecs = this.dataListSelection[0].fPackagespecs;
|
|
|
+ var date = new Date(this.dataListSelection[0].fBsdate);
|
|
|
+ var Y = date.getFullYear() + "-";
|
|
|
+ var M =
|
|
|
+ (date.getMonth() + 1 < 10
|
|
|
+ ? "0" + (date.getMonth() + 1)
|
|
|
+ : date.getMonth() + 1) + "-";
|
|
|
+ var D =
|
|
|
+ (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
|
|
|
+ this.fBsdates = Y + M + D;
|
|
|
+ }
|
|
|
+ console.log(this.goodsOptions)
|
|
|
+ for(let list in this.goodsOptions) {
|
|
|
+ if(this.Printinglist[li].fGoodsid === this.goodsOptions[list].fId) {
|
|
|
+ this.$set(this.Printinglist[li], "fGoodsids", this.goodsOptions[list].fName);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- for (let list in this.goodsOptions) {
|
|
|
- if (this.Printinglist[0].fGoodsid === this.goodsOptions[list].fId) {
|
|
|
- this.$set(
|
|
|
- this.Printinglists[list],
|
|
|
- "fGoodsids",
|
|
|
- this.goodsOptions[list].fName
|
|
|
- );
|
|
|
+ if (this.Collectionoptionss.length > 0) {
|
|
|
+ for(let list in this.Collectionoptionss) {
|
|
|
+ if(!this.Collectionoptionss[list].fFeeid){
|
|
|
+ this.$message.error("请选择收款信息费用名称!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
+ }else {
|
|
|
+ this.$message.error("请选择需要的收款信息!");
|
|
|
+ return false;
|
|
|
}
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let warehouseCr in this.Printinglist) {
|
|
|
@@ -2997,7 +3063,7 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.Printinglist[warehouseCr].fMarks) {
|
|
|
- this.$message.error("请输入唛头");
|
|
|
+ this.$message.error("请输入品牌");
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.Printinglist[warehouseCr].fQty) {
|
|
|
@@ -3022,6 +3088,7 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
// 收款信息
|
|
|
addCollection() {
|
|
|
@@ -3051,7 +3118,7 @@ export default {
|
|
|
fExrate: "1",
|
|
|
fCxrate: null,
|
|
|
fRate: null,
|
|
|
- remarks: null,
|
|
|
+ remarks: null
|
|
|
});
|
|
|
},
|
|
|
queryUser() {
|
|
|
@@ -3064,7 +3131,6 @@ export default {
|
|
|
this.$set(this.form, "fIfdamage", "1");
|
|
|
this.$set(this.form, "fIfweigh", "1");
|
|
|
this.$set(this.form, "fTrademodeid", "1");
|
|
|
- // this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
|
|
|
this.$set(this.form, "createTime", Date.parse(new Date()));
|
|
|
}
|
|
|
if (response.dept !== null) {
|
|
|
@@ -3102,10 +3168,6 @@ export default {
|
|
|
},
|
|
|
// 导入计划重量
|
|
|
costList() {
|
|
|
- console.log(this.planningList.fPlanqty);
|
|
|
- console.log(this.form.fPlanqty);
|
|
|
- console.log(this.mum);
|
|
|
- console.log(this.fQty);
|
|
|
if (Number(this.planningList.fPlanqty) > Number(this.form.fPlanqty)) {
|
|
|
console.log(this.planningList.fPlanqty);
|
|
|
console.log(this.form.fPlanqty);
|
|
|
@@ -3127,11 +3189,8 @@ export default {
|
|
|
fGoodsid: null,
|
|
|
fCntrtype: null,
|
|
|
fCntqty: 1,
|
|
|
- // fPlangrossweight: 0,
|
|
|
- // fPlannetweight: 0,
|
|
|
fNetweight: this.planningList.fPlannetweight,
|
|
|
fPlanvolumn: 0,
|
|
|
- // fPlanqty: 0,
|
|
|
fGrossweight: this.planningList.fPlangrossweight,
|
|
|
fQty: this.planningList.fPlanqty,
|
|
|
fPackagespecs: null,
|
|
|
@@ -3148,7 +3207,6 @@ export default {
|
|
|
// 导入付款信息
|
|
|
whgenlegData() {
|
|
|
console.log(this.dialogWhgenlegList);
|
|
|
- console.log("...(");
|
|
|
if (this.dialogWhgenlegList.length === 0) {
|
|
|
this.$message({
|
|
|
message: "请选择需要导入的数据",
|
|
|
@@ -3171,17 +3229,19 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
for(let list in this.warehouseDrList) {
|
|
|
+ console.log(this.warehouseDrList)
|
|
|
+
|
|
|
if(this.warehouseDrList[list].fFeeUnitid == 1){
|
|
|
- this.$set(this.warehouseDrList[list], "fQty", this.fQty);
|
|
|
+ this.$set(this.warehouseDrList[list], "fQty", (this.fQty).toFixed(2));
|
|
|
} else if(this.warehouseDrList[list].fFeeUnitid == 2) {
|
|
|
- this.$set(this.warehouseDrList[list], "fQty", this.fGrossweight);
|
|
|
+ this.$set(this.warehouseDrList[list], "fQty", (this.fGrossweight).toFixed(2));
|
|
|
} else if(this.warehouseDrList[list].fFeeUnitid == 3) {
|
|
|
- this.$set(this.warehouseDrList[list], "fQty", this.fNetweight);
|
|
|
+ this.$set(this.warehouseDrList[list], "fQty", (this.fNetweight).toFixed(2));
|
|
|
} else{
|
|
|
this.$set(this.warehouseDrList[list], "fQty", 0);
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
+ this.$set(this.warehouseDrList[list], "fAmount", (Number(this.warehouseDrList[list].fUnitprice) * Number(this.warehouseDrList[list].fQty)).toFixed(2));
|
|
|
+ }
|
|
|
this.warehousingagreement = false;
|
|
|
}
|
|
|
},
|
|
|
@@ -3209,15 +3269,15 @@ export default {
|
|
|
}
|
|
|
for(let list in this.warehouseCrList) {
|
|
|
if(this.warehouseCrList[list].fFeeUnitid == 1){
|
|
|
- this.$set(this.warehouseCrList[list], "fQty", this.fQty);
|
|
|
+ this.$set(this.warehouseCrList[list], "fQty", (this.fQty).toFixed(2));
|
|
|
} else if(this.warehouseCrList[list].fFeeUnitid == 2) {
|
|
|
- this.$set(this.warehouseCrList[list], "fQty", this.fGrossweight);
|
|
|
+ this.$set(this.warehouseCrList[list], "fQty", (this.fGrossweight).toFixed(2));
|
|
|
} else if(this.warehouseCrList[list].fFeeUnitid == 3) {
|
|
|
- this.$set(this.warehouseCrList[list], "fQty", this.fNetweight);
|
|
|
+ this.$set(this.warehouseCrList[list], "fQty", (this.fNetweight).toFixed(2));
|
|
|
} else{
|
|
|
this.$set(this.warehouseCrList[list], "fQty", 0);
|
|
|
}
|
|
|
-
|
|
|
+ this.$set(this.warehouseCrList[list], "fAmount", (Number(this.warehouseCrList[list].fUnitprice) * Number(this.warehouseCrList[list].fQty)).toFixed(2));
|
|
|
}
|
|
|
this.warehousingagreements = false;
|
|
|
}
|
|
|
@@ -3333,25 +3393,20 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- console.log(selection);
|
|
|
this.ids = selection.map((item) => item.fId);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
// 库存明细多选
|
|
|
Selectinventory(selection) {
|
|
|
- console.log(selection);
|
|
|
- console.log(this.form);
|
|
|
this.Printinglist = selection;
|
|
|
this.Printinglists = selection;
|
|
|
- console.log(this.Printinglist);
|
|
|
this.dataListSelection = [];
|
|
|
this.dataWithdrawList = [];
|
|
|
if (!selection || selection.length === 0) {
|
|
|
return false;
|
|
|
} else {
|
|
|
for (let se in selection) {
|
|
|
- console.log(selection)
|
|
|
if (!selection[se].fBillstatus || selection[se].fBillstatus !== 40) {
|
|
|
this.dataListSelection.push(selection[se]);
|
|
|
} else if (
|
|
|
@@ -3363,21 +3418,6 @@ export default {
|
|
|
console.log(this.dataWithdrawList)
|
|
|
}
|
|
|
}
|
|
|
- if (this.dataListSelection.length > 0) {
|
|
|
- console.log(selection);
|
|
|
- this.fTruckno = selection[0].fTruckno;
|
|
|
- this.fCntrtype = selection[0].fCntrtype;
|
|
|
- this.fGoodsids = selection[0].fGoodsids;
|
|
|
- var date = new Date(selection[0].fBsdate);
|
|
|
- var Y = date.getFullYear() + "-";
|
|
|
- var M =
|
|
|
- (date.getMonth() + 1 < 10
|
|
|
- ? "0" + (date.getMonth() + 1)
|
|
|
- : date.getMonth() + 1) + "-";
|
|
|
- var D =
|
|
|
- (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
|
|
|
- this.fBsdates = Y + M + D;
|
|
|
- }
|
|
|
}
|
|
|
// 打印回显仓库
|
|
|
for (let corp in this.warehouseOptions) {
|
|
|
@@ -3385,9 +3425,20 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- // 收款选择
|
|
|
+ // 收款选
|
|
|
Collectionoptions(selection) {
|
|
|
this.Collectionoptionss = selection;
|
|
|
+ for(let lest in this.fWbuOptions){
|
|
|
+ for(let li in this.Collectionoptionss){
|
|
|
+ if(this.fWbuOptions[lest].fId == this.Collectionoptionss[li].fFeeid){
|
|
|
+ this.$set(
|
|
|
+ this.Collectionoptionss[li],
|
|
|
+ "fFeeids",
|
|
|
+ this.fWbuOptions[lest].fName
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
// 收款删除
|
|
|
deleteRow(index, rows) {
|
|
|
@@ -3421,25 +3472,27 @@ export default {
|
|
|
this.browseStatus = status;
|
|
|
this.reset();
|
|
|
this.detailsHidden = false;
|
|
|
+ this.formBrowseStatus = false;
|
|
|
const fId = row.fId || this.ids;
|
|
|
this.dataList = [];
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
- console.log(response)
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
- if (this.form.fItemsStatus && this.form.fItemsStatus !== 1) {
|
|
|
- this.formBrowseStatus = true;
|
|
|
- }
|
|
|
- else {
|
|
|
- this.formBrowseStatus = false;
|
|
|
+ if(this.form.fBillstatus > 2) {
|
|
|
+ this.approvalStatus = false;
|
|
|
+ }else {
|
|
|
+ this.approvalStatus = true;
|
|
|
}
|
|
|
}
|
|
|
if(response.data.warehouseBillsItem) {
|
|
|
- for (let li in response.data.warehouseBillsItem){
|
|
|
- if(response.data.warehouseBillsItem[li] != 10){
|
|
|
- this.formBrowseStatus = true;
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ console.log(response.data.warehouseBillsItem)
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ console.log(this.dataList[list].fBillstatus)
|
|
|
+ if (this.dataList[list].fBillstatus > 10) {
|
|
|
+ this.formBrowseStatus = true;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
}
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
@@ -3463,6 +3516,8 @@ 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, "fTrademodeid", this.form.fTrademodeid + "");
|
|
|
+ this.$set(this.form, "fPlannetweight", (this.form.fPlannetweight).toFixed(2));
|
|
|
+ this.$set(this.form, "fPlangrossweight", (this.form.fPlangrossweight).toFixed(2));
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(
|
|
|
this.dataList[list],
|
|
|
@@ -3479,14 +3534,23 @@ export default {
|
|
|
"fFeeUnitid",
|
|
|
this.warehouseDrList[dr].fFeeunitid + ""
|
|
|
);
|
|
|
-
|
|
|
+ this.$set(
|
|
|
+ this.warehouseDrList[dr],
|
|
|
+ "fQty",
|
|
|
+ (this.warehouseDrList[dr].fQty).toFixed(2)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.warehouseDrList[dr],
|
|
|
+ "fAmount",
|
|
|
+ (this.warehouseDrList[dr].fAmount).toFixed(2)
|
|
|
+ );
|
|
|
}
|
|
|
this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
for (let cr in this.warehouseCrList) {
|
|
|
this.$set(
|
|
|
this.warehouseCrList[cr],
|
|
|
"fFeeUnitid",
|
|
|
- this.warehouseCrList[cr].fFeeUnitid + ""
|
|
|
+ this.warehouseCrList[cr].fFeeunitid + ""
|
|
|
);
|
|
|
}
|
|
|
this.userOptions = response.data.sysUser;
|
|
|
@@ -3552,7 +3616,6 @@ export default {
|
|
|
}
|
|
|
return prev + curr;
|
|
|
} else {
|
|
|
- alert();
|
|
|
if (column.property === "fQty") {
|
|
|
this.fQty = prev;
|
|
|
this.mum = prev;
|
|
|
@@ -3560,10 +3623,10 @@ export default {
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0);
|
|
|
+ sums[index] = sums[index].toFixed(2)
|
|
|
}
|
|
|
});
|
|
|
this.sums = sums;
|
|
|
- // this.dataList = []
|
|
|
return sums;
|
|
|
},
|
|
|
// 付款合计
|
|
|
@@ -3590,6 +3653,7 @@ export default {
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0);
|
|
|
+ sums[index] = sums[index].toFixed(2)
|
|
|
}
|
|
|
});
|
|
|
return sums;
|
|
|
@@ -3602,10 +3666,10 @@ export default {
|
|
|
this.fPlangNumber = this.form.fPlangrossweight / this.form.fPlanqty;
|
|
|
this.planningList.fPlannetweight = (
|
|
|
Number(this.planningList.fPlanqty) * Number(this.fPlaNnumber)
|
|
|
- ).toFixed(6);
|
|
|
+ ).toFixed(2);
|
|
|
this.planningList.fPlangrossweight = (
|
|
|
Number(this.planningList.fPlanqty) * Number(this.fPlangNumber)
|
|
|
- ).toFixed(6);
|
|
|
+ ).toFixed(2);
|
|
|
},
|
|
|
// 数量计算
|
|
|
changeContractAmt(row) {
|
|
|
@@ -3664,8 +3728,6 @@ export default {
|
|
|
},
|
|
|
// 变更计价单位
|
|
|
changeFeeUnit(row) {
|
|
|
- console.log(this.fCntqty);
|
|
|
- console.log(row);
|
|
|
if (!row.fFeeUnitid) {
|
|
|
return false;
|
|
|
}
|
|
|
@@ -3814,8 +3876,6 @@ export default {
|
|
|
"warehousebillsitems",
|
|
|
JSON.stringify(this.dataListSelection)
|
|
|
);
|
|
|
- console.log(this.dataListSelection);
|
|
|
- formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
|
|
|
|
|
|
for (let li in this.dataListSelection) {
|
|
|
this.dataListSelection[li].fBillstatus = 20;
|
|
|
@@ -3859,7 +3919,6 @@ export default {
|
|
|
for(let list in response.data.warehousebillsitems){
|
|
|
this.$set(this.dataList[i], "fSerialNumber", response.data.warehousebillsitems[list].fSerialNumber);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3886,8 +3945,9 @@ export default {
|
|
|
this.fid = response.data;
|
|
|
this.formBrowseStatus = false;
|
|
|
this.msgSuccess("撤销入账成功");
|
|
|
- this.$refs.tableList.clearSelection();
|
|
|
+
|
|
|
console.log(this.dataWithdrawList)
|
|
|
+ console.log(this.dataList)
|
|
|
for (let li in this.dataWithdrawList) {
|
|
|
for (let i in this.dataList) {
|
|
|
let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
|
|
|
@@ -3915,11 +3975,11 @@ export default {
|
|
|
fNetweight &&
|
|
|
fQty
|
|
|
) {
|
|
|
- alert("222")
|
|
|
this.$set(this.dataList[i], "fBillstatus", 10);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ this.$refs.tableList.clearSelection();
|
|
|
});
|
|
|
},
|
|
|
// 卸货按钮
|
|
|
@@ -3928,7 +3988,7 @@ export default {
|
|
|
console.log(this.Printinglist);
|
|
|
for (let warehouseCr in this.Printinglist) {
|
|
|
if (this.Printinglist[warehouseCr].fBillstatus === 10) {
|
|
|
- this.$message.error("请先打印");
|
|
|
+ this.$message.error("请先打印作业单");
|
|
|
return false;
|
|
|
}
|
|
|
if (this.Printinglist[warehouseCr].fBillstatus === 30) {
|
|
|
@@ -4032,7 +4092,7 @@ export default {
|
|
|
formDatae.append("tWarehousebillsitems", JSON.stringify(this.dataList));
|
|
|
console.log(this.dataList);
|
|
|
// 附件数据
|
|
|
- formDatae.append("tWhgenleg", JSON.stringify(this.relevantAttachments));
|
|
|
+ formDatae.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
console.log(this.relevantAttachments);
|
|
|
// 费用明细付款
|
|
|
formDatae.append(
|
|
|
@@ -4045,8 +4105,6 @@ export default {
|
|
|
"tWarehousebillsfeesDr",
|
|
|
JSON.stringify(this.warehouseDrList)
|
|
|
);
|
|
|
- console.log(this.warehouseDrList)
|
|
|
- console.log(formDatae);
|
|
|
addWarehousebills(formDatae).then((response) => {
|
|
|
console.log(response)
|
|
|
this.msgSuccess("保存成功");
|
|
|
@@ -4059,6 +4117,21 @@ export default {
|
|
|
);
|
|
|
this.$set(
|
|
|
this.form,
|
|
|
+ "fStltypeid",
|
|
|
+ this.form.fStltypeid + ''
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fTrademodeid",
|
|
|
+ this.form.fTrademodeid + ''
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "createTime",
|
|
|
+ Date.parse(this.form.createTime)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
"fEta",
|
|
|
Date.parse(this.form.fEta)
|
|
|
);
|
|
|
@@ -4121,7 +4194,7 @@ export default {
|
|
|
// 库存明细
|
|
|
formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
|
|
|
// 附件数据
|
|
|
- formData.append("tWhgenleg", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
// 费用明细付款
|
|
|
formData.append(
|
|
|
"tWarehousebillsfeesCr",
|
|
|
@@ -4200,6 +4273,30 @@ export default {
|
|
|
this.mum = sum;
|
|
|
}
|
|
|
},
|
|
|
+ // 查看审批流
|
|
|
+ getDataList(){
|
|
|
+ this.addOrUpdateVisible = false
|
|
|
+ },
|
|
|
+ returnData(){
|
|
|
+ this.addOrUpdateVisib = false
|
|
|
+ },
|
|
|
+ addOrUpdateHandle(form){
|
|
|
+ this.addOrUpdateVisible = true
|
|
|
+ console.log(form)
|
|
|
+ let id = form.fId
|
|
|
+ let actId = '110'
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.addOrUpdate.init(id,actId)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ addOrUpdateHand(form){
|
|
|
+ this.addOrUpdateVisib = true
|
|
|
+ let id = form.fId
|
|
|
+ let actId = '110'
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.ApprovalComments.init(id,actId)
|
|
|
+ })
|
|
|
+ },
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
wengyuwen