|
|
@@ -372,7 +372,7 @@
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
+ :disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -437,6 +437,7 @@
|
|
|
filterable
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
remote
|
|
|
+ @change="changefWarehouseid()"
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -469,7 +470,7 @@
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
+ :disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -487,7 +488,7 @@
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
+ :disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -508,7 +509,7 @@
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
+ :disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -528,7 +529,7 @@
|
|
|
remote
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
+ :disabled="browseStatus"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethodd"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -738,7 +739,38 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item disabled label="仓储计费日期" prop="fChargedate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="form.fChargedate"
|
|
|
+ size="large"
|
|
|
+ type="date"
|
|
|
+ value-format="timestamp"
|
|
|
+ placeholder="仓储计费日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="计费方式" prop="fBillingway">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fBillingway"
|
|
|
+ filterable
|
|
|
+ style="width: 80%"
|
|
|
+ remote
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in jFeetunitOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -1942,25 +1974,26 @@
|
|
|
<td width="400">{{fTruckno}}</td>
|
|
|
<td
|
|
|
width="500"
|
|
|
- colspan="2"
|
|
|
+ colspan="4"
|
|
|
style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
class="zzss"
|
|
|
>
|
|
|
- 日期：
|
|
|
+ 日期：{{fBsdate}}
|
|
|
</td>
|
|
|
- <td
|
|
|
+ <!-- <td
|
|
|
width="500"
|
|
|
colspan="2"
|
|
|
style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
class="zzss"
|
|
|
>
|
|
|
- {{fBsdate}}
|
|
|
- </td>
|
|
|
+
|
|
|
+ </td> -->
|
|
|
</tr>
|
|
|
<tr v-for="(item,index) in dataListSelection" :key="index">
|
|
|
<td width="250">货物品名:</td>
|
|
|
+ <!-- <td width="200" colspan="">1</td> -->
|
|
|
<td width="250">{{item.fGoodsids}}</td>
|
|
|
- <td width="250">白色聚吕</td>
|
|
|
+ <!-- <td width="250">白色聚吕</td> -->
|
|
|
<!-- <td width="200" colspan="2">件数: 161件</td> -->
|
|
|
<!-- <td width="200"></td> -->
|
|
|
<td width="200" colspan="4" class="zzss">件数: {{item.fQty}}件</td>
|
|
|
@@ -2294,9 +2327,15 @@ export default {
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
+ fChargedate: [
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
+ ],
|
|
|
fMarks: [
|
|
|
{ required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
+ fBillingway: [
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
+ ],
|
|
|
fBsdate: [
|
|
|
{ required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
@@ -2423,13 +2462,13 @@ export default {
|
|
|
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
- if(this.Printinglist.length>0) {
|
|
|
- for(let aorp in this.Printinglist){
|
|
|
- var date = new Date(this.Printinglist[aorp].fBsdate)
|
|
|
+ if(this.dataListSelection.length>0) {
|
|
|
+ for(let aorp in this.dataListSelection){
|
|
|
+ var date = new Date(this.dataListSelection[aorp].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.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
|
|
|
+ this.$set(this.dataListSelection[aorp], 'fBsdate', Y + M + D)
|
|
|
}
|
|
|
|
|
|
this.editDialogVisible_s = true;
|
|
|
@@ -2458,7 +2497,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
showEditDialog_sss() {
|
|
|
- if(this.Printinglist.length>0) {
|
|
|
+ if(this.dataListSelection.length>0) {
|
|
|
this.editDialogVisible_sss = true;
|
|
|
}else {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
@@ -2703,6 +2742,7 @@ export default {
|
|
|
this.warehouseDrList = [];
|
|
|
this.relevantAttachments = [];
|
|
|
this.title = "入库单";
|
|
|
+ this.formBrowseStatus = false;
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
@@ -2855,6 +2895,7 @@ export default {
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0); // sums[index]
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
this.sums = sums;
|
|
|
@@ -2909,6 +2950,14 @@ export default {
|
|
|
},
|
|
|
changefCorpid(row) {
|
|
|
this.$set(row, "fSbu", row.fCorpid);
|
|
|
+ for(let corp in this.fMblnoOptions) {
|
|
|
+ if(row.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
+ this.$set(this.form, "fStltypeid", this.fMblnoOptions[corp].fStltypeid + '');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ changefWarehouseid(row) {
|
|
|
+ console.log(this.warehouseOptions)
|
|
|
},
|
|
|
// 变更计价单位
|
|
|
changeFeeUnit(row) {
|
|
|
@@ -2955,11 +3004,11 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.dataListSelection[warehouseCr].fQty) {
|
|
|
- this.$message.error("入库件数");
|
|
|
+ this.$message.error("请选择入库件数");
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.dataListSelection[warehouseCr].fPackagespecs) {
|
|
|
- this.$message.error("入库件数");
|
|
|
+ this.$message.error("请选择入库规格");
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
@@ -3016,12 +3065,6 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- // for (let relevant in this.relevantAttachments) {
|
|
|
- // if (!this.relevantAttachments[relevant].fName) {
|
|
|
- // this.$message.error("请输入附件名称!");
|
|
|
- // return false;
|
|
|
- // }
|
|
|
- // }
|
|
|
for (let warehouseDr in this.warehouseDrList) {
|
|
|
if (!this.warehouseDrList[warehouseDr].fCorpid) {
|
|
|
this.$message.error("请选择客户名称");
|
|
|
@@ -3076,7 +3119,12 @@ export default {
|
|
|
formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
addWarehousebills(formData).then((response) => {
|
|
|
this.msgSuccess("提交成功");
|
|
|
- this.open = false;
|
|
|
+ if(status === 2) {
|
|
|
+ this.open = true;
|
|
|
+ }else {
|
|
|
+ this.open = false;
|
|
|
+ }
|
|
|
+
|
|
|
this.getList();
|
|
|
});
|
|
|
}
|
|
|
@@ -3129,6 +3177,7 @@ export default {
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
this.fMblnoOptions = response.rows;
|
|
|
+ console.log(response.rows)
|
|
|
this.KHblnoOptions = response.rows;
|
|
|
});
|
|
|
},
|
tong