|
@@ -644,7 +644,7 @@
|
|
|
style="width: 80%"
|
|
|
v-model="form.fLabour"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- :remote-method="flabourRemoteMethod"
|
|
|
+ :select="flabourRemoteMethod"
|
|
|
filterable
|
|
|
:disabled="contrOl"
|
|
|
placeholder="请输入劳务公司">
|
|
@@ -1615,7 +1615,7 @@
|
|
|
</el-button> -->
|
|
|
<el-button type="primary" size="small" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
|
|
|
<!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
|
|
|
- <el-button size="small" @click.prevent="addAgreement()" :disabled="browseStatus" type="danger"
|
|
|
+ <el-button size="small" @click.prevent="handleSelect(1)" :disabled="browseStatus" type="danger"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
</div>
|
|
@@ -1957,8 +1957,8 @@
|
|
|
>新行
|
|
|
</el-button>
|
|
|
<el-button type="primary" size="small" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
|
|
|
- <el-button type="danger" size="small" @click.prevent="addAgreements()" :disabled="browseStatus"
|
|
|
- >作业费协议</el-button>
|
|
|
+ <el-button type="danger" size="small" @click.prevent="handleSelect(1)" :disabled="browseStatus"
|
|
|
+ >作业费1协议</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
@@ -3303,6 +3303,8 @@ export default {
|
|
|
methods: {
|
|
|
handleSelect(key, keyPath) {
|
|
|
console.log(key, keyPath);
|
|
|
+ console.log(key)
|
|
|
+ this.addAgreements(key)
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect(row) {
|
|
@@ -3558,7 +3560,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 新增付款作业费协议
|
|
|
- addAgreements() {
|
|
|
+ addAgreements(kye) {
|
|
|
if (!this.form.fCorpid) {
|
|
|
this.$message({
|
|
|
message: "请维护货权方",
|
|
@@ -3574,7 +3576,7 @@ export default {
|
|
|
this.dialogWhgenlegList = [];
|
|
|
this.whgenlegTotal = 0;
|
|
|
this.warehousingagreements = true;
|
|
|
- this.getWhgenlegList();
|
|
|
+ this.getWhgenlegList(kye);
|
|
|
}
|
|
|
},
|
|
|
// 新增list
|
|
@@ -3835,17 +3837,18 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 查询作业费信息
|
|
|
- getWhgenlegList() {
|
|
|
+ getWhgenlegList(kye) {
|
|
|
// this.queryParams.fCorpid = this.form.fCorpid;
|
|
|
// this.queryParams.fLineno = this.form.fCorpid;
|
|
|
let data = {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
fLineno:this.form.fCorpid,
|
|
|
- fFeeid:this.dataList[0].fGoodsid
|
|
|
-
|
|
|
+ fFeeid:this.dataList[0].fGoodsid,
|
|
|
+ fTaskType: kye
|
|
|
}
|
|
|
- operationAgreement(data).then((response) => {
|
|
|
+ operationAgreement(data).then( response => {
|
|
|
+ console.log(response)
|
|
|
this.tasklegList = response.rows;
|
|
|
for (let li in this.tasklegList) {
|
|
|
this.$set(
|
|
@@ -4049,6 +4052,9 @@ export default {
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false;
|
|
|
+ this.fGrossweight = 0
|
|
|
+ this.fQty = 0
|
|
|
+ this.fNetweight = 0
|
|
|
this.reset();
|
|
|
this.getList()
|
|
|
},
|
|
@@ -4970,8 +4976,10 @@ export default {
|
|
|
if (name == null || name === "") {
|
|
|
return false;
|
|
|
}
|
|
|
+ console.log(name)
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.fSbuOptions = response.rows;
|
|
|
});
|
|
|
},
|