Browse Source

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

caojunjie 3 years ago
parent
commit
4ec47af1f8

+ 1 - 1
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -5008,7 +5008,7 @@ export default {
       if (row.fQty) {
         fQty = row.fQty;
       }
-      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
+      this.$set(row, "fAmount", (Number(fUnitprice) * Number(fQty)).toFixed(2));
     },
     // 变更计价单位
     changeFeeUnit(row) {

File diff suppressed because it is too large
+ 547 - 797
src/views/Warehousing/components/incomeMoney.vue


+ 1 - 1
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -4506,7 +4506,7 @@ export default {
       if (row.fQty) {
         fQty = row.fQty;
       }
-      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
+      this.$set(row, "fAmount", (Number(fUnitprice) * Number(fQty)).toFixed(2));
     },
     // 变更计价单位
     changeFeeUnit(row) {

+ 1 - 1
src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -7636,7 +7636,7 @@ export default {
       if (row.fQty) {
         fQty = row.fQty;
       }
-      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
+      this.$set(row, "fAmount", (Number(fUnitprice) * Number(fQty)).toFixed(2));
     },
     // 变更计价单位
     changeFeeUnit(row) {

+ 2 - 2
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -5881,8 +5881,8 @@
           style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作:{{ form.createBy }}</div>-->
-          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
-          <div style="width: 100px">叉车:</div>
+          <div>制单人:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
+          <div style="width: 100px">审核人:</div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">

+ 8 - 6
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -3191,7 +3191,7 @@
               <td v-if="radio == 1">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td v-else>{{ item.fNetweight }}</td>
               <td>{{ item.fQty }}/{{ item.fPackagespecs }}</td>
-              <td>{{ item.fCntrno }}
+              <td>{{ item.fCntrno }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fCartypeId | fCartypeFormat(fCartypeOptions) }}</td>
             </tr>
@@ -9236,6 +9236,9 @@ export default {
       rows.splice(index, 1)
     },
     wDeleteRow(index, rows) {
+      if(this.warehouseDrList&&this.warehouseDrList.length>0){
+       return this.$message.error('收款信息中存在数据,请删除仓储费明细后,继续操作')
+      }
       rows.splice(index, 1)
       this.sumMum = 0
       this.detailList.map((e) => {
@@ -9457,7 +9460,7 @@ export default {
       if (row.fQty) {
         fQty = row.fQty
       }
-      this.$set(row, 'fAmount', Number(fUnitprice) * Number(fQty)).toFixed(2)
+      this.$set(row, 'fAmount', (Number(fUnitprice) * Number(fQty)).toFixed(2))
     },
     // 变更计价单位
     changeFeeUnit(row) {
@@ -9479,9 +9482,8 @@ export default {
       }
       if (row.fUnitprice) {
         this.$set(
-            row,
-            'fAmount',
-            parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+          row,
+          'fAmount',(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
         )
       }
     },
@@ -10017,7 +10019,7 @@ export default {
           this.allDrAmount = Number(this.allDrAmount) + Number(item.fAmount)
           this.allTaxAmount = this.allTaxAmount.toSuperFixed(2)
           this.allExclTax = this.allExclTax.toSuperFixed(2)
-          this.allDrAmount = this.allDrAmount.toSuperFixed(2)
+          this.allDrAmount = this.allDrAmount.toSuperFixed(3)
         })
         this.nowTime = new Date().toLocaleDateString()
         for (let corp in this.fMblnoOptions) {

+ 8 - 5
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2883,6 +2883,7 @@
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
               <td style="height: 20px">箱号</td>
+              <td>品名</td>
               <td>现存库区</td>
               <td>件数</td>
               <td v-if="radio == 1">毛重(吨)</td>
@@ -2893,6 +2894,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td style="height: 20px">{{ item.fCntrno }}</td>
+              <td>{{ item.fGoodsids}}</td>
               <td>{{ item.fOrgwarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
@@ -2903,7 +2905,9 @@
               <td>{{ item.fWarehouseInformation }}</td>
             </tr>
             <tr>
-              <td colspan="2" style="height: 20px">合 计</td>
+              <td colspan="1" style="height: 20px">合 计</td>
+              <td>-</td>
+              <td>-</td>
               <td>{{allfQty}}</td>
               <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
@@ -2913,7 +2917,7 @@
             </tr>
             <tr>
               <td style="height: 20px">备注</td>
-              <td colspan="5">{{ form.remark }}</td>
+              <td colspan="6">{{ form.remark }}</td>
             </tr>
           </table>
         </div>
@@ -6495,7 +6499,7 @@ export default {
       if (row.fQty) {
         fQty = row.fQty;
       }
-      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
+      this.$set(row, "fAmount", (Number(fUnitprice) * Number(fQty)).toFixed(2));
     },
     // 变更计价单位
     changeFeeUnit(row) {
@@ -6516,8 +6520,7 @@ export default {
       if (row.fUnitprice) {
         this.$set(
           row,
-          "fAmount",
-          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+          "fAmount",(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
         );
       }
     },

File diff suppressed because it is too large
+ 197 - 597
src/views/kaihe/containerNews/boxInformation/index.vue


+ 58 - 160
src/views/reportManagement/generalLedgerCr/index.vue

@@ -4,42 +4,21 @@
       <kaihe-generalLedgerCr />
     </div>
     <div v-else>
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        v-show="showSearch"
-        label-width="80px"
-      >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="80px">
         <el-row>
           <el-col :span="6">
             <el-form-item label="结算单位" prop="fToCorpid">
-              <el-select
-                v-model="queryParams.fToCorpid"
-                placeholder="请选择结算单位"
-                filterable
-                remote
-                clearable
-                @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 v-model="queryParams.fToCorpid" placeholder="请选择结算单位" filterable remote clearable
+                @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-col>
           <el-col :span="6">
             <el-form-item label="费用状态" prop="isReviewed">
-              <el-select
-                v-model="queryParams.isReviewed"
-                clearable
-                size="small"
-                @keyup.enter.native="handleQuery"
-                @change="reviewedChange"
-              >
+              <el-select v-model="queryParams.isReviewed" clearable size="small" @keyup.enter.native="handleQuery"
+                @change="reviewedChange">
                 <el-option label="录入" :value="0" />
                 <el-option label="审核通过" :value="1" />
               </el-select>
@@ -50,132 +29,76 @@
               <!--          如果需要固定某一年加 :picker-options="pickerOptions0"-->
               <div style="display: flex;width: 100%">
                 <el-select v-model="queryParams.switchSection" style="width: 100px">
-                  <el-option label="审核区间" :value="0"/>
-                  <el-option label="业务区间" :value="1"/>
+                  <el-option label="审核区间" :value="0" />
+                  <el-option label="业务区间" :value="1" />
                 </el-select>
-                <el-date-picker
-                  type="monthrange"
-                  range-separator="至"
-                  start-placeholder="开始月份"
-                  end-placeholder="结束月份"
-                  v-model="queryParams.timeExamine"
-                  value-format="yyyy-MM"
-                  unlink-panels
-                  :clearable="false"
-                  @keyup.enter.native="handleQuery"
-                ></el-date-picker>
+                <el-date-picker type="monthrange" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+                  v-model="queryParams.timeExamine" value-format="yyyy-MM" unlink-panels :clearable="false"
+                  @keyup.enter.native="handleQuery"></el-date-picker>
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="显示0余额">
-              <el-select
-                v-model="queryParams.fReconciliation"
-                filterable
-              >
+              <el-select v-model="queryParams.fReconciliation" filterable>
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-form-item label="审核日期" prop="timeExamine">-->
-<!--          <el-date-picker-->
-<!--            v-model="queryParams.timeExamine"-->
-<!--            type="daterange"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            range-separator="至"-->
-<!--            start-placeholder="开始日期"-->
-<!--            end-placeholder="结束日期"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--            :picker-options="pickerOptions"-->
-<!--            unlink-panels-->
-<!--            :clearable="false"-->
-<!--          >-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="审核日期" prop="timeExamine">-->
+        <!--          <el-date-picker-->
+        <!--            v-model="queryParams.timeExamine"-->
+        <!--            type="daterange"-->
+        <!--            value-format="yyyy-MM-dd"-->
+        <!--            range-separator="至"-->
+        <!--            start-placeholder="开始日期"-->
+        <!--            end-placeholder="结束日期"-->
+        <!--            @keyup.enter.native="handleQuery"-->
+        <!--            :picker-options="pickerOptions"-->
+        <!--            unlink-panels-->
+        <!--            :clearable="false"-->
+        <!--          >-->
+        <!--          </el-date-picker>-->
+        <!--        </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:payable:export']"
-          >导出</el-button
-          >
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['warehouseBusiness:payable:export']">导出</el-button>
         </el-col>
         <div class="tabSetting">
           <div style="margin-right: 20px">
-            <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 type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </div>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <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-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>
+          <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"
-          >
+          <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 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 :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>
+                <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+                </el-input-number>
               </div>
             </transition-group>
           </draggable>
@@ -186,54 +109,27 @@
           <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 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 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">
           <template slot-scope="scope">
             <span v-if="item.label == 'ffeesName'">
-              <el-link :underline="false" type="primary"
-                ><div @click="goDetail(scope.row)">
+              <el-link :underline="false" type="primary">
+                <div @click="goDetail(scope.row)">
                   {{ scope.row.ffeesName }}
-                </div></el-link
-              >
+                </div>
+              </el-link>
             </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
       </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>-->
@@ -784,13 +680,12 @@ export default {
       this.getList();
     },
     goDetail(row) {
+      let date = [row.reviewDate, row.reviewDate]
       this.$router.push({
         path: "/analysis/CrDetail",
         query: {
           fCorpId: row.fCorpid,
-          // fMblNo: row.fmblno,
-          fAuditList: this.queryParams.timeExamine,
-          isReviewed: this.queryParams.isReviewed,
+          fAuditList: date
         },
       });
     },
@@ -802,15 +697,18 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+
 .listStyle {
   display: flex;
   border-top: 1px solid #dcdfe6;
   border-left: 1px solid #dcdfe6;
   border-right: 1px solid #dcdfe6;
 }
+
 .listStyle:last-child {
   border-bottom: 1px solid #dcdfe6;
 }
+
 .progress {
   display: flex;
   align-items: center;

+ 44 - 147
src/views/reportManagement/generalLedgerDr/index.vue

@@ -4,67 +4,37 @@
       <kaihe-generalLedgerDr />
     </div>
     <div v-else>
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        v-show="showSearch"
-        label-width="80px"
-        size="small"
-      >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="80px" size="small">
         <el-row>
           <el-col :span="6">
             <el-form-item label="结算单位" prop="fToCorpid">
-              <el-select
-                v-model="queryParams.fToCorpid"
-                placeholder="请选择结算单位"
-                filterable
-                remote
-                clearable
-                @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 v-model="queryParams.fToCorpid" placeholder="请选择结算单位" filterable remote clearable
+                @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-col>
           <el-col :span="6">
             <el-form-item label="费用状态" prop="isReviewed">
-              <el-select
-                v-model="queryParams.isReviewed"
-                clearable
-                size="small"
-                @keyup.enter.native="handleQuery"
-                @change="reviewedChange"
-              >
+              <el-select v-model="queryParams.isReviewed" clearable size="small" @keyup.enter.native="handleQuery"
+                @change="reviewedChange">
                 <el-option label="录入" :value="0" />
                 <el-option label="审核通过" :value="1" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-<!--            <el-form-item label="审核区间">-->
+            <!--            <el-form-item label="审核区间">-->
             <el-form-item label-width="0">
               <div style="display: flex;width: 100%">
                 <el-select v-model="queryParams.switchSection" style="width: 100px">
-                  <el-option label="审核区间" :value="0"/>
-                  <el-option label="业务区间" :value="1"/>
+                  <el-option label="审核区间" :value="0" />
+                  <el-option label="业务区间" :value="1" />
                 </el-select>
-                <el-date-picker
-                  type="monthrange"
-                  range-separator="至"
-                  start-placeholder="开始月份"
-                  end-placeholder="结束月份"
-                  v-model="queryParams.timeExamine"
-                  value-format="yyyy-MM"
-                  unlink-panels
-                  :clearable="false"
-                  @keyup.enter.native="handleQuery"
-                >
+                <el-date-picker type="monthrange" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+                  v-model="queryParams.timeExamine" value-format="yyyy-MM" unlink-panels :clearable="false"
+                  @keyup.enter.native="handleQuery">
                 </el-date-picker>
               </div>
 
@@ -72,10 +42,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="显示0余额">
-              <el-select
-                v-model="queryParams.fReconciliation"
-                filterable
-              >
+              <el-select v-model="queryParams.fReconciliation" filterable>
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>
               </el-select>
@@ -86,40 +53,18 @@
 
       <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:receivable:export']"
-          >导出</el-button
-          >
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['warehouseBusiness:receivable:export']">导出</el-button>
         </el-col>
         <div class="tabSetting">
           <div style="margin-right: 20px">
-            <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 type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </div>
 
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <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-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
           </div>
         </div>
       </el-row>
@@ -127,45 +72,22 @@
       <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>
+          <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"
-          >
+          <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 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 :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>
+                <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+                </el-input-number>
               </div>
             </transition-group>
           </draggable>
@@ -176,54 +98,27 @@
           <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 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 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">
           <template slot-scope="scope">
             <span v-if="item.label == 'ffeesName'">
-              <el-link :underline="false" type="primary"
-                ><div @click="goDetail(scope.row)">
+              <el-link :underline="false" type="primary">
+                <div @click="goDetail(scope.row)">
                   {{ scope.row.ffeesName }}
-                </div></el-link
-              >
+                </div>
+              </el-link>
             </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
       </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>-->
@@ -788,13 +683,12 @@ export default {
       this.getList();
     },
     goDetail(row) {
+      let date=[row.reviewDate,row.reviewDate]
       this.$router.push({
         path: "/analysis/DrDetail",
         query: {
           fCorpId: row.fCorpid,
-          // fMblNo: row.fmblno,
-          fAuditList: this.queryParams.timeExamine,
-          isReviewed: this.queryParams.isReviewed,
+          fAuditList:date
         },
       });
     },
@@ -806,15 +700,18 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+
 .listStyle {
   display: flex;
   border-top: 1px solid #dcdfe6;
   border-left: 1px solid #dcdfe6;
   border-right: 1px solid #dcdfe6;
 }
+
 .listStyle:last-child {
   border-bottom: 1px solid #dcdfe6;
 }
+
 .progress {
   display: flex;
   align-items: center;

+ 5 - 0
src/views/reportManagement/kaihe-profitGeneralLedger/index.vue

@@ -382,6 +382,11 @@ export default {
         pageSize: this.page.pageSize,
       };
       getList(data).then((response) => {
+        response.rows.forEach(e=>{
+          if(e.atd){
+            e.atd=e.atd.substring(0,10)
+          }
+        })
         this.tableData = response.rows;
         this.page.total = response.total;
         this.loading = false;

+ 11 - 4
src/views/reportManagement/kaihe-profitGeneralLedger/js/index.js

@@ -15,34 +15,41 @@ export const tableOption = [
   },
   {
     surface: "3",
+    label: "atd",
+    name: "开船日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "4",
     label: "receivable",
     name: "应收合计",
     checked: 0,
     width: 150,
   },
   {
-    surface: "4",
+    surface: "5",
     label: "handle",
     name: "应付合计",
     checked: 0,
     width: 150,
   },
   {
-    surface: "5",
+    surface: "6",
     label: "profit",
     name: "利润",
     checked: 0,
     width: 150,
   },
   {
-    surface: "6",
+    surface: "7",
     label: "actualReceivable",
     name: "实收合计",
     checked: 0,
     width: 150,
   },
   {
-    surface: "7",
+    surface: "8",
     label: "actualHandle",
     name: "实付合计",
     checked: 0,

Some files were not shown because too many files changed in this diff