fix

src/api/kaihe-reportManagement/generalLedgerCr.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+export function getList(query) {
+  return request({
+    url: '/shipping/handle/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getExcel() {
+  return request({
+    url: '/shipping/handle/export',
+    method:'get'
+  })
+}

src/api/kaihe-reportManagement/generalLedgerDr.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+export function getList(query) {
+  return request({
+    url: '/shipping/receivable/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getExcel() {
+  return request({
+    url: '/shipping/receivable/export',
+    method:'get'
+  })
+}

src/api/kaihe-reportManagement/profitGeneralLedger.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+export function getList(query) {
+  return request({
+    url: '/shipping/profit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getExcel() {
+  return request({
+    url: '/shipping/profit/export',
+    method:'get'
+  })
+}

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -70,7 +70,7 @@
               <el-scrollbar>
                 <el-option
                     v-for="(dict, index) in fMblnoOptions"
-                    :key="dict.fId"
+                    :key="index"
                     :label="dict.fName"
                     :value="dict.fId"
                 ></el-option>
@@ -93,7 +93,7 @@
               <el-scrollbar>
                 <el-option
                     v-for="(dict, index) in fMblnoOptions"
-                    :key="dict.fId"
+                    :key="index"
                     :label="dict.fName"
                     :value="dict.fId"
                 ></el-option>

src/views/reportManagement/generalLedgerCr/index.vue

@@ -1,254 +1,264 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <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="fToCorpid">
-        <el-select
-          v-model="queryParams.fToCorpid"
-          placeholder="请选择结算单位"
-          filterable
-          remote
-          clearable
-          style="width: 200px"
-          @keyup.enter.native="handleQuery"
-          :remote-method="corpsRemoteMethod"
-        >
-          <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="fProductName">
-        <el-select
-          v-model="queryParams.fProductName"
-          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.fName"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="品牌" prop="fMarks">
-        <el-input
-          v-model="queryParams.fMarks"
-          placeholder="请输入品牌"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="结算状态" prop="fReconciliation">
-        <el-select
-          v-model="queryParams.fReconciliation"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option label="未收" value="0" />
-          <el-option label="全部" value="1" />
-        </el-select>
-      </el-form-item>
+    <div v-if="login == 3">
+      <kaihe-generalLedgerCr />
+    </div>
+    <div v-else>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <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="fBillstatus">
-        <el-select
-          v-model="queryParams.fBillstatus"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option label="录入" value="0" />
-          <el-option label="审核通过" value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审核日期" prop="timeExamine">
-        <el-date-picker
-          v-model="queryParams.timeExamine"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-          :picker-options="pickerOptions"
-          unlink-panels
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审核状态">
-        <el-select
-          v-model="queryParams.warehouseStatus"
-          placeholder="请选择状态"
-          clearable
-          size="small"
-          filterable
-        >
-          <el-option label="全部" :value="1"></el-option>
-          <el-option label="待审" :value="5"></el-option>
-          <el-option label="审核通过" :value="6"></el-option>
-        </el-select>
-      </el-form-item>
+        <el-form-item label="结算单位" prop="fToCorpid">
+          <el-select
+            v-model="queryParams.fToCorpid"
+            placeholder="请选择结算单位"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+          >
+            <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="fProductName">
+          <el-select
+            v-model="queryParams.fProductName"
+            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.fName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="品牌" prop="fMarks">
+          <el-input
+            v-model="queryParams.fMarks"
+            placeholder="请输入品牌"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="结算状态" prop="fReconciliation">
+          <el-select
+            v-model="queryParams.fReconciliation"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option label="未收" value="0" />
+            <el-option label="全部" value="1" />
+          </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-form-item label="费用状态" prop="fBillstatus">
+          <el-select
+            v-model="queryParams.fBillstatus"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option label="录入" value="0" />
+            <el-option label="审核通过" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核日期" prop="timeExamine">
+          <el-date-picker
+            v-model="queryParams.timeExamine"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            clearable
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @keyup.enter.native="handleQuery"
+            :picker-options="pickerOptions"
+            unlink-panels
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <el-select
+            v-model="queryParams.warehouseStatus"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+            filterable
+          >
+            <el-option label="全部" :value="1"></el-option>
+            <el-option label="待审" :value="5"></el-option>
+            <el-option label="审核通过" :value="6"></el-option>
+          </el-select>
+        </el-form-item>
 
-    <el-row :gutter="10" class="mb8">
-      <div class="tabSetting">
-        <el-col :span="1.5">
+        <el-form-item>
           <el-button
-            type="warning"
-            icon="el-icon-download"
+            type="cyan"
+            icon="el-icon-search"
             size="mini"
-            @click="handleExport"
-            v-hasPermi="['warehouseBusiness:payable:export']"
-            >导出</el-button
+            @click="handleQuery"
+            >搜索</el-button
           >
-        </el-col>
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-        <div style="margin: 0 12px">
-          <el-button
-            icon="el-icon-setting"
-            size="mini"
-            circle
-            @click="showSetting = !showSetting"
-          ></el-button>
-        </div>
-      </div>
-    </el-row>
-    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
-      <div>配置排序列数据（拖动调整顺序）</div>
-      <div style="margin-left: 17px">
-        <el-checkbox
-          v-model="allCheck"
-          label="全选"
-          @change="allChecked"
-        ></el-checkbox>
-      </div>
-      <div style="padding: 4px; display: flex; justify-content: center">
-        <draggable
-          v-model="setRowList"
-          group="site"
-          animation="300"
-          @start="onStart"
-          @end="onEnd"
-          handle=".indraggable"
-        >
-          <transition-group>
-            <div
-              v-for="item in setRowList"
-              :key="item.surface"
-              class="listStyle"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-row :gutter="10" class="mb8">
+        <div class="tabSetting">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['warehouseBusiness:payable:export']"
+              >导出</el-button
             >
-              <div style="width: 500px" class="indraggable">
-                <div class="progress" :style="{ width: item.width + 'px' }">
-                  <el-checkbox
-                    :label="item.name"
-                    v-model="item.checked"
-                    :true-label="0"
-                    :false-label="1"
-                    >{{ item.name }}
-                  </el-checkbox>
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+          <div style="margin: 0 12px">
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting = !showSetting"
+            ></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+        <div>配置排序列数据（拖动调整顺序）</div>
+        <div style="margin-left: 17px">
+          <el-checkbox
+            v-model="allCheck"
+            label="全选"
+            @change="allChecked"
+          ></el-checkbox>
+        </div>
+        <div style="padding: 4px; display: flex; justify-content: center">
+          <draggable
+            v-model="setRowList"
+            group="site"
+            animation="300"
+            @start="onStart"
+            @end="onEnd"
+            handle=".indraggable"
+          >
+            <transition-group>
+              <div
+                v-for="item in setRowList"
+                :key="item.surface"
+                class="listStyle"
+              >
+                <div style="width: 500px" class="indraggable">
+                  <div class="progress" :style="{ width: item.width + 'px' }">
+                    <el-checkbox
+                      :label="item.name"
+                      v-model="item.checked"
+                      :true-label="0"
+                      :false-label="1"
+                      >{{ item.name }}
+                    </el-checkbox>
+                  </div>
                 </div>
+                <el-input-number
+                  v-model.number="item.width"
+                  controls-position="right"
+                  :min="1"
+                  :max="500"
+                  size="mini"
+                ></el-input-number>
               </div>
-              <el-input-number
-                v-model.number="item.width"
-                controls-position="right"
-                :min="1"
-                :max="500"
-                size="mini"
-              ></el-input-number>
-            </div>
-          </transition-group>
-        </draggable>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="showSetting = false">取 消</el-button>
-        <el-button @click="delRow" type="danger">重 置</el-button>
-        <el-button type="primary" @click="save()">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-table
-      v-loading="loading"
-      :data="payableList"
-      show-summary
-      :summary-method="getSum"
-      ref="table"
-      :height="tableHeight"
-    >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column type="index" label="行号" align="center" width="80" fixed=""/>
-      <el-table-column
-        v-for="(item, index) in getRowList"
-        :key="index"
-        :label="item.name"
-        :width="item.width"
-        :prop="item.label"
-        align="center"
-        :show-overflow-tooltip="true"
-        sortable
-        :fixed="item.fixed"
-      />
-      <!-- <el-table-column
+            </transition-group>
+          </draggable>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting = false">取 消</el-button>
+          <el-button @click="delRow" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save()">确 定</el-button>
+        </span>
+      </el-dialog>
+      <el-table
+        v-loading="loading"
+        :data="payableList"
+        show-summary
+        :summary-method="getSum"
+        ref="table"
+        :height="tableHeight"
+      >
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table-column
+          type="index"
+          label="行号"
+          align="center"
+          width="80"
+          fixed=""
+        />
+        <el-table-column
+          v-for="(item, index) in getRowList"
+          :key="index"
+          :label="item.name"
+          :width="item.width"
+          :prop="item.label"
+          align="center"
+          :show-overflow-tooltip="true"
+          sortable
+          :fixed="item.fixed"
+        />
+        <!-- <el-table-column
         label="货权方"
         sortable
         align="center"
@@ -290,88 +300,89 @@
       <el-table-column label="应付金额" align="center" prop="fAmount" />
       <el-table-column label="实付金额" align="center" prop="fStlamount" />
       <el-table-column label="未付金额" align="center" prop="nnfinished" /> -->
-    </el-table>
+      </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[50, 100, 200, 500, 1000]"
-      @pagination="getList"
-    />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        :page-sizes="[50, 100, 200, 500, 1000]"
+        @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>-->
+      <!-- 添加或修改库存总账对话框 -->
+      <!--    <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>
   </div>
 </template>
 
@@ -389,40 +400,45 @@ import { listCorps } from "@/api/basicdata/corps";
 import { addSet, select, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
-
+import kaiheGeneralLedgerCr from "../kaihe-generalLedgerCr/index.vue";
 export default {
   name: "generalLedgerCr",
-  components: {},
+  components: {kaiheGeneralLedgerCr},
   data() {
     return {
+      login: Cookies.get("sysType"),
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
-      tableHeight: '0',
+      tableHeight: "0",
       payableList: [],
       // 货权方(客户数据)
       fMblnoOptions: [],
@@ -469,7 +485,7 @@ export default {
       setRowList: [],
       getRowList: [],
       tableDate: [
-  {
+        {
           surface: "1",
           label: "fName",
           name: "货权方",
@@ -531,7 +547,7 @@ export default {
           name: "未付金额",
           checked: 0,
           width: 130,
-        }
+        },
       ],
       allCheck: false,
     };
@@ -563,9 +579,10 @@ export default {
     this.$nextTick(() => {
       // 监听浏览器高度变化，改变表格高度
       window.onresize = () => {
-        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
-      }
-    })
+        this.tableHeight =
+          window.innerHeight - this.$refs.table.$el.offsetTop - 70;
+      };
+    });
   },
   methods: {
     //列设置全选
@@ -731,8 +748,9 @@ export default {
         this.loading = false;
         // 根据浏览器高度设置初始高度
         setTimeout(() => {
-          this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
-        }, 300)
+          this.tableHeight =
+            window.innerHeight - this.$refs.table.$el.offsetTop - 70;
+        }, 300);
       });
     },
     // 取消按钮
@@ -786,7 +804,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       // this.resetForm("queryForm");
-      this.resetQueryParams()
+      this.resetQueryParams();
       this.handleQuery();
     },
     // 搜索重置
@@ -802,7 +820,7 @@ export default {
         fMarks: null,
         fReconciliation: null,
         fBillstatus: null,
-      }
+      };
     },
     /** 新增按钮操作 */
     handleAdd() {

src/views/reportManagement/generalLedgerDr/index.vue

@@ -1,261 +1,265 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <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="fToCorpid">
-        <el-select
-          v-model="queryParams.fToCorpid"
-          placeholder="请选择结算单位"
-          filterable
-          remote
-          clearable
-          style="width: 200px"
-          @keyup.enter.native="handleQuery"
-          :remote-method="corpsRemoteMethod"
-        >
-          <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="fProductName">
-        <el-select
-          v-model="queryParams.fProductName"
-          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.fName"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="品牌" prop="fMarks">
-        <el-input
-          v-model="queryParams.fMarks"
-          placeholder="请输入品牌"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="结算状态" prop="fReconciliation">
-        <el-select
-          v-model="queryParams.fReconciliation"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option label="未收" value="0" />
-          <el-option label="全部" value="1" />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="费用状态" prop="fBillstatus">
-        <el-select
-          v-model="queryParams.fBillstatus"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option label="录入" value="0" />
-          <el-option label="审核通过" value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审核日期" prop="timeExamine">
-        <el-date-picker
-          v-model="queryParams.timeExamine"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-          :picker-options="pickerOptions"
-          unlink-panels
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审核状态">
-        <el-select
-          v-model="queryParams.warehouseStatus"
-          placeholder="请选择状态"
-          clearable
-          size="small"
-          filterable
-        >
-          <el-option label="全部" :value="1"></el-option>
-          <el-option label="待审" :value="5"></el-option>
-          <el-option label="审核通过" :value="6"></el-option>
-        </el-select>
-      </el-form-item>
+    <div v-if="login == 3">
+      <kaihe-generalLedgerDr />
+    </div>
+    <div v-else>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <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="fToCorpid">
+          <el-select
+            v-model="queryParams.fToCorpid"
+            placeholder="请选择结算单位"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+          >
+            <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="fProductName">
+          <el-select
+            v-model="queryParams.fProductName"
+            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.fName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="品牌" prop="fMarks">
+          <el-input
+            v-model="queryParams.fMarks"
+            placeholder="请输入品牌"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="结算状态" prop="fReconciliation">
+          <el-select
+            v-model="queryParams.fReconciliation"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option label="未收" value="0" />
+            <el-option label="全部" value="1" />
+          </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-form-item label="费用状态" prop="fBillstatus">
+          <el-select
+            v-model="queryParams.fBillstatus"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option label="录入" value="0" />
+            <el-option label="审核通过" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核日期" prop="timeExamine">
+          <el-date-picker
+            v-model="queryParams.timeExamine"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            clearable
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @keyup.enter.native="handleQuery"
+            :picker-options="pickerOptions"
+            unlink-panels
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <el-select
+            v-model="queryParams.warehouseStatus"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+            filterable
+          >
+            <el-option label="全部" :value="1"></el-option>
+            <el-option label="待审" :value="5"></el-option>
+            <el-option label="审核通过" :value="6"></el-option>
+          </el-select>
+        </el-form-item>
 
-    <el-row :gutter="10" class="mb8">
-      <div class="tabSetting">
-        <el-col :span="1.5">
+        <el-form-item>
           <el-button
-            type="warning"
-            icon="el-icon-download"
+            type="cyan"
+            icon="el-icon-search"
             size="mini"
-            @click="handleExport"
-            v-hasPermi="['warehouseBusiness:receivable:export']"
-            >导出</el-button
+            @click="handleQuery"
+            >搜索</el-button
           >
-        </el-col>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
 
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-        <div style="margin: 0 12px">
-          <el-button
-            icon="el-icon-setting"
-            size="mini"
-            circle
-            @click="showSetting = !showSetting"
-          ></el-button>
+      <el-row :gutter="10" class="mb8">
+        <div class="tabSetting">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['warehouseBusiness:receivable:export']"
+              >导出</el-button
+            >
+          </el-col>
+
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+          <div style="margin: 0 12px">
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting = !showSetting"
+            ></el-button>
+          </div>
         </div>
-      </div>
-    </el-row>
+      </el-row>
 
-    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
-      <div>配置排序列数据（拖动调整顺序）</div>
-      <div style="margin-left: 17px">
-        <el-checkbox
-          v-model="allCheck"
-          label="全选"
-          @change="allChecked"
-        ></el-checkbox>
-      </div>
-      <div style="padding: 4px; display: flex; justify-content: center">
-        <draggable
-          v-model="setRowList"
-          group="site"
-          animation="300"
-          @start="onStart"
-          @end="onEnd"
-          handle=".indraggable"
-        >
-          <transition-group>
-            <div
-              v-for="item in setRowList"
-              :key="item.surface"
-              class="listStyle"
-            >
-              <div style="width: 500px" class="indraggable">
-                <div class="progress" :style="{ width: item.width + 'px' }">
-                  <el-checkbox
-                    :label="item.name"
-                    v-model="item.checked"
-                    :true-label="0"
-                    :false-label="1"
-                    >{{ item.name }}
-                  </el-checkbox>
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+        <div>配置排序列数据（拖动调整顺序）</div>
+        <div style="margin-left: 17px">
+          <el-checkbox
+            v-model="allCheck"
+            label="全选"
+            @change="allChecked"
+          ></el-checkbox>
+        </div>
+        <div style="padding: 4px; display: flex; justify-content: center">
+          <draggable
+            v-model="setRowList"
+            group="site"
+            animation="300"
+            @start="onStart"
+            @end="onEnd"
+            handle=".indraggable"
+          >
+            <transition-group>
+              <div
+                v-for="item in setRowList"
+                :key="item.surface"
+                class="listStyle"
+              >
+                <div style="width: 500px" class="indraggable">
+                  <div class="progress" :style="{ width: item.width + 'px' }">
+                    <el-checkbox
+                      :label="item.name"
+                      v-model="item.checked"
+                      :true-label="0"
+                      :false-label="1"
+                      >{{ item.name }}
+                    </el-checkbox>
+                  </div>
                 </div>
+                <el-input-number
+                  v-model.number="item.width"
+                  controls-position="right"
+                  :min="1"
+                  :max="500"
+                  size="mini"
+                ></el-input-number>
               </div>
-              <el-input-number
-                v-model.number="item.width"
-                controls-position="right"
-                :min="1"
-                :max="500"
-                size="mini"
-              ></el-input-number>
-            </div>
-          </transition-group>
-        </draggable>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="showSetting = false">取 消</el-button>
-        <el-button @click="delRow" type="danger">重 置</el-button>
-        <el-button type="primary" @click="save()">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-table
-      v-loading="loading"
-      :data="receivableList"
-      show-summary
-      :summary-method="getSum"
-      ref="table"
-      :height="tableHeight"
-    >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column
-        type="index"
-        label="行号"
-        align="center"
-        width="80"
-        fixed
-      />
-      <el-table-column
-        v-for="(item, index) in getRowList"
-        :key="index"
-        :label="item.name"
-        :width="item.width"
-        :prop="item.label"
-        align="center"
-        :show-overflow-tooltip="true"
-        sortable
-        :fixed="item.fixed"
-      />
-      <!-- <el-table-column
+            </transition-group>
+          </draggable>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting = false">取 消</el-button>
+          <el-button @click="delRow" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save()">确 定</el-button>
+        </span>
+      </el-dialog>
+      <el-table
+        v-loading="loading"
+        :data="receivableList"
+        show-summary
+        :summary-method="getSum"
+        ref="table"
+        :height="tableHeight"
+      >
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table-column
+          type="index"
+          label="行号"
+          align="center"
+          width="80"
+          fixed
+        />
+        <el-table-column
+          v-for="(item, index) in getRowList"
+          :key="index"
+          :label="item.name"
+          :width="item.width"
+          :prop="item.label"
+          align="center"
+          :show-overflow-tooltip="true"
+          sortable
+          :fixed="item.fixed"
+        />
+        <!-- <el-table-column
         label="货权方"
         sortable
         align="center"
@@ -292,16 +296,17 @@
       <el-table-column label="应收金额" align="center" prop="fAmount" />
       <el-table-column label="实收金额" align="center" prop="fStlamount" />
       <el-table-column label="未收金额" align="center" prop="nnfinished" /> -->
-    </el-table>
+      </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[50, 100, 200, 500, 1000]"
-      @pagination="getList"
-    />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        :page-sizes="[50, 100, 200, 500, 1000]"
+        @pagination="getList"
+      />
+    </div>
 
     <!-- 添加或修改库存总账对话框 -->
     <!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
@@ -393,40 +398,48 @@ import { listCorps } from "@/api/basicdata/corps";
 import { addSet, select, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
-
+import kaiheGeneralLedgerDr from "../kaihe-generalLedgerDr/index.vue";
 export default {
   name: "generalLedgerDr",
-  components: { draggable },
+  components: {
+    draggable,
+    kaiheGeneralLedgerDr,
+  },
   data() {
     return {
+      login: Cookies.get("sysType"),
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
-      tableHeight: '0',
+      tableHeight: "0",
       // 货权方(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
@@ -566,9 +579,10 @@ export default {
     this.$nextTick(() => {
       // 监听浏览器高度变化，改变表格高度
       window.onresize = () => {
-        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
-      }
-    })
+        this.tableHeight =
+          window.innerHeight - this.$refs.table.$el.offsetTop - 70;
+      };
+    });
   },
   methods: {
     //列设置全选
@@ -734,8 +748,9 @@ export default {
         this.loading = false;
         // 根据浏览器高度设置初始高度
         setTimeout(() => {
-          this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
-        }, 300)
+          this.tableHeight =
+            window.innerHeight - this.$refs.table.$el.offsetTop - 70;
+        }, 300);
       });
     },
     // 取消按钮
@@ -805,7 +820,7 @@ export default {
         fMarks: null,
         fReconciliation: null,
         fBillstatus: null,
-      }
+      };
     },
     /** 新增按钮操作 */
     handleAdd() {

src/views/reportManagement/kaihe-generalLedgerCr/index.vue

@@ -0,0 +1,410 @@
+<template>
+  <div>
+    <!-- 列表页 -->
+    <el-form ref="form" :model="form" label-width="80px" v-show="showSearch">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="结算单位">
+            <el-select
+              v-model="form.fCorpid"
+              size="small"
+              placeholder="请选择"
+              clearable
+              style="width: 100%"
+              filterable
+            >
+              <el-option
+                v-for="item in corpList"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="船名">
+            <el-select
+              v-model="form.fVslid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVesselfs"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="航次">
+            <el-select
+              v-model="form.fVoyid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVoyagefs"
+                :key="item.fId"
+                :label="item.fNo"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="提单号">
+            <el-input
+              v-model="form.fMblno"
+              size="small"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-collapse-transition>
+        <div v-if="show">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="起运港">
+                <el-select
+                  v-model="form.fLoadportid"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in portNames"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="目的港">
+                <el-select
+                  v-model="form.fDestportid"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in portNames"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开船日期">
+                <el-date-picker
+                  v-model="form.timeInterval"
+                  type="daterange"
+                  size="small"
+                  placeholder="请选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="审核日期">
+                <el-date-picker
+                  v-model="form.timeExamine"
+                  type="daterange"
+                  size="small"
+                  placeholder="请选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="费用状态">
+                <el-select
+                  v-model="form.fBillstatus"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in fBillstatusList"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-collapse-transition>
+    </el-form>
+    <div class="head-but">
+      <div>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >
+          导出
+        </el-button>
+      </div>
+      <div class="tabSetting">
+        <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-button
+          v-show="show"
+          @click="show = !show"
+          icon="el-icon-arrow-up"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <el-button
+          v-show="!show"
+          @click="show = !show"
+          icon="el-icon-arrow-down"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <right-toolbar
+          style="margin-left: 12px"
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="colSetting"
+          ></el-button>
+        </div>
+      </div>
+    </div>
+    <el-table :data="tableData" show-summary :summary-method="getSummaries">
+      <el-table-column label="序号" type="index" width="50" />
+      <el-table-column
+        v-for="(item, index) in tableOption"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+    <pagination
+      v-show="page.total > 0"
+      :total="page.total"
+      :page.sync="page.pageNum"
+      :limit.sync="page.pageSize"
+      @pagination="getList"
+    />
+    <column-setting
+      ref="columnSetting"
+      @reset="reset"
+      @getRowdata="getRowdata"
+      tableName="凯和应付总账"
+    />
+  </div>
+</template>
+
+<script>
+import { tableOption } from "./js/index";
+import {
+  selectTVesself,
+  selectTVoyagef,
+  selectPortName,
+  listCorps,
+} from "@/api/finance/kaihe/contrast";
+import {
+  getList,
+  getExcel,
+} from "@/api/kaihe-reportManagement/generalLedgerCr";
+import columnSetting from "@/components/ColumnSetting/index";
+export default {
+  data() {
+    return {
+      form: {},
+      show: false,
+      tableData: [],
+      tableOption: tableOption,
+      page: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      TVesselfs: [],
+      TVoyagefs: [],
+      portNames: [],
+      corpList: [],
+      showSearch: true,
+      fBillstatusList: [
+        {
+          fId: 0,
+          fName: "全部",
+        },
+        {
+          fId: 1,
+          fName: "未审核",
+        },
+        {
+          fId: 2,
+          fName: "审核通过",
+        },
+      ],
+    };
+  },
+  components: {
+    columnSetting,
+  },
+  created() {
+    this.getList();
+    selectTVesself().then((res) => {
+      this.TVesselfs = res.rows;
+    });
+    selectTVoyagef().then((res) => {
+      this.TVoyagefs = res.rows;
+    });
+    selectPortName().then((res) => {
+      this.portNames = res.rows;
+    });
+    listCorps().then((res) => {
+      this.corpList = res;
+    });
+  },
+  activated() {
+    this.$refs.columnSetting.getRow(this.tableOption);
+  },
+  methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm("是否确认导出所有应付总账主数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return getExcel();
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    getRowdata(list) {
+      this.tableOption = list;
+    },
+    reset() {
+      this.tableOption = this.$options.data().tableOption;
+    },
+    colSetting() {
+      this.$refs.columnSetting.init(this.tableOption);
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      if (data.length > 0) {
+        columns.forEach((column, index) => {
+          if (index == 0) {
+            sums[index] = "合计";
+          }
+          if (
+            column.label == "应付金额" ||
+            column.label == "实付金额" ||
+            column.label == "未付金额"
+          ) {
+            const values = data.map((item) => Number(item[column.property]));
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] =
+                Number(
+                  values.reduce((prev, curr) => {
+                    const value = Number(curr);
+                    if (!isNaN(value)) {
+                      return prev + curr;
+                    } else {
+                      return prev;
+                    }
+                  }, 0) / 10000
+                ).toFixed(2) + "万";
+            } else {
+              sums[index] = "0";
+            }
+          }
+        });
+      }
+      return sums;
+    },
+    handleQuery() {
+      this.page.pageNum = 1;
+      if (this.form.date) {
+        this.form.fFromDate = this.form.date[0];
+        this.form.fToDate = this.form.date[1];
+      }
+      this.getList();
+    },
+    resetQuery() {
+      this.form = this.$options.data().form;
+    },
+    getList() {
+      const data = {
+        ...this.form,
+        pageNum: this.page.pageNum,
+        pageSize: this.page.pageSize,
+      };
+      getList(data).then((response) => {
+        response.rows.forEach((e) => {
+          e.sailingDate = e.sailingDate ? e.sailingDate.slice(0, 10) : "";
+        });
+        response.rows.forEach((e) => {
+          e.auditDate = e.auditDate ? e.auditDate.slice(0, 10) : "";
+        });
+        this.tableData = response.rows;
+        this.page.total = response.total;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head-but {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/views/reportManagement/kaihe-generalLedgerCr/js/index.js

@@ -0,0 +1,79 @@
+export const tableOption = [
+  {
+    surface: "1",
+    label: "shipsName",
+    name: "船名",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "2",
+    label: "voyage",
+    name: "航次",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "unitOfAccount",
+    name: "结算单位",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "blNo",
+    name: "提单号",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "portOfLoading",
+    name: "起运港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "destination",
+    name: "目的港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "sailingDate",
+    name: "开船日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "auditDate",
+    name: "审核日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "receivable",
+    name: "应付金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "4",
+    label: "handle",
+    name: "实付金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "5",
+    label: "profit",
+    name: "未付金额",
+    checked: 0,
+    width: 150,
+  }
+]

src/views/reportManagement/kaihe-generalLedgerDr/index.vue

@@ -0,0 +1,410 @@
+<template>
+  <div>
+    <!-- 列表页 -->
+    <el-form ref="form" :model="form" label-width="80px" v-show="showSearch">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="结算单位">
+            <el-select
+              v-model="form.fCorpid"
+              size="small"
+              placeholder="请选择"
+              clearable
+              style="width: 100%"
+              filterable
+            >
+              <el-option
+                v-for="item in corpList"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="船名">
+            <el-select
+              v-model="form.fVslid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVesselfs"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="航次">
+            <el-select
+              v-model="form.fVoyid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVoyagefs"
+                :key="item.fId"
+                :label="item.fNo"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="提单号">
+            <el-input
+              v-model="form.fMblno"
+              size="small"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-collapse-transition>
+        <div v-if="show">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="起运港">
+                <el-select
+                  v-model="form.fLoadportid"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in portNames"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="目的港">
+                <el-select
+                  v-model="form.fDestportid"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in portNames"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开船日期">
+                <el-date-picker
+                  v-model="form.timeInterval"
+                  type="daterange"
+                  size="small"
+                  placeholder="请选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="审核日期">
+                <el-date-picker
+                  v-model="form.timeExamine"
+                  type="daterange"
+                  size="small"
+                  placeholder="请选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="费用状态">
+                <el-select
+                  v-model="form.fBillstatus"
+                  size="small"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in fBillstatusList"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-collapse-transition>
+    </el-form>
+    <div class="head-but">
+      <div>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >
+          导出
+        </el-button>
+      </div>
+      <div class="tabSetting">
+        <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-button
+          v-show="show"
+          @click="show = !show"
+          icon="el-icon-arrow-up"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <el-button
+          v-show="!show"
+          @click="show = !show"
+          icon="el-icon-arrow-down"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <right-toolbar
+          style="margin-left: 12px"
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="colSetting"
+          ></el-button>
+        </div>
+      </div>
+    </div>
+    <el-table :data="tableData" show-summary :summary-method="getSummaries">
+      <el-table-column label="序号" type="index" width="50" />
+      <el-table-column
+        v-for="(item, index) in tableOption"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+    <pagination
+      v-show="page.total > 0"
+      :total="page.total"
+      :page.sync="page.pageNum"
+      :limit.sync="page.pageSize"
+      @pagination="getList"
+    />
+    <column-setting
+      ref="columnSetting"
+      @reset="reset"
+      @getRowdata="getRowdata"
+      tableName="凯和应收总账"
+    />
+  </div>
+</template>
+
+<script>
+import { tableOption } from "./js/index";
+import {
+  selectTVesself,
+  selectTVoyagef,
+  selectPortName,
+  listCorps,
+} from "@/api/finance/kaihe/contrast";
+import {
+  getList,
+  getExcel,
+} from "@/api/kaihe-reportManagement/generalLedgerDr";
+import columnSetting from "@/components/ColumnSetting/index";
+export default {
+  data() {
+    return {
+      form: {},
+      show: false,
+      tableData: [],
+      tableOption: tableOption,
+      page: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      TVesselfs: [],
+      TVoyagefs: [],
+      portNames: [],
+      corpList: [],
+      showSearch: true,
+      fBillstatusList: [
+        {
+          fId: 0,
+          fName: "全部",
+        },
+        {
+          fId: 1,
+          fName: "未审核",
+        },
+        {
+          fId: 2,
+          fName: "审核通过",
+        },
+      ],
+    };
+  },
+  components: {
+    columnSetting,
+  },
+  created() {
+    this.getList();
+    selectTVesself().then((res) => {
+      this.TVesselfs = res.rows;
+    });
+    selectTVoyagef().then((res) => {
+      this.TVoyagefs = res.rows;
+    });
+    selectPortName().then((res) => {
+      this.portNames = res.rows;
+    });
+    listCorps().then((res) => {
+      this.corpList = res;
+    });
+  },
+  activated() {
+    this.$refs.columnSetting.getRow(this.tableOption);
+  },
+  methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm("是否确认导出所有应收总账主数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return getExcel();
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    getRowdata(list) {
+      this.tableOption = list;
+    },
+    reset() {
+      this.tableOption = this.$options.data().tableOption;
+    },
+    colSetting() {
+      this.$refs.columnSetting.init(this.tableOption);
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      if (data.length > 0) {
+        columns.forEach((column, index) => {
+          if (index == 0) {
+            sums[index] = "合计";
+          }
+          if (
+            column.label == "应收金额" ||
+            column.label == "实收金额" ||
+            column.label == "未收金额"
+          ) {
+            const values = data.map((item) => Number(item[column.property]));
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] =
+                Number(
+                  values.reduce((prev, curr) => {
+                    const value = Number(curr);
+                    if (!isNaN(value)) {
+                      return prev + curr;
+                    } else {
+                      return prev;
+                    }
+                  }, 0) / 10000
+                ).toFixed(2) + "万";
+            } else {
+              sums[index] = "0";
+            }
+          }
+        });
+      }
+      return sums;
+    },
+    handleQuery() {
+      this.page.pageNum = 1;
+      if (this.form.date) {
+        this.form.fFromDate = this.form.date[0];
+        this.form.fToDate = this.form.date[1];
+      }
+      this.getList();
+    },
+    resetQuery() {
+      this.form = this.$options.data().form;
+    },
+    getList() {
+      const data = {
+        ...this.form,
+        pageNum: this.page.pageNum,
+        pageSize: this.page.pageSize,
+      };
+      getList(data).then((response) => {
+        response.rows.forEach((e) => {
+          e.sailingDate = e.sailingDate ? e.sailingDate.slice(0, 10) : "";
+        });
+        response.rows.forEach((e) => {
+          e.auditDate = e.auditDate ? e.auditDate.slice(0, 10) : "";
+        });
+        this.tableData = response.rows;
+        this.page.total = response.total;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head-but {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/views/reportManagement/kaihe-generalLedgerDr/js/index.js

@@ -0,0 +1,79 @@
+export const tableOption = [
+  {
+    surface: "1",
+    label: "shipsName",
+    name: "船名",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "2",
+    label: "voyage",
+    name: "航次",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "unitOfAccount",
+    name: "结算单位",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "blNo",
+    name: "提单号",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "portOfLoading",
+    name: "起运港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "destination",
+    name: "目的港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "sailingDate",
+    name: "开船日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "auditDate",
+    name: "审核日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "receivable",
+    name: "应收金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "4",
+    label: "handle",
+    name: "实收金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "5",
+    label: "profit",
+    name: "未收金额",
+    checked: 0,
+    width: 150,
+  }
+]

src/views/reportManagement/kaihe-profitGeneralLedger/index.vue

@@ -0,0 +1,363 @@
+<template>
+  <div>
+    <!-- 列表页 -->
+    <el-form ref="form" :model="form" label-width="80px" v-show="showSearch">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="船名">
+            <el-select
+              v-model="form.fVslid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVesselfs"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="航次">
+            <el-select
+              v-model="form.fVoyid"
+              size="small"
+              placeholder="请选择"
+              style="width: 100%"
+              clearable
+            >
+              <el-option
+                v-for="item in TVoyagefs"
+                :key="item.fId"
+                :label="item.fNo"
+                :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开船日期">
+            <el-date-picker
+              v-model="form.timeInterval"
+              type="daterange"
+              size="small"
+              placeholder="请选择日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="审核日期">
+            <el-date-picker
+              v-model="form.timeExamine"
+              type="daterange"
+              size="small"
+              placeholder="请选择日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-collapse-transition>
+        <el-row v-if="show">
+          <el-col :span="6">
+            <el-form-item label="起运港">
+              <el-select
+                v-model="form.fLoadportid"
+                size="small"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="item in portNames"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目的港">
+              <el-select
+                v-model="form.fDestportid"
+                size="small"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="item in portNames"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="费用状态">
+              <el-select
+                v-model="form.fBillstatus"
+                size="small"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="item in fBillstatusList"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-collapse-transition>
+    </el-form>
+    <div class="head-but">
+      <div>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >
+          导出
+        </el-button>
+      </div>
+      <div class="tabSetting">
+        <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-button
+          v-show="show"
+          @click="show = !show"
+          icon="el-icon-arrow-up"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <el-button
+          v-show="!show"
+          @click="show = !show"
+          icon="el-icon-arrow-down"
+          size="mini"
+        >
+          展开
+        </el-button>
+        <right-toolbar
+          style="margin-left: 12px"
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="colSetting"
+          ></el-button>
+        </div>
+      </div>
+    </div>
+    <el-table :data="tableData" show-summary :summary-method="getSummaries">
+      <el-table-column label="序号" type="index" width="50" />
+      <el-table-column
+        v-for="(item, index) in tableOption"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+      />
+    </el-table>
+    <pagination
+      v-show="page.total > 0"
+      :total="page.total"
+      :page.sync="page.pageNum"
+      :limit.sync="page.pageSize"
+      @pagination="getList"
+    />
+    <column-setting
+      ref="columnSetting"
+      @reset="reset"
+      @getRowdata="getRowdata"
+      tableName="凯和利润总账"
+    />
+  </div>
+</template>
+
+<script>
+import { tableOption } from "./js/index";
+import {
+  selectTVesself,
+  selectTVoyagef,
+  selectPortName,
+} from "@/api/finance/kaihe/contrast";
+import { getList,getExcel } from "@/api/kaihe-reportManagement/profitGeneralLedger";
+import columnSetting from "@/components/ColumnSetting/index";
+export default {
+  data() {
+    return {
+      form: {},
+      show: false,
+      tableData: [],
+      tableOption: tableOption,
+      page: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      TVesselfs: [],
+      TVoyagefs: [],
+      portNames: [],
+      showSearch: true,
+      fBillstatusList: [
+        {
+          fId: 0,
+          fName: "全部",
+        },
+        {
+          fId: 1,
+          fName: "未审核",
+        },
+        {
+          fId: 2,
+          fName: "审核通过",
+        },
+      ],
+    };
+  },
+  components: {
+    columnSetting,
+  },
+  created() {
+    this.getList();
+    selectTVesself().then((res) => {
+      this.TVesselfs = res.rows;
+    });
+    selectTVoyagef().then((res) => {
+      this.TVoyagefs = res.rows;
+    });
+    selectPortName().then((res) => {
+      this.portNames = res.rows;
+    });
+  },
+  activated() {
+    this.$refs.columnSetting.getRow(this.tableOption);
+  },
+  methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm("是否确认导出所有利润总账主数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return getExcel();
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    getRowdata(list) {
+      this.tableOption = list;
+    },
+    reset() {
+      this.tableOption = this.$options.data().tableOption;
+    },
+    colSetting() {
+      this.$refs.columnSetting.init(this.tableOption);
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      if (data.length > 0) {
+        columns.forEach((column, index) => {
+          if (index == 0) {
+            sums[index] = "合计";
+          }
+          if (
+            column.label == "应收合计" ||
+            column.label == "应付合计" ||
+            column.label == "利润" ||
+            column.label == "实收合计" ||
+            column.label == "实付合计"
+          ) {
+            const values = data.map((item) => Number(item[column.property]));
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] =Number(values.reduce((prev, curr) => {
+                const value = Number(curr);
+                if (!isNaN(value)) {
+                  return prev + curr;
+                } else {
+                  return prev;
+                }
+              }, 0)/10000).toFixed(2)+'万'
+            } else {
+              sums[index] = "0";
+            }
+          }
+        });
+      }
+      return sums;
+    },
+    handleQuery() {
+      this.page.pageNum = 1;
+      if (this.form.date) {
+        this.form.fFromDate = this.form.date[0];
+        this.form.fToDate = this.form.date[1];
+      }
+      this.getList();
+    },
+    resetQuery() {
+      this.form = this.$options.data().form;
+    },
+    getList() {
+      const data = {
+        ...this.form,
+        pageNum: this.page.pageNum,
+        pageSize: this.page.pageSize,
+      };
+      getList(data).then((response) => {
+        this.tableData = response.rows;
+        this.page.total = response.total;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head-but {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/views/reportManagement/kaihe-profitGeneralLedger/js/index.js

@@ -0,0 +1,51 @@
+export const tableOption = [
+  {
+    surface: "1",
+    label: "shipsName",
+    name: "船名",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "2",
+    label: "voyage",
+    name: "航次",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "receivable",
+    name: "应收合计",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "4",
+    label: "handle",
+    name: "应付合计",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "5",
+    label: "profit",
+    name: "利润",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "6",
+    label: "actualReceivable",
+    name: "实收合计",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "7",
+    label: "actualHandle",
+    name: "实付合计",
+    checked: 0,
+    width: 150,
+  }
+]