Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

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
   })
 }
 

src/views/warehouseBusiness/inStock/index.vue

@@ -460,14 +460,13 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="仓库" prop="fWarehouseid">
+            <el-form-item label="仓1库" 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="请输入"
               >
@@ -627,7 +626,7 @@
                 :disabled="contrOl"
               >
                 <el-option
-                  v-for="(dict, index) in businessTypeOption"
+                  v-for="(dict,index) in businessTypeOption"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -991,7 +990,7 @@
                 >撤回入库
                 </el-button
                 >
-                <el-button size="small" type="success" :disabled="browseStatus" prop="打印" @click=""
+                <el-button size="small" type="success" :disabled="browseStatus" prop="打印"
                 >打印吊牌
                 </el-button>
                 <el-button size="small" type="success" :disabled="browseStatus" prop="打印" @click="showEditDialog_ss"
@@ -1130,12 +1129,13 @@
                   />
                 </template>
               </el-table-column>
+
               <el-table-column
-                prop="fWarehouselocid"
+                prop="fWarehouseid"
                 header-align="center"
                 width="140px"
                 align="center"
-                label="*库位"
+                label="*库区"
               >
                 <template slot-scope="scope">
                   <el-input
@@ -1168,7 +1168,7 @@
 <!--                    ></el-option>-->
 <!--                  </el-select>-->
 <!--                </template>-->
-              </el-table-column>
+<!--              </el-table-column>-->
               <el-table-column
                 prop="fcntrtype"
                 header-align="center"
@@ -2929,6 +2929,7 @@ export default {
   },
   data() {
     return {
+      fWarehouseidOptions:[],
       // 部门树选项
       warehousesOptions:[],
       activeNames:['1'],
@@ -3260,19 +3261,19 @@ export default {
   activated() {
     this.adoPt()
   },
-  watch:{
-    'form.fWarehouseid' : 'warehouseMethod'
-  },
   methods: {
     handleSelect(key, keyPath) {
       console.log(key, keyPath);
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
-        this.warehousesOptions = response.data;
-        console.log(this.warehousesOptions)
+      treeselect(this.form.fWarehouseid).then(response => {
+        console.log(response)
+        this.fWarehouseidOptions = response.data;
+        console.log(this.fWarehouseidOptions)
+        // console.log(this.dataList.fWarehouseid)
       });
+
     },
     // 出库件数的计算
     qtyChange(row) {
@@ -3816,6 +3817,7 @@ export default {
         this.$message({ message: "计划件数不能为0", type: "warning", });
         return false;
       }
+      this.getTreeselect()
       let fTruckno = null
       let fDriverTel = null
       let fDriverName = null
@@ -4679,10 +4681,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))

src/views/warehouseBusiness/outStock/index.vue

@@ -2872,6 +2872,7 @@ export default {
     getTreeselect() {
       treeselect().then(response => {
         this.warehousesOptions = response.data;
+        console.log(this.warehousesOptions)
       });
     },
     //审批页面跳转