|  | @@ -1137,9 +1137,17 @@
 | 
	
		
			
				|  |  |                  align="center"
 | 
	
		
			
				|  |  |                  label="*库位"
 | 
	
		
			
				|  |  |                >
 | 
	
		
			
				|  |  | -                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
 | 
	
		
			
				|  |  | +                <template slot-scope="scope">
 | 
	
		
			
				|  |  | +                  <el-input
 | 
	
		
			
				|  |  | +                    placeholder="请选择"
 | 
	
		
			
				|  |  | +                    v-model="scope.row.fWarehouselocid"
 | 
	
		
			
				|  |  | +                    clearable
 | 
	
		
			
				|  |  | +                    @focus="choiceWarehouse = true"
 | 
	
		
			
				|  |  | +                  >
 | 
	
		
			
				|  |  | +                  </el-input>
 | 
	
		
			
				|  |  | +                </template>
 | 
	
		
			
				|  |  | +<!--                <treeselect v-model="fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />-->
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -                <!--                <template slot-scope="scope">-->
 | 
	
		
			
				|  |  |  <!--                  <el-select-->
 | 
	
		
			
				|  |  |  <!--                    v-model="scope.row.fWarehouselocid"-->
 | 
	
		
			
				|  |  |  <!--                    filterable-->
 | 
	
	
		
			
				|  | @@ -2859,6 +2867,18 @@
 | 
	
		
			
				|  |  |          </div>
 | 
	
		
			
				|  |  |        </el-dialog>
 | 
	
		
			
				|  |  |      </el-dialog>
 | 
	
		
			
				|  |  | +    <el-dialog
 | 
	
		
			
				|  |  | +      title="选择库位"
 | 
	
		
			
				|  |  | +      :visible.sync="choiceWarehouse"
 | 
	
		
			
				|  |  | +      width="30%"
 | 
	
		
			
				|  |  | +      :before-close="hanDleclose">
 | 
	
		
			
				|  |  | +                      <treeselect v-model="fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      <span slot="footer" class="dialog-footer">
 | 
	
		
			
				|  |  | +    <el-button @click="choiceWarehouse = false">取 消</el-button>
 | 
	
		
			
				|  |  | +    <el-button type="primary" @click="choiceWarehouse = false">确 定</el-button>
 | 
	
		
			
				|  |  | +  </span>
 | 
	
		
			
				|  |  | +    </el-dialog>
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -3036,6 +3056,7 @@ export default {
 | 
	
		
			
				|  |  |        Printinglist: [],
 | 
	
		
			
				|  |  |        // 库存明细入账数组
 | 
	
		
			
				|  |  |        dataListSelection: [],
 | 
	
		
			
				|  |  | +      fWarehouselocid:'',
 | 
	
		
			
				|  |  |        fAddr: "",
 | 
	
		
			
				|  |  |        // 库存明细撤回入账数组
 | 
	
		
			
				|  |  |        dataWithdrawList: [],
 | 
	
	
		
			
				|  | @@ -3083,6 +3104,8 @@ export default {
 | 
	
		
			
				|  |  |        ],
 | 
	
		
			
				|  |  |        current:'',
 | 
	
		
			
				|  |  |        before:'',
 | 
	
		
			
				|  |  | +      //控制选择库位弹出
 | 
	
		
			
				|  |  | +      choiceWarehouse:false,
 | 
	
		
			
				|  |  |        // 查询参数
 | 
	
		
			
				|  |  |        queryParams: {
 | 
	
		
			
				|  |  |          pageNum: 1,
 | 
	
	
		
			
				|  | @@ -3248,6 +3271,7 @@ export default {
 | 
	
		
			
				|  |  |      getTreeselect() {
 | 
	
		
			
				|  |  |        treeselect().then(response => {
 | 
	
		
			
				|  |  |          this.warehousesOptions = response.data;
 | 
	
		
			
				|  |  | +        console.log(this.warehousesOptions)
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 出库件数的计算
 | 
	
	
		
			
				|  | @@ -3389,6 +3413,13 @@ export default {
 | 
	
		
			
				|  |  |          this.$set(this.relevantAttachments[list], "fName", row.fileName);
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    hanDleclose(done){
 | 
	
		
			
				|  |  | +      this.$confirm('确认关闭?')
 | 
	
		
			
				|  |  | +        .then(_ => {
 | 
	
		
			
				|  |  | +          done();
 | 
	
		
			
				|  |  | +        })
 | 
	
		
			
				|  |  | +        .catch(_ => {});
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      revoke(){
 | 
	
		
			
				|  |  |        revoke(this.form.fId).then(data=>{
 | 
	
		
			
				|  |  |          if (data.code === 200){
 | 
	
	
		
			
				|  | @@ -3761,7 +3792,7 @@ export default {
 | 
	
		
			
				|  |  |          pageSize:10,
 | 
	
		
			
				|  |  |          fLineno:this.form.fCorpid,
 | 
	
		
			
				|  |  |          fFeeid:this.dataList[0].fGoodsid
 | 
	
		
			
				|  |  | -        
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        operationAgreement(data).then((response) => {
 | 
	
		
			
				|  |  |          this.tasklegList = response.rows;
 |