Browse Source

出入库统计、库容及财务模块修改

wengyuwen 4 năm trước cách đây
mục cha
commit
a10738af49

+ 53 - 0
src/api/reportManagement/Statistics.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询库存总账列表
+export function listWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/summary/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存总账详细
+export function getWhgenleg(fAccyear) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/' + fAccyear,
+    method: 'get'
+  })
+}
+
+// 新增库存总账
+export function addWhgenleg(data) {
+  return request({
+    url: '/warehouseBusiness/whgenleg',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存总账
+export function updateWhgenleg(data) {
+  return request({
+    url: '/warehouseBusiness/whgenleg',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存总账
+export function delWhgenleg(fAccyear) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/' + fAccyear,
+    method: 'delete'
+  })
+}
+
+// 导出库存总账
+export function exportWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/export',
+    method: 'get',
+    params: query
+  })
+}

+ 4 - 6
src/views/basicdata/warehouse/index.vue

@@ -146,7 +146,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="编号" prop="fNo">
-              <el-input v-model="form.fNo"  v-on:keyup="testFno" placeholder="请输入编号" />
+              <el-input v-model="form.fNo"  placeholder="请输入编号" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -163,7 +163,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="联系人" prop="fContacts">
-              <el-input v-model="form.fContacts"  v-on:keyup="testFno" placeholder="请输入联系人" />
+              <el-input v-model="form.fContacts" placeholder="请输入联系人" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -198,11 +198,9 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="库容" prop="fTotalgross">
-              <el-input v-model="form.fTotalgross" placeholder="请输入库容" />
+            <el-form-item label="库容(吨)" prop="fTotalgross" label-width="80">
+              <el-input v-model="form.fTotalgross" placeholder="请输入库容(吨位)" style="width:200px"/>
             </el-form-item>
-          </el-col>
         </el-row>
 
         <!--<el-form-item label="状态,默认 T ,正常T 停用F 下拉选择">

+ 2 - 1
src/views/finance/charge/index.vue

@@ -121,7 +121,8 @@
       <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
       <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
       <el-table-column label="应收合计" align="center" prop="fAmtdr" width="120"/>
-      <el-table-column label="应付合计" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="实收合计" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="未收金额" align="center" prop="" width="120"/>
       <el-table-column label="备注" align="center" prop="fRemarks" width="120"/>
       <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
         <template slot-scope="scope">

+ 5 - 5
src/views/finance/contrast/index.vue

@@ -137,8 +137,8 @@
         </template>
       </el-table-column>
       <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
-      <el-table-column label="应收金额" align="center" prop="fAmtdr" width="120"/>
-      <el-table-column label="应付金额" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
+      <el-table-column label="对账金额" align="center" prop="fAmtcr" width="120"/>
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
       <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" width="120"/>
       <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
@@ -1037,7 +1037,7 @@ export default {
         timeExamine:'',
         timeInterval:'',
         fSrcdc:'',
-        fReconciliation:'1',
+        fReconciliation:'0',
         timeReconci: '',
         fDc:'D'
       }
@@ -1165,7 +1165,7 @@ export default {
             timeExamine:'',
             timeInterval:'',
             fSrcdc:'',
-            fReconciliation:'1',
+            fReconciliation:'0',
             timeReconci: '',
             fDc:'D'
           }
@@ -1304,7 +1304,7 @@ export default {
         timeExamine:'',
         timeInterval:'',
         fSrcdc:'',
-        fReconciliation:'1'
+        fReconciliation:'0'
       }
     },
     //导入重置按钮

+ 3 - 2
src/views/finance/payment/index.vue

@@ -120,8 +120,9 @@
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
       <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
       <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
-      <el-table-column label="应收合计" align="center" prop="fAmtdr" width="120"/>
-      <el-table-column label="应付合计" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="应付合计" align="center" prop="fAmtdr" width="120"/>
+      <el-table-column label="实付合计" align="center" prop="fAmtcr" width="120"/>
+      <el-table-column label="未付金额" align="center" prop="" width="120"/>
       <el-table-column label="备注" align="center" prop="fRemarks" width="120"/>
       <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
         <template slot-scope="scope">

+ 546 - 0
src/views/reportManagement/Statistics/index.vue

@@ -0,0 +1,546 @@
+<template>
+  <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>
+      </el-form-item>
+      <el-form-item label="货物名称" prop="fgoodsid">
+        <el-select
+          v-model="queryParams.fGoodsid"
+          filterable
+          remote
+          clearable
+          size="small"
+          :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="createTime">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          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
+          size="small"
+          @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
+          size="small"
+          @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
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="箱号" prop="fCntrno">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.fCntrno"-->
+<!--          placeholder="请输入箱号"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="出库/入库" prop="fBilltype" label-width="80">
+        <el-select
+          v-model="queryParams.fBilltype"
+          placeholder="请选择出库/入库"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="(dict,index) in options"
+            :key="index.key"
+            :label="dict.name"
+            :value="dict.key"/>
+
+        </el-select>
+      </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>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['warehouseBusiness:whgenleg:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="whgenlegList">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column type="index" label="行号" align="center" width="120"/>
+      <el-table-column label="客户" align="center" prop="fName" show-overflow-tooltip width="120"/>
+      <el-table-column label="入库日期" align="center" prop="fBsdate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="120"/>
+      <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
+        label="贸易方式"
+        align="center"
+        prop="fTrademodeid"
+        :formatter="fTrademodeidFormat"
+        width="120"
+      />
+      <el-table-column label="件数" align="center" prop="fQty" width="120"/>
+      <el-table-column label="毛重" align="center" prop="fGrossweight" width="120"/>
+      <el-table-column label="净重" align="center" prop="fNetweight" width="120"/>
+
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJRK'" label="入库件数" align="center" prop="fQty" width="120"/>-->
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJCK'" label="出库件数" align="center" prop="fQty" width="120"/>-->
+<!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJRK'" label="入库毛重" align="center" prop="fGrossweight" width="120"/>-->
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJCK'" label="出库毛重" align="center" prop="fGrossweight" width="120"/>-->
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJRK'" label="入库净重" align="center" prop="fNetweight" width="120"/>-->
+<!--      <el-table-column v-if="queryParams.fBilltype === 'SJCK'" label="出库净重" align="center" prop="fNetweight" width="120"/>-->
+<!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
+<!--      <el-table-column label="出库件数" align="center" prop="fQtyC" width="120"/>-->
+<!--      <el-table-column label="出库毛重" align="center" prop="fGrossweightC" width="120"/>-->
+<!--      <el-table-column label="出库净重" align="center" prop="fNetweightC" width="120"/>-->
+<!--      <el-table-column label="结余件数" align="center" prop="fQtyblc" width="120"/>-->
+<!--      <el-table-column label="结余毛重" align="center" prop="fGrossweightblc" width="120"/>-->
+<!--      <el-table-column label="结余净重" align="center" prop="fNetweightblc" width="120"/>-->
+<!--      <el-table-column label="箱号" align="center" prop="fCntrno" width="120"/>-->
+<!--      <el-table-column label="备注" align="center" prop="remark" width="120"/>-->
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouseBusiness:whgenleg:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['warehouseBusiness:whgenleg:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改库存总账对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原始入库业务编号" prop="fOriginalbillno">
+          <el-input v-model="form.fOriginalbillno" placeholder="请输入原始入库业务编号" />
+        </el-form-item>
+        <el-form-item label="上期件数" prop="fPreqty">
+          <el-input v-model="form.fPreqty" placeholder="请输入上期件数" />
+        </el-form-item>
+        <el-form-item label="上期毛重,单位为吨,保留6位小数" prop="fPregrossweight">
+          <el-input v-model="form.fPregrossweight" placeholder="请输入上期毛重,单位为吨,保留6位小数" />
+        </el-form-item>
+        <el-form-item label="上期净重," prop="fPrenetweight">
+          <el-input v-model="form.fPrenetweight" placeholder="请输入上期净重," />
+        </el-form-item>
+        <el-form-item label="入库件数" prop="fQtyd">
+          <el-input v-model="form.fQtyd" placeholder="请输入入库件数" />
+        </el-form-item>
+        <el-form-item label="入库尺码" prop="fVolumnd">
+          <el-input v-model="form.fVolumnd" placeholder="请输入入库尺码" />
+        </el-form-item>
+        <el-form-item label="入库毛重" prop="fGrossweightd">
+          <el-input v-model="form.fGrossweightd" placeholder="请输入入库毛重" />
+        </el-form-item>
+        <el-form-item label="入库净重" prop="fNetweightd">
+          <el-input v-model="form.fNetweightd" placeholder="请输入入库净重" />
+        </el-form-item>
+        <el-form-item label="出口尺码" prop="fVolumnc">
+          <el-input v-model="form.fVolumnc" placeholder="请输入出口尺码" />
+        </el-form-item>
+        <el-form-item label="出库件数" prop="fQtyc">
+          <el-input v-model="form.fQtyc" placeholder="请输入出库件数" />
+        </el-form-item>
+        <el-form-item label="结余件数" prop="fQtyblc">
+          <el-input v-model="form.fQtyblc" placeholder="请输入结余件数" />
+        </el-form-item>
+        <el-form-item label="出库毛重,单位为吨" prop="fGrossweightc">
+          <el-input v-model="form.fGrossweightc" placeholder="请输入出库毛重,单位为吨" />
+        </el-form-item>
+        <el-form-item label="出库净重" prop="fNetweightc">
+          <el-input v-model="form.fNetweightc" placeholder="请输入出库净重" />
+        </el-form-item>
+        <el-form-item label="结余毛重" prop="fGrossweightblc">
+          <el-input v-model="form.fGrossweightblc" placeholder="请输入结余毛重" />
+        </el-form-item>
+        <el-form-item label="结余净重" prop="fNetweightblc">
+          <el-input v-model="form.fNetweightblc" placeholder="请输入结余净重" />
+        </el-form-item>
+        <el-form-item label="箱号" prop="fCntrno">
+          <el-input v-model="form.fCntrno" placeholder="请输入箱号" />
+        </el-form-item>
+        <el-form-item label="状态,默认 T ,正常T 停用F 下拉选择">
+          <el-radio-group v-model="form.fStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="唛头" prop="fMarks">
+          <el-input v-model="form.fMarks" placeholder="请输入唛头" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/Statistics";
+import {listWarehouse} from "@/api/basicdata/warehouse";
+import {listArea} from "@/api/basicdata/area";
+import {listGoods} from "@/api/basicdata/goods";
+import {listCorps} from "@/api/basicdata/corps";
+
+export default {
+  name: "Whgenleg",
+  components: {
+  },
+  data() {
+    return {
+      options:[{
+        name:'出库',
+        key:'SJCK'
+      },{
+        name:'入库',
+        key:'SJRK'
+      }],
+      // 货权方(客户数据)
+      fMblnoOptions: [],
+      // 贸易方式(数据字典),对应t_trademodels 字典
+      fTrademodeidOptions: [],
+      // 货物
+      goodsOptions: [],
+      // 仓库(仓库数据)
+      warehouseOptions: [],
+      kqhouseOptions: [],
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库存总账表格数据
+      whgenlegList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fOriginalbillno: null,
+        fPreqty: null,
+        fPregrossweight: null,
+        fPrenetweight: null,
+        fQtyd: null,
+        fVolumnd: null,
+        fGrossweightd: null,
+        fNetweightd: null,
+        fVolumnc: null,
+        fQtyc: null,
+        fQtyblc: null,
+        fGrossweightc: null,
+        fNetweightc: null,
+        fGrossweightblc: null,
+        fNetweightblc: null,
+        fCntrno: null,
+        fStatus: null,
+        fMarks: null,
+        fBusinessType:null,
+        fBusinessTypes:null,
+        fBilltype:null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fMarks: [
+          { required: true, message: "唛头不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("data_trademodes").then((response) => {
+      this.fTrademodeidOptions = response.data;
+    });
+  },
+  methods: {
+    // 贸易方式(数据字典),对���t_trademodels 字典翻译
+    fTrademodeidFormat(row, column) {
+      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
+    },
+    /* 远程模糊查询仓库 */
+    warehouseRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listWarehouse(queryParams).then((response) => {
+        this.warehouseOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询库区 */
+    kqhouseRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      if (!this.queryParams.fWarehouseid) {
+        this.$message.error("请输入仓库!");
+        return false;
+      }
+
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseid: this.queryParams.fWarehouseid,
+        fName: name,
+      };
+      listArea(queryParams).then((response) => {
+        this.kqhouseOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询商品 */
+    goodsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listGoods(queryParams).then((response) => {
+        this.goodsOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listCorps(queryParams).then((response) => {
+        this.fMblnoOptions = response.rows;
+        this.KHblnoOptions = response.rows;
+      });
+    },
+    /** 查询库存总账列表 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams)
+      listWhgenleg(this.queryParams).then(response => {
+        console.log(response)
+        this.whgenlegList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fAccyear: null,
+        fId: null,
+        fAccmonth: null,
+        fCorpid: null,
+        fMblno: null,
+        fOriginalbillno: null,
+        fWarehouseLocationid: null,
+        fGoodsid: null,
+        fTrademodeid: null,
+        fPreqty: null,
+        fPregrossweight: null,
+        fPrenetweight: null,
+        fQtyd: null,
+        fVolumnd: null,
+        fGrossweightd: null,
+        fNetweightd: null,
+        fVolumnc: null,
+        fQtyc: null,
+        fQtyblc: null,
+        fGrossweightc: null,
+        fNetweightc: null,
+        fGrossweightblc: null,
+        fNetweightblc: null,
+        fCntrno: null,
+        fStatus: "0",
+        delFlag: null,
+        createBy: null,
+        fMarks: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加库存总账";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fAccyear != null) {
+            updateWhgenleg(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWhgenleg(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWhgenleg(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 1 - 1
src/views/reportManagement/generalLedgerCr/index.vue

@@ -147,7 +147,7 @@
       </el-table-column>
       <el-table-column label="应付金额" align="center" prop="fAmount" />
       <el-table-column label="实付金额" align="center" prop="fStlamount" />
-
+      <el-table-column label="未付金额" align="center" prop="" />
 
     </el-table>
 

+ 1 - 0
src/views/reportManagement/generalLedgerDr/index.vue

@@ -147,6 +147,7 @@
       </el-table-column>
       <el-table-column label="应收金额" align="center" prop="fAmount" />
       <el-table-column label="实收金额" align="center" prop="fStlamount"/>
+      <el-table-column label="未收金额" align="center" prop=""/>
 
 
     </el-table>

+ 1 - 0
src/views/system/auditConfiguration/index.vue

@@ -22,6 +22,7 @@
       </el-form-item>
     </el-form>
     <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%;">
+      <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column
         prop="branName"
         header-align="center"

+ 1 - 1
src/views/system/notice/index.vue

@@ -126,7 +126,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" close-on-click-modal="false" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

+ 2 - 2
src/views/warehouseBusiness/outStock/index.vue

@@ -3829,10 +3829,10 @@ export default {
           } else if (!this.dataListSelection[warehouseCr].fQty || this.dataListSelection[warehouseCr].fQty === 0) {
               this.$message.error('请维护出库件数')
               return false
-          } else if (!this.dataListSelection[li].fGrossweight || this.dataListSelection[li].fGrossweight === 0) {
+          } else if (!this.dataListSelection[warehouseCr].fGrossweight || this.dataListSelection[warehouseCr].fGrossweight === 0) {
             this.$message.error('请维护出库毛重')
             return false
-          } else if (!this.dataListSelection[li].fNetweight || this.dataListSelection[li].fNetweight === 0) {
+          } else if (!this.dataListSelection[warehouseCr].fNetweight || this.dataListSelection[warehouseCr].fNetweight === 0) {
             this.$message.error('请维护出库净重')
             return false
           } else if (!this.dataListSelection[warehouseCr].fBusinessType) {