|
|
@@ -436,7 +436,7 @@
|
|
|
filterable
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
remote
|
|
|
- @change="changefWarehouseid()"
|
|
|
+ @change="changefWarehouseid(form)"
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -1797,6 +1797,23 @@
|
|
|
width="180px"
|
|
|
label="计价单位"
|
|
|
>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeUnitid"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ @change="changeFeeUnit(scope.row)"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in jFeetunitOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="fPrice"
|
|
|
@@ -1805,20 +1822,7 @@
|
|
|
label="单价"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column
|
|
|
- prop="fQtyblc"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="录入人"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fBegindate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="录入时间"
|
|
|
- >
|
|
|
- </el-table-column> -->
|
|
|
+
|
|
|
<!-- <el-table-column
|
|
|
prop="fMarks"
|
|
|
header-align="center"
|
|
|
@@ -1836,7 +1840,7 @@
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="whgenlegData">导入</el-button>
|
|
|
- <el-button @click="warehousingagreements = false">取 消</el-button>
|
|
|
+ <el-button @click="warehousingagreement = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 选择作业费协议数据 -->
|
|
|
@@ -1860,39 +1864,48 @@
|
|
|
<el-table-column label="行号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fCorpid"
|
|
|
+ prop="fCorpname"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="客户名称"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="createTime"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="计价单位"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fGoodsid"
|
|
|
+ prop="fName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="单价"
|
|
|
+ label="费用名称"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fQtyblc"
|
|
|
+ prop="fFeeUnitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="录入人"
|
|
|
+ width="180px"
|
|
|
+ label="计价单位"
|
|
|
>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeUnitid"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ @change="changeFeeUnit(scope.row)"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in jFeetunitOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fBegindate"
|
|
|
+ prop="fPrice"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="录入时间"
|
|
|
+ label="单价"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column
|
|
|
@@ -1912,7 +1925,7 @@
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="zhgenlegData">导入</el-button>
|
|
|
- <el-button @click="warehousingagreement = false">取 消</el-button>
|
|
|
+ <el-button @click="warehousingagreements = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
@@ -1989,8 +2002,8 @@
|
|
|
<td width="100">入库重量</td>
|
|
|
<td width="100">入库件数</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
- <td width="100">{{index+1}}</td>
|
|
|
+ <tr v-for="(item,indexx) in Printinglist" :key="indexx">
|
|
|
+ <td width="100">{{indexx+1}}</td>
|
|
|
<td width="100">{{item.fBsdate}}</td>
|
|
|
<td width="100">{{item.fCntqty}}</td>
|
|
|
<td width="100">{{item.fGrossweight}}</td>
|
|
|
@@ -2080,7 +2093,7 @@
|
|
|
|
|
|
</td> -->
|
|
|
</tr>
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <tr v-for="(item,key) in Printinglist" :key="key">
|
|
|
<td width="250">货物品名:</td>
|
|
|
<!-- <td width="200" colspan="">1</td> -->
|
|
|
<td width="250">{{item.fGoodsids}}</td>
|
|
|
@@ -2228,7 +2241,7 @@ import {
|
|
|
updateWarehousebills,
|
|
|
exportWarehousebills,
|
|
|
} from "@/api/warehouseBusiness/warehouseInStock";
|
|
|
-import { listAgreement } from '@/api/agreement/agreement';
|
|
|
+import { listAgreement,operationAgreement } from '@/api/agreement/agreement';
|
|
|
import { listCorps } from "@/api/basicdata/corps";
|
|
|
|
|
|
import { listFees } from "@/api/basicdata/fees";
|
|
|
@@ -2538,7 +2551,6 @@ export default {
|
|
|
this.dialogWhgenlegList = [];
|
|
|
this.whgenlegTotal = 0;
|
|
|
this.warehousingagreement = true;
|
|
|
- // this.whgenlegData()
|
|
|
this.getWhgenlegList();
|
|
|
}
|
|
|
|
|
|
@@ -2555,8 +2567,7 @@ export default {
|
|
|
this.whgenlegList = [];
|
|
|
this.dialogWhgenlegList = [];
|
|
|
this.whgenlegTotal = 0;
|
|
|
- this.warehousingagreement = true;
|
|
|
- // this.whgenlegData()
|
|
|
+ this.warehousingagreements = true;
|
|
|
this.getWhgenlegList();
|
|
|
}
|
|
|
},
|
|
|
@@ -2599,6 +2610,7 @@ export default {
|
|
|
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)
|
|
|
+ console.log(this.fBsdate)
|
|
|
}
|
|
|
|
|
|
this.editDialogVisible_s = true;
|
|
|
@@ -2697,10 +2709,12 @@ export default {
|
|
|
getWhgenlegList() {
|
|
|
// this.queryParams.fCorpid = this.form.fCorpid;
|
|
|
this.queryParams.fLineno = this.form.fCorpid;
|
|
|
- listAgreement(this.queryParams).then((response) => {
|
|
|
+ operationAgreement(this.queryParams).then((response) => {
|
|
|
console.log(response)
|
|
|
this.tasklegList = response.rows;
|
|
|
- console.log(this.whgenlegList);
|
|
|
+ for(let li in this.tasklegList) {
|
|
|
+ this.$set(this.tasklegList[li], "fFeeUnitid", this.tasklegList[li].fFeeUnitid + '')
|
|
|
+ }
|
|
|
this.whgenlegTotal = response.total;
|
|
|
});
|
|
|
|
|
|
@@ -2709,29 +2723,47 @@ export default {
|
|
|
whgenlegData() {
|
|
|
console.log(this.dialogWhgenlegList)
|
|
|
console.log("...(")
|
|
|
- for (let whgen in this.dialogWhgenlegList) {
|
|
|
+ if (this.dialogWhgenlegList.length === 0) {
|
|
|
+ this.$message({
|
|
|
+ message: "请选择需要导入的数据",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ for (let whgen in this.dialogWhgenlegList) {
|
|
|
this.warehouseDrList.push({
|
|
|
fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
|
|
|
- fFeeid: this.dialogWhgenlegList[whgen].fFeeid +'',
|
|
|
- fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
|
|
|
- fUnitprice: this.dialogWhgenlegList[whgen].fUnitprice + '',
|
|
|
+ fFeeid: this.dialogWhgenlegList[whgen].feeFId +'',
|
|
|
+ fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
|
|
|
+ fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fExrate: "1"
|
|
|
});
|
|
|
}
|
|
|
this.warehousingagreement = false;
|
|
|
+ }
|
|
|
},
|
|
|
zhgenlegData() {
|
|
|
console.log(this.dialogWhgenlegList)
|
|
|
console.log("((((")
|
|
|
+ if (this.dialogWhgenlegList.length === 0) {
|
|
|
+ this.$message({
|
|
|
+ message: "请选择需要导入的数据",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ } else {
|
|
|
for (let zhgen in this.dialogWhgenlegList) {
|
|
|
this.warehouseCrList.push({
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
- fFeeid: this.dialogWhgenlegList[whgen].fFeeid +'',
|
|
|
- fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
|
|
|
- fUnitprice: this.dialogWhgenlegList[whgen].fUnitprice + '',
|
|
|
+ fFeeid: this.dialogWhgenlegList[zhgen].feeFId +'',
|
|
|
+ fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid +'',
|
|
|
+ fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fExrate: "1"
|
|
|
|
|
|
});
|
|
|
}
|
|
|
this.warehousingagreements = false;
|
|
|
+ }
|
|
|
},
|
|
|
// 贸易方式(数据字典),对���t_trademodels 字典翻译
|
|
|
fTrademodeidFormat(row, column) {
|
|
|
@@ -3104,6 +3136,7 @@ export default {
|
|
|
this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
|
|
|
},
|
|
|
changefCorpid(row) {
|
|
|
+ console.log(row)
|
|
|
this.$set(row, "fSbu", row.fCorpid);
|
|
|
for(let corp in this.fMblnoOptions) {
|
|
|
if(row.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
@@ -3111,8 +3144,16 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ // change仓库
|
|
|
changefWarehouseid(row) {
|
|
|
- console.log(this.warehouseOptions)
|
|
|
+ console.log(this.warehouseOptions)
|
|
|
+ console.log(row)
|
|
|
+ for(let corp in this.warehouseOptions) {
|
|
|
+ if(row.fWarehouseid === this.warehouseOptions[corp].fId) {
|
|
|
+ this.$set(this.form, "fContacts", this.warehouseOptions[corp].createBy);
|
|
|
+ this.$set(this.form, "fTel", this.warehouseOptions[corp].fTotalgross);
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
// 变更计价单位
|
|
|
changeFeeUnit(row) {
|
|
|
@@ -3150,6 +3191,10 @@ export default {
|
|
|
this.$message.error("请选择库区");
|
|
|
return false;
|
|
|
}
|
|
|
+ if (!this.dataListSelection[warehouseCr].fGoodsid) {
|
|
|
+ this.$message.error("请选择品名");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (!this.dataListSelection[warehouseCr].fGrossweight) {
|
|
|
this.$message.error("请选择入库毛重");
|
|
|
return false;
|
|
|
@@ -3200,7 +3245,9 @@ export default {
|
|
|
// 撤回入库
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form))
|
|
|
+ console.log(this.form)
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList))
|
|
|
+ console.log(this.dataWithdrawList)
|
|
|
updateCredit(formData).then((response) => {
|
|
|
this.fid = response.data;
|
|
|
this.formBrowseStatus = false
|
|
|
@@ -3397,6 +3444,7 @@ export default {
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
listFees(queryParams).then((response) => {
|
|
|
this.fWbuOptions = response.rows;
|
|
|
+ console.log(response.rows)
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询经营单位 */
|
tong