tong 4 anos atrás
pai
commit
72fc00dbf2

+ 5 - 49
src/views/reportManagement/whgenleg/index.vue

@@ -1,42 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="原始入库业务编号" prop="fOriginalbillno">
-        <el-input
-          v-model="queryParams.fOriginalbillno"
-          placeholder="请输入原始入库业务编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上期件数" prop="fPreqty">
-        <el-input
-          v-model="queryParams.fPreqty"
-          placeholder="请输入上期件数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上期毛重,单位为吨,保留6位小数" prop="fPregrossweight">
-        <el-input
-          v-model="queryParams.fPregrossweight"
-          placeholder="请输入上期毛重,单位为吨,保留6位小数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上期净重," prop="fPrenetweight">
-        <el-input
-          v-model="queryParams.fPrenetweight"
-          placeholder="请输入上期净重,"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="入库件数" prop="fQtyd">
         <el-input
           v-model="queryParams.fQtyd"
@@ -209,18 +173,11 @@
 
     <el-table v-loading="loading" :data="whgenlegList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="年" align="center" prop="fAccyear" />
-      <el-table-column label="年" align="center" prop="fId" />
-      <el-table-column label="月" align="center" prop="fAccmonth" />
-      <el-table-column label="客户id,t_corps 中的name" align="center" prop="fCorpid" />
+      <el-table-column label="客户" align="center" prop="fCorpid" />
       <el-table-column label="提单号" align="center" prop="fMblno" />
-      <el-table-column label="原始入库业务编号" align="center" prop="fOriginalbillno" />
-      <el-table-column label="库区,显示仓库 库位 库区" align="center" prop="fWarehouseLocationid" />
-      <el-table-column label="货物品名,t_goods 中的no或 name,模糊查找选择后,存储f_id,显示name" align="center" prop="fGoodsid" />
-      <el-table-column label="贸易方式,对应t_trademodels name" align="center" prop="fTrademodeid" />
-      <el-table-column label="上期件数" align="center" prop="fPreqty" />
-      <el-table-column label="上期毛重,单位为吨,保留6位小数" align="center" prop="fPregrossweight" />
-      <el-table-column label="上期净重," align="center" prop="fPrenetweight" />
+      <el-table-column label="库区" align="center" prop="fWarehouseLocationid" />
+      <el-table-column label="货物品名" align="center" prop="fGoodsid" />
+      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" />
       <el-table-column label="入库件数" align="center" prop="fQtyd" />
       <el-table-column label="入库尺码" align="center" prop="fVolumnd" />
       <el-table-column label="入库毛重" align="center" prop="fGrossweightd" />
@@ -228,12 +185,11 @@
       <el-table-column label="出口尺码" align="center" prop="fVolumnc" />
       <el-table-column label="出库件数" align="center" prop="fQtyc" />
       <el-table-column label="结余件数" align="center" prop="fQtyblc" />
-      <el-table-column label="出库毛重,单位为吨" align="center" prop="fGrossweightc" />
+      <el-table-column label="出库毛重" align="center" prop="fGrossweightc" />
       <el-table-column label="出库净重" align="center" prop="fNetweightc" />
       <el-table-column label="结余毛重" align="center" prop="fGrossweightblc" />
       <el-table-column label="结余净重" align="center" prop="fNetweightblc" />
       <el-table-column label="箱号" align="center" prop="fCntrno" />
-      <el-table-column label="状态,默认 T ,正常T 停用F 下拉选择" align="center" prop="fStatus" />
       <el-table-column label="唛头" align="center" prop="fMarks" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 4 - 6
src/views/warehouseBusiness/inStock/index.vue

@@ -84,7 +84,7 @@
       </el-form-item>
       <el-form-item label="仓库" prop="fwarehouseid">
         <el-input
-          v-model="queryParams.fwarehouseid"
+          v-model="queryParams.fWarehouseid"
           placeholder="请输入仓库"
           clearable
           size="small"
@@ -180,7 +180,6 @@
         :formatter="fTrademodeidFormat"
       />
       <el-table-column label="仓库" align="center" prop="fWarehouseid" />
-
       <el-table-column label="入库件数" align="center" prop="fQty" />
       <!--      <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
       <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
@@ -2045,10 +2044,9 @@ export default {
     getList() {
       this.loading = true;
       listWarehousebills(this.queryParams).then((response) => {
-        console.log(response)
-        this.warehousebillsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
+        this.warehousebillsList = response.rows
+        this.total = response.total
+        this.loading = false
       });
     },
     // 贸易方式(数据字典),对应t_trademodels 字典翻译