|
@@ -465,10 +465,10 @@
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
remote
|
|
|
- clearable
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- placeholder="请输入"
|
|
|
+ placeholder="请选择"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in warehouseOptions"
|
|
@@ -1131,19 +1131,18 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="fWarehouseid"
|
|
|
+ prop="fWarehouseInformation"
|
|
|
header-align="center"
|
|
|
width="140px"
|
|
|
align="center"
|
|
|
label="*库区"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <div style="width: 100px;background-color: #1c84c6;height: 100px">1111{{dataList[0].fWarehouselocid}}</div>
|
|
|
<el-input
|
|
|
placeholder="请选择"
|
|
|
- v-model="scope.row.fWarehouselocid"
|
|
|
- clearable
|
|
|
- @focus="getTreeselect"
|
|
|
+ :disabled="!form.fWarehouseid || browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
+ v-model="scope.row.fWarehouseInformation"
|
|
|
+ @focus="getTreeselect(scope)"
|
|
|
>
|
|
|
</el-input>
|
|
|
</template>
|
|
@@ -2876,6 +2875,7 @@
|
|
|
width="30%"
|
|
|
:before-close="hanDleclose">
|
|
|
<treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions" :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
|
|
|
+ <div>{{Warehouse}}</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="choiceWarehouse = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="confirm">确 定</el-button>
|
|
@@ -2931,6 +2931,8 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ inDex:'',
|
|
|
+ Warehouse:'',
|
|
|
treeselectList:{
|
|
|
fWarehouselocid:null
|
|
|
},
|
|
@@ -3272,7 +3274,10 @@ export default {
|
|
|
console.log(key, keyPath);
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
- getTreeselect() {
|
|
|
+ getTreeselect(row) {
|
|
|
+ console.log(row)
|
|
|
+ this.treeselectList.fWarehouselocid = null
|
|
|
+ this.inDex = row.$index
|
|
|
this.choiceWarehouse = true
|
|
|
treeselect(this.form.fWarehouseid).then(response => {
|
|
|
console.log(response)
|
|
@@ -3283,9 +3288,14 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
getAlltree(tree){
|
|
|
- console.log(tree.fWarehouseInformation)
|
|
|
- this.dataList[0].fWarehouseid = tree.fWarehouseInformation
|
|
|
- console.log(this.dataList[0])
|
|
|
+ console.log(tree.id)
|
|
|
+ console.log(this.dataList)
|
|
|
+ this.$set(this.dataList[this.inDex], 'fWarehouseInformation', tree.fWarehouseInformation)
|
|
|
+ this.$set(this.dataList[this.inDex], 'fWarehouselocid', tree.id)
|
|
|
+ this.Warehouse = tree.fWarehouseInformation
|
|
|
+ console.log(this.dataList[this.inDex])
|
|
|
+ console.log(this.dataList[this.inDex].fWarehouseInformation)
|
|
|
+ console.log(this.dataList)
|
|
|
},
|
|
|
confirm(){
|
|
|
this.choiceWarehouse = false
|