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

src/api/reportManagement/Statistics.js

@@ -46,7 +46,7 @@ export function delWhgenleg(fAccyear) {
 // 导出库存总账
 export function exportWhgenleg(query) {
   return request({
-    url: '/warehouseBusiness/whgenleg/export',
+    url: '/warehouseBusiness/summary/export',
     method: 'get',
     params: query
   })

src/views/finance/contrast/index.vue

@@ -318,7 +318,8 @@
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="业务日期" align="center" prop="fBsdate">
           <template slot-scope="scope">
-            <span>{{scope.row.fBsdate.slice(0, 10)}}</span>
+            <span v-if="scope.row.fBsdate === undefined">无</span>
+            <span v-else>{{scope.row.fBsdate.slice(0, 10)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="费用名称" align="center" prop="fFeeName" />
@@ -351,12 +352,14 @@
         <el-table-column label="品牌" align="center" prop="fMarks" />
         <el-table-column label="计费起始日期" align="center" prop="fChargedate">
           <template slot-scope="scope">
-            <span>{{scope.row.fChargedate.slice(0, 10)}}</span>
+            <span v-if="scope.row.fChargedate === undefined">无</span>
+            <span v-else>{{scope.row.fChargedate.slice(0, 10)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="计费截止日期" align="center" prop="fBillingDeadline">
           <template slot-scope="scope">
-            <span>{{scope.row.fBillingDeadline.slice(0, 10)}}</span>
+            <span v-if="scope.row.fBillingDeadline === undefined">无</span>
+            <span v-else>{{scope.row.fBillingDeadline.slice(0, 10)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="计费天数" align="center" prop="fBillingDays" />

src/views/reportManagement/Statistics/index.vue

@@ -2,41 +2,14 @@
   <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>
-      </el-form-item>
-      <el-form-item label="库区" prop="fWarehouseLocationid">
-        <el-select
-          v-model="queryParams.fWarehouseLocationid"
-          filterable
-          remote
-          size="small"
-          :remote-method="kqhouseRemoteMethod"
-          placeholder="请选择库区"
-        >
-          <el-option
-            v-for="(dict, index) in kqhouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        <treeselect style="width:160px"
+                    v-model="queryParams.fWarehouseid"
+                    :options="fWarehouseidOption"
+                    @select="treeseLect"
+                    :show-count="true"
+                    placeholder="请选择归属库区" />
       </el-form-item>
+
       <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
           v-model="queryParams.fGoodsid"
@@ -56,16 +29,18 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="入库日期" prop="createTime">
+      <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">
+          @keyup.enter.native="handleQuery"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="贸易方式" prop="fTrademodeid">
@@ -169,14 +144,15 @@
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsName" width="120"/>
-      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" width="120"/>
-      <el-table-column
+      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" width="160"/>
+      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" width="120"/>
+<!--      <el-table-column
         label="贸易方式"
         align="center"
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
         width="120"
-      />
+      />-->
       <el-table-column label="件数" align="center" prop="fQty" />
       <el-table-column label="毛重(kg)" align="center" prop="fGrossweight" />
       <el-table-column label="净重(kg)" align="center" prop="fNetweight" />
@@ -301,18 +277,23 @@
 </template>
 
 <script>
-import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/Statistics";
-import {listWarehouse} from "@/api/basicdata/warehouse";
+import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg , } from "@/api/reportManagement/Statistics";
+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:[],
       options:[{
         name:'出库',
         key:'SJCK'
@@ -383,8 +364,20 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
+    treeselect().then(response => {
+      this.fWarehouseidOption = response.data
+    })
   },
   methods: {
+    treeseLect(tree){
+      this.queryParams.fWarehouseid = 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/inStock/index.vue

@@ -3331,12 +3331,12 @@ export default {
     this.getDicts("data_stltype_type").then(response => {
       this.fStltypeidOptions = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })
@@ -4073,14 +4073,12 @@ export default {
           }
           // qty=(qty/1000).toFixed(2);
           let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
-
-
           if(this.key_id == 3){
             this.warehouseDrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
               fFeeid: feeId,
-              fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+              fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + "",
               fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
               fCurrency: 'RMB',
               fExrate: 1,
@@ -4092,11 +4090,12 @@ export default {
               fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
             })
           }else{
+            console.log(this.dialogWhgenlegList[zhgen].fFeeUnitid)
             this.warehouseCrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
               fFeeid: feeId,
-              fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
+              fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + "",
               fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
               fCurrency: 'RMB',
               fExrate: 1,
@@ -4107,7 +4106,7 @@ export default {
               fMarks:this.form.fMarks,
               fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
             })
-
+            console.log(this.warehouseCrList)
           }
 
         }

src/views/warehouseBusiness/outStock/index.vue

@@ -3186,12 +3186,12 @@ export default {
     this.getDicts("st_out_type").then((response) => {
       this.businessTypeOption = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2677,12 +2677,12 @@ export default {
     this.getDicts("st_trans_type").then((response) => {
       this.businessTypeOption = response.data;
     });
-    this.getDicts("data_customer_category").then(response => {
-      this.fCompanyOptIons = response.data;
-    });
-    this.getDicts("data_customer_category").then(response => {
-      this.fleetOptions = response.data;
-    });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fCompanyOptIons = response.data;
+    // });
+    // this.getDicts("data_customer_category").then(response => {
+    //   this.fleetOptions = response.data;
+    // });
     treeselect().then(response => {
       this.warehouseOptions = response.data
     })
@@ -3123,7 +3123,6 @@ export default {
             fProductName:this.form.fProductName,
             fMarks:this.form.fMarks,
             fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
-
           })
         } else {
           this.warehouseDrList.push({
@@ -3717,6 +3716,9 @@ export default {
       this.detailsHidden = false;
       this.formBrowseStatus = false;
       let fId = row.fId || this.ids;
+      if (fId.length === 1){
+        fId = fId[0].fId
+      }
       this.dataList = [];
       getStockTransfer(fId).then((response) => {
         if (response.data.warehousebills) {