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

src/views/reportManagement/whgenleg/index.vue

@@ -2,23 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库" prop="fwarehouseid">
-        <el-select
-          v-model="queryParams.fWarehouseid"
-          filterable
-          remote
-          clearable
-          size="small"
-          :remote-method="warehouseRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请选择仓库"
-        >
-          <el-option
-            v-for="(dict, index) in warehouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        <treeselect style="width:160px"
+                    v-model="queryParams.fWarehouselocid"
+                    :options="fWarehouseidOption"
+                    @select="treeseLect"
+                    :show-count="true"
+                    :disable-branch-nodes="true"
+                    placeholder="请选择归属库区" />
       </el-form-item>
       <el-form-item label="库区" prop="fWarehouseLocationid">
         <el-select
@@ -279,17 +269,22 @@
 
 <script>
 import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/whgenleg";
-import {listWarehouse} from "@/api/basicdata/warehouse";
+import { listWarehouse, treeselect } from '@/api/basicdata/warehouse'
 import {listArea} from "@/api/basicdata/area";
 import {listGoods} from "@/api/basicdata/goods";
 import {listCorps} from "@/api/basicdata/corps";
+import Treeselect from '@riophae/vue-treeselect'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Whgenleg",
   components: {
+    Treeselect
   },
   data() {
     return {
+      //仓库树状下拉
+      fWarehouseidOption:[],
       // 货权方(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
@@ -351,8 +346,19 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
+    treeselect().then(response => {
+      this.fWarehouseidOption = response.data
+    })
   },
   methods: {
+    treeseLect(tree){
+      this.queryParams.fWarehouselocid = tree.id
+    },
+    getTreeselect() {
+      treeselect().then(response => {
+        this.warehousesOptions = response.data;
+      });
+    },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -132,24 +132,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <el-select
-          v-model="queryParams.fWarehouseid"
-          filterable
-          :disabled="browseStatus"
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="warehouseRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请选择仓库"
-        >
-          <el-option
-            v-for="(dict, index) in warehouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        <treeselect style="width:160px"
+                    v-model="queryParams.fWarehouselocid"
+                    :options="fWarehouseidOption"
+                    @select="treeseLect"
+                    :show-count="true"
+                    :disable-branch-nodes="true"
+                    placeholder="请选择归属库区" />
       </el-form-item>
       <el-form-item label="品牌" prop="fMarks">
         <el-input
@@ -1745,6 +1734,7 @@
         activeNames:['1'],
         //仓库树状图
         warehousesOptions:[],
+        fWarehouseidOption:[],
         Lander:'',
         Operator:'',
         colseButton:true,
@@ -1972,6 +1962,9 @@
       this.getDicts("data_stltype_type").then(response => {
         this.fStltypeidOptions = response.data;
       });
+      treeselect().then(response => {
+        this.fWarehouseidOption = response.data
+      })
       this.register()
     },
     activated(){
@@ -1979,6 +1972,9 @@
     },
     methods: {
       /** 查询部门下拉树结构 */
+      treeseLect(tree){
+        this.queryParams.fWarehouselocid = tree.id
+      },
       getTreeselect() {
         treeselect().then(response => {
           this.warehousesOptions = response.data;

src/views/warehouseBusiness/inStock/index.vue

@@ -7,173 +7,164 @@
       v-show="showSearch"
       label-width="88px"
     >
-      <el-form-item label="业务编号" prop="fBillno">
-        <el-input
-          v-model="queryParams.fBillno"
-          placeholder="请输入业务编号"
-          style="width: 80%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="制单人" prop="createBy">
-        <el-select
-          v-model="queryParams.createBy"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="userRemoteMethod"
-          placeholder="请选择制单人"
-        >
-          <el-option
-            v-for="(dict, index) in userOptions"
-            :key="index.userName"
-            :label="dict.nickName"
-            :value="dict.userName"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入库日期" prop="timeInterval">
-        <el-date-picker
-          v-model="queryParams.timeInterval"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          style="width: 60%"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-        >
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="贸易方式" prop="fTrademodeid">
-        <el-select
-          v-model="queryParams.fTrademodeid"
-          placeholder="请选择贸易方式"
-          clearable
-          style="width: 80%"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option
-            v-for="(dict, index) in fTrademodeidOptions"
-            :key="index.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+        <el-form-item label="业务编号" prop="fBillno">
+          <el-input
+            v-model="queryParams.fBillno"
+            placeholder="请输入业务编号"
+            style="width: 80%"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="货权方" prop="fCorpid">
-        <el-select
-          v-model="queryParams.fCorpid"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          @keyup.enter.native="handleQuery"
-          :remote-method="corpsRemoteMethod"
-          placeholder="请输入模糊查找"
-        >
-          <el-option
-            v-for="(dict, index) in fMblnoOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="提单号" prop="fMblno">
-        <el-input
-          v-model="queryParams.fMblno"
-          placeholder="请输入提单号"
-          clearable
-          style="width: 80%"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营单位" prop="fSbu">
-        <el-select
-          v-model="queryParams.fSbu"
-          filterable
-          remote
-          clearable
-          :remote-method="fSbuRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          style="width: 80%"
-          placeholder="请选择经营单位"
-        >
-          <el-option
-            v-for="(dict, index) in fMblnoOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="货物名称" prop="fGoodsid">
-        <el-select
-          v-model="queryParams.fGoodsid"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="goodsRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请选择货物名称"
-        >
-          <el-option
-            v-for="(dict, index) in goodsOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="仓库" prop="fWarehouseid">
-        <el-select
-          v-model="queryParams.fWarehouseid"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="warehouseRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请输入"
-        >
-          <el-option
-            v-for="(dict, index) in warehouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="品牌" prop="fMarks">
-        <el-input
-          v-model="queryParams.fMarks"
-          placeholder="请输入品牌"
-          clearable
-          style="width: 80%"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索
-        </el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button>
-      </el-form-item>
+        </el-form-item>
+        <el-form-item label="制单人" prop="createBy">
+          <el-select
+            v-model="queryParams.createBy"
+            filterable
+            remote
+            clearable
+            style="width: 80%"
+            :remote-method="userRemoteMethod"
+            placeholder="请选择制单人"
+          >
+            <el-option
+              v-for="(dict, index) in userOptions"
+              :key="index.userName"
+              :label="dict.nickName"
+              :value="dict.userName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库日期" prop="timeInterval">
+          <el-date-picker
+            v-model="queryParams.timeInterval"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            clearable
+            style="width: 60%"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @keyup.enter.native="handleQuery"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="贸易方式" prop="fTrademodeid">
+          <el-select
+            v-model="queryParams.fTrademodeid"
+            placeholder="请选择贸易方式"
+            clearable
+            style="width: 80%"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="(dict, index) in fTrademodeidOptions"
+              :key="index.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="货权方" prop="fCorpid">
+          <el-select
+            v-model="queryParams.fCorpid"
+            filterable
+            remote
+            clearable
+            style="width: 80%"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+            placeholder="请输入模糊查找"
+          >
+            <el-option
+              v-for="(dict, index) in fMblnoOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提单号" prop="fMblno">
+          <el-input
+            v-model="queryParams.fMblno"
+            placeholder="请输入提单号"
+            clearable
+            style="width: 80%"
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="经营单位" prop="fSbu">
+          <el-select
+            v-model="queryParams.fSbu"
+            filterable
+            remote
+            clearable
+            :remote-method="fSbuRemoteMethod"
+            @keyup.enter.native="handleQuery"
+            style="width: 80%"
+            placeholder="请选择经营单位"
+          >
+            <el-option
+              v-for="(dict, index) in fMblnoOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="货物名称" prop="fGoodsid">
+          <el-select
+            v-model="queryParams.fGoodsid"
+            filterable
+            remote
+            clearable
+            style="width: 80%"
+            :remote-method="goodsRemoteMethod"
+            @keyup.enter.native="handleQuery"
+            placeholder="请选择货物名称"
+          >
+            <el-option
+              v-for="(dict, index) in goodsOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库" prop="fWarehouseid">
+            <treeselect style="width:160px"
+                        v-model="queryParams.fWarehouselocid"
+                        :options="fWarehouseidOption"
+                        @select="treeseLect"
+                        :show-count="true"
+                        :disable-branch-nodes="true"
+                        placeholder="请选择归属库区" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="fMarks">
+          <el-input
+            v-model="queryParams.fMarks"
+            placeholder="请输入品牌"
+            clearable
+            style="width: 80%"
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+          >搜索
+          </el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置
+          </el-button>
+        </el-form-item>
+
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -2970,6 +2961,8 @@ export default {
       },
       // 部门树选项
       fWarehouseidOptions:[],
+      fWarehouseIdOptions:[],
+      fWarehouseidOption:[],
       activeNames:['1'],
       isrequired:2,
       isrequired_s:2,
@@ -3154,6 +3147,7 @@ export default {
       choiceWarehouse:false,
       // 查询参数
       queryParams: {
+        fWarehouselocid:null,
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
@@ -3309,6 +3303,9 @@ export default {
     this.getDicts("data_customer_category").then(response => {
       this.fleetOptions = response.data;
     });
+    treeselect().then(response => {
+      this.fWarehouseidOption = response.data
+    })
   },
   activated() {
     this.adoPt()
@@ -3321,12 +3318,17 @@ export default {
       this.addAgreements(key)
     },
     /** 查询部门下拉树结构 */
+    treeseLect(tree){
+      this.queryParams.fWarehouselocid = tree.id
+    },
     getTreeselect(row) {
       this.treeselectList.fWarehouselocid = null
       this.inDex = row.$index
       this.choiceWarehouse = true
       treeselect(this.form.fWarehouseid).then(response => {
+        console.log(response)
         this.fWarehouseidOptions = response.data;
+        this.fWarehouseidOption = response.data;
       })
       this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
     },

src/views/warehouseBusiness/outStock/index.vue

@@ -132,23 +132,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <el-select
-          v-model="queryParams.fWarehouseid"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="warehouseRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请选择仓库"
-        >
-          <el-option
-            v-for="(dict, index) in warehouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        <treeselect style="width:160px"
+                    v-model="queryParams.fWarehouselocid"
+                    :options="fWarehouseidOption"
+                    @select="treeseLect"
+                    :show-count="true"
+                    :disable-branch-nodes="true"
+                    placeholder="请选择归属库区" />
       </el-form-item>
       <el-form-item label="品牌" prop="fMarks">
         <el-input
@@ -2744,6 +2734,7 @@ export default {
       },
       // 部门树选项
       fWarehouseidOptions:[],
+      fWarehouseidOption:[],
       //控制作业类型校验
       isrequired:2,
       isrequired_s:2,
@@ -2881,6 +2872,7 @@ export default {
       jFeetunitOptions: [],
       // 查询参数
       queryParams: {
+        fWarehouselocid:null,
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
@@ -3019,6 +3011,9 @@ export default {
     this.getDicts("data_customer_category").then(response => {
       this.fleetOptions = response.data;
     });
+    treeselect().then(response => {
+      this.fWarehouseidOption = response.data
+    })
   },
   activated() {
     this.adoPt()
@@ -3055,12 +3050,17 @@ export default {
         .catch(_ => {});
     },
     /** 查询部门下拉树结构 */
+    treeseLect(tree){
+      console.log(tree)
+      this.queryParams.fWarehouselocid = tree.id
+    },
     getTreeselect(row) {
       this.treeselectList.fWarehouselocid = null
       this.inDex = row.$index
       this.choiceWarehouse = true
       treeselect(this.form.fWarehouseid).then(response => {
         this.fWarehouseidOptions = response.data;
+        this.fWarehouseidOption = response.data;
       })
       this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
     },
@@ -4762,13 +4762,6 @@ export default {
         this.warehouseOptions = response.rows;
       });
     },
-    /* 弹窗获取所有商品信息 */
-    goodsRemoteMethod() {
-      let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0 };
-      listGoods(queryParams).then((response) => {
-        this.goodsOptions = response.rows;
-      });
-    },
     /* 获取所有仓库信息 */
     warehousesssMethod() {
       let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0 };

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -132,23 +132,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <el-select
-          v-model="queryParams.fWarehouseid"
-          filterable
-          remote
-          clearable
-          style="width: 80%"
-          :remote-method="warehouseRemoteMethod"
-          @keyup.enter.native="handleQuery"
-          placeholder="请选择仓库"
-        >
-          <el-option
-            v-for="(dict, index) in warehouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        <treeselect style="width:160px"
+                    v-model="queryParams.fWarehouselocid"
+                    :options="fWarehouseidOption"
+                    @select="treeseLect"
+                    :show-count="true"
+                    :disable-branch-nodes="true"
+                    placeholder="请选择归属库区" />
       </el-form-item>
       <el-form-item label="品牌" prop="fMarks">
         <el-input
@@ -2395,6 +2385,7 @@ export default {
       },
       //仓库树状图
       fWarehouseidOptions:[],
+      fWarehouseidOption:[],
       activeNames:['1'],
       //作业类型校验
       isrequired:2,
@@ -2665,6 +2656,9 @@ export default {
     this.getDicts("data_customer_category").then(response => {
       this.fleetOptions = response.data;
     });
+    treeselect().then(response => {
+      this.fWarehouseidOption = response.data
+    })
     this.register()
   },
   activated(){
@@ -2698,6 +2692,9 @@ export default {
       }
     },
     /** 查询部门下拉树结构 */
+    treeseLect(tree){
+      this.queryParams.fWarehouselocid = tree.id
+    },
     getTreeselect(row) {
       this.treeselectList.fWarehouselocid = null
       this.inDex = row.$index