|
|
@@ -7,6 +7,7 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="88px"
|
|
|
>
|
|
|
+ <el-row>
|
|
|
<el-form-item label="业务编号" prop="fBillno">
|
|
|
<el-input
|
|
|
v-model="queryParams.fBillno"
|
|
|
@@ -133,13 +134,23 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="仓库" prop="fWarehouseid">
|
|
|
- <treeselect style="width:160px"
|
|
|
- v-model="queryParams.fWarehouselocid"
|
|
|
- :options="fWarehouseidOption"
|
|
|
- @select="treeseLect"
|
|
|
- :show-count="true"
|
|
|
- :disable-branch-nodes="true"
|
|
|
- placeholder="请选择归属库区" />
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fWarehouseid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ @select="treeseLect"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in warehouseOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
@@ -2825,15 +2836,32 @@
|
|
|
入库日期：{{ fBsdates }}
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+
|
|
|
+<!-- <tr v-for="(item, index) in Printinglist" :key="index">-->
|
|
|
+<!-- <td width="200">车号</td>-->
|
|
|
+<!-- <td width="200">{{ item.fTruckno }}</td>-->
|
|
|
+<!-- <td width="200">货物品名</td>-->
|
|
|
+<!-- <td width="200" class="zzss">-->
|
|
|
+<!-- {{ item.fGoodsids }}-->
|
|
|
+<!-- </td>-->
|
|
|
+<!-- <td width="200">{{item.fBusinessTypes}}</td>-->
|
|
|
+<!-- <td width="200">{{item.fMarks}}</td>-->
|
|
|
+<!-- </tr>-->
|
|
|
+ <tr>
|
|
|
<td width="200">车号</td>
|
|
|
- <td width="200">{{ item.fTruckno }}</td>
|
|
|
<td width="200">货物品名</td>
|
|
|
- <td width="200" class="zzss">
|
|
|
- {{ item.fGoodsids }}
|
|
|
- </td>
|
|
|
- <td width="200">{{item.fBusinessTypes}}</td>
|
|
|
- <td width="200">{{item.fMarks}}</td>
|
|
|
+ <td width="200">提单号</td>
|
|
|
+ <td width="200">品牌/规格/产地</td>
|
|
|
+ <td width="200">净重(吨)</td>
|
|
|
+ <td width="200">件数(50KG)</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td width="200">{{ item.fTruckno }}</td>
|
|
|
+ <td width="200">{{ item.fGoodsids }}</td>
|
|
|
+ <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>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="1400" colspan="6"> </td>
|
|
|
@@ -2980,6 +3008,7 @@ export default {
|
|
|
formBrowseStatus: false,
|
|
|
fTruckno: "",
|
|
|
fBsdates: "",
|
|
|
+ fMblno:"",
|
|
|
fCntrtype: "",
|
|
|
fGoodsids: "",
|
|
|
fPlaNnumber: "",
|
|
|
@@ -3304,8 +3333,10 @@ export default {
|
|
|
this.fleetOptions = response.data;
|
|
|
});
|
|
|
treeselect().then(response => {
|
|
|
- this.fWarehouseidOption = response.data
|
|
|
+ console.log(response)
|
|
|
+ this.warehouseOptions = response.data
|
|
|
})
|
|
|
+ this.warehousesssMethod()
|
|
|
},
|
|
|
activated() {
|
|
|
this.adoPt()
|
|
|
@@ -3319,6 +3350,7 @@ export default {
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
treeseLect(tree){
|
|
|
+ console.log(tree)
|
|
|
this.queryParams.fWarehouselocid = tree.id
|
|
|
},
|
|
|
getTreeselect(row) {
|
|
|
@@ -3653,13 +3685,16 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
+ console.log("000")
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
+ console.log("111")
|
|
|
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;
|
|
|
+ console.log(this.Printinglist)
|
|
|
var date = new Date(this.dataListSelection[0].fBsdate);
|
|
|
var Y = date.getFullYear() + "-";
|
|
|
var M =
|
|
|
@@ -3768,11 +3803,16 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.dataListSelection.length > 0) {
|
|
|
+ console.log(this.dataListSelection)
|
|
|
this.fTruckno = this.dataListSelection[0].fTruckno
|
|
|
this.fCntrtype = this.dataListSelection[0].fCntrtype
|
|
|
this.fGoodsids = this.dataListSelection[0].fGoodsids
|
|
|
this.fDriverTel = this.dataListSelection[0].fDriverTel
|
|
|
this.fPackagespecs = this.dataListSelection[0].fPackagespecs
|
|
|
+ this.fMblno = this.dataListSelection[0].fMblno
|
|
|
+ this.fQty = this.dataListSelection[0].fQty
|
|
|
+ // this.fQtys = this.dataListSelection[0].fQty
|
|
|
+ console.log(this.fQtys)
|
|
|
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) + '-'
|
|
|
@@ -4267,7 +4307,6 @@ export default {
|
|
|
this.detailsHidden = false;
|
|
|
this.formBrowseStatus = false;
|
|
|
const fId = row.fId || this.ids;
|
|
|
- this.dataList = [];
|
|
|
console.log(fId)
|
|
|
this.goodsRemoteMethod()
|
|
|
getWarehousebills(fId).then((response) => {
|
wengyuwen