wengyuwen преди 4 години
родител
ревизия
84f0324bd1
променени са 2 файла, в които са добавени 25 реда и са изтрити 7 реда
  1. 6 2
      src/api/basicdata/warehouse.js
  2. 19 5
      src/views/warehouseBusiness/inStock/index.vue

+ 6 - 2
src/api/basicdata/warehouse.js

@@ -73,10 +73,14 @@ export function delCusCon(fId) {
   })
 }
 // 查询部门下拉树结构
-export function treeselect() {
+export function treeselect(ancestors) {
+  const query = {
+    ancestors
+  }
   return request({
     url: '/basicdata/warehouse/treeselect',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }
 

+ 19 - 5
src/views/warehouseBusiness/inStock/index.vue

@@ -462,12 +462,11 @@
           <el-col :span="8">
             <el-form-item label="仓库" prop="fWarehouseid">
               <el-select
-                v-model="queryParams.fWarehouseid"
+                v-model="form.fWarehouseid"
                 filterable
                 remote
                 clearable
                 style="width: 80%"
-                :remote-method="warehouseRemoteMethod"
                 @keyup.enter.native="handleQuery"
                 placeholder="请输入"
               >
@@ -1130,7 +1129,18 @@
                   />
                 </template>
               </el-table-column>
+
               <el-table-column
+                prop="fWarehouseid"
+                header-align="center"
+                width="140px"
+                align="center"
+                label="*库区"
+              >
+                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+              </el-table-column>
+
+                <el-table-column
                 prop="fWarehouselocid"
                 header-align="center"
                 width="140px"
@@ -3246,9 +3256,12 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
+      treeselect(this.form.fWarehouseid).then(response => {
+        console.log(response)
         this.warehousesOptions = response.data;
+        console.log(this.warehouseOptions)
       });
+
     },
     // 出库件数的计算
     qtyChange(row) {
@@ -3761,7 +3774,7 @@ export default {
         pageSize:10,
         fLineno:this.form.fCorpid,
         fFeeid:this.dataList[0].fGoodsid
-        
+
       }
       operationAgreement(data).then((response) => {
         this.tasklegList = response.rows;
@@ -3785,6 +3798,7 @@ export default {
         this.$message({ message: "计划件数不能为0", type: "warning", });
         return false;
       }
+      this.getTreeselect()
       let fTruckno = null
       let fDriverTel = null
       let fDriverName = null
@@ -4648,10 +4662,10 @@ export default {
               return false
             }
           }
-
           let formDatae = new window.FormData()
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit
+          console.log(this.form)
           formDatae.append('tWarehouseBills', JSON.stringify(this.form))
           // 库存明细
           formDatae.append('tWarehousebillsitems', JSON.stringify(this.dataList))