|
@@ -2811,7 +2811,7 @@
|
|
|
id="print_area1"
|
|
|
class="biaoge zzss"
|
|
|
border="1"
|
|
|
- style="border-collapse: collapse; border: none"
|
|
|
+ style="border-collapse: collapse;border: none"
|
|
|
>
|
|
|
<tr>
|
|
|
<td
|
|
@@ -2828,13 +2828,13 @@
|
|
|
width="900"
|
|
|
colspan="4"
|
|
|
class="zzss"
|
|
|
- style="font-size: 28px; font-weight: bold"
|
|
|
+ style="font-size: 28px; font-weight: bold;"
|
|
|
>
|
|
|
</td>
|
|
|
<td
|
|
|
width="500"
|
|
|
colspan="2"
|
|
|
- style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
+ style="padding-bottom: 0px; font-weight: bold;"
|
|
|
class="zzss"
|
|
|
>
|
|
|
入库日期:{{ fBsdates }}
|
|
@@ -2898,9 +2898,9 @@
|
|
|
<td>机械/人工:</td>
|
|
|
<td></td>
|
|
|
</tr>
|
|
|
- <tr>
|
|
|
- <td colspan="6" class="zzss"> </td>
|
|
|
- </tr>
|
|
|
+<!-- <tr>-->
|
|
|
+<!-- <td colspan="6" class="zzss"> </td>-->
|
|
|
+<!-- </tr>-->
|
|
|
<tr>
|
|
|
<td width="280" class="zzss"></td>
|
|
|
<td width="280" class="zzss"></td>
|
|
@@ -3548,7 +3548,7 @@ export default {
|
|
|
printSomething() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
- "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
+ "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
print({
|
|
|
printable: "print_area3",
|
|
|
type: "html",
|
|
@@ -3559,7 +3559,7 @@ export default {
|
|
|
printSomething1() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
- "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
+ "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
print({
|
|
|
printable: "print_area2",
|
|
|
type: "html",
|
|
@@ -3570,7 +3570,7 @@ export default {
|
|
|
printSomething2() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
- "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
+ "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center;border:1px solid #000}}";
|
|
|
print({
|
|
|
printable: "print_area1",
|
|
|
type: "html",
|
|
@@ -3723,6 +3723,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
showEditDialog_sss() {
|
|
|
+ treeselect(this.form.fWarehouseid).then(response => {
|
|
|
+ })
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
if(this.form.fFeetunit > 3){
|
|
|
this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
|
|
@@ -4070,7 +4072,6 @@ export default {
|
|
|
});
|
|
|
let qty = 1;
|
|
|
if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {
|
|
|
- console.log("111")
|
|
|
qty = this.fQty
|
|
|
} else if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 2) {
|
|
|
qty = (this.fGrossweight/1000).toFixed(2)
|
|
@@ -4098,7 +4099,6 @@ export default {
|
|
|
fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
|
|
|
})
|
|
|
}else{
|
|
|
- console.log(this.dialogWhgenlegList[zhgen].fFeeUnitid)
|
|
|
this.warehouseCrList.push({
|
|
|
fQty: qty,
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
@@ -4114,9 +4114,7 @@ export default {
|
|
|
fMarks:this.form.fMarks,
|
|
|
fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
})
|
|
|
- console.log(this.warehouseCrList)
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
this.warehousingagreements = false;
|
|
|
}
|
|
@@ -4250,6 +4248,18 @@ export default {
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
+ this.queryParams = {
|
|
|
+ fBillno:null,
|
|
|
+ createBy:null,
|
|
|
+ timeInterval:null,
|
|
|
+ fTrademodeid:null,
|
|
|
+ fCorpid:null,
|
|
|
+ fMblno:null,
|
|
|
+ fSbu:null,
|
|
|
+ fGoodsid:null,
|
|
|
+ fWarehouseid:null,
|
|
|
+ fMarks:null,
|
|
|
+ }
|
|
|
this.resetForm("queryForm");
|
|
|
this.handleQuery();
|
|
|
},
|
|
@@ -4403,7 +4413,6 @@ export default {
|
|
|
this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
|
|
|
this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
|
|
|
}
|
|
|
- console.log(JSON.stringify(this.warehouseDrList))
|
|
|
this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
for (let cr in this.warehouseCrList) {
|
|
|
this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
|
|
@@ -4691,7 +4700,6 @@ export default {
|
|
|
for (let se in this.dataListSelection) {
|
|
|
if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
|
|
|
dataList.push(this.dataListSelection[se])
|
|
|
- console.log("111")
|
|
|
}
|
|
|
}
|
|
|
if (dataList.length !== 0) {
|
|
@@ -4849,7 +4857,6 @@ export default {
|
|
|
this.$refs['form'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if(!this.dataList.length){
|
|
|
- console.log("000")
|
|
|
this.form.fBillstatus = status
|
|
|
this.form.fNetweight = this.fNetweight
|
|
|
this.form.fPlanvolumn = this.fPlanvolumn
|
|
@@ -4882,7 +4889,6 @@ export default {
|
|
|
formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
addWarehousebills(formDatae).then((response) => {
|
|
|
this.msgSuccess('保存成功')
|
|
|
- console.log("000")
|
|
|
this.form = response.data.warehouseBills
|
|
|
this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
|
|
|
this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
@@ -4939,7 +4945,6 @@ export default {
|
|
|
// 收款
|
|
|
formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
addWarehousebills(formDatae).then((response) => {
|
|
|
- console.log("111")
|
|
|
this.msgSuccess('保存成功')
|
|
|
this.form = response.data.warehouseBills
|
|
|
this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
|