退押详情列表新增厂编码列

src/views/engin_deposit/components/refund_list-detail.vue

@@ -33,10 +33,10 @@
             {{ detailList.refTradeCategory }}
           </div>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="8" class="item">
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">跨区厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
-        </el-col>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">使用单位</div>
           <div class="value">{{ detailList.refUseUnit }}</div>
@@ -116,10 +116,6 @@
           <div class="label">押金总额</div>
           <div class="value">{{ detailList.depositAmount }}</div>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="16" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{ detailList.refInstallAddress }}</div>
-        </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
@@ -127,6 +123,11 @@
             </el-date-picker>
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{ detailList.refInstallAddress }}</div>
+        </el-col>
+
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">工程订单号</div>
           <div class="value">{{ detailList.customerName }}</div>
@@ -185,6 +186,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+          <el-table-column align="center" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>

src/views/finance/standbook_list.vue

@@ -22,81 +22,38 @@
     <h1></h1>
     <!-- 筛选条件 -->
     <div>
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerId">
-              <el-select
-                :disabled="isDisabled"
-                class="selectStyle"
-                v-model="searchForm.customerId"
-                placeholder="请选择"
-                filterable
-                @change="changeFn"
-              >
-                <el-option
-                  v-for="(v, i) in customerList"
-                  :key="i"
-                  :label="v.name"
-                  :value="v.id"
-                >
+              <el-select :disabled="isDisabled" class="selectStyle" v-model="searchForm.customerId" placeholder="请选择" filterable @change="changeFn">
+                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="钱包" prop="customerWalletId">
-              <el-select
-                class="selectStyle"
-                v-model="searchForm.customerWalletId"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="(v, i) in walletList"
-                  :key="i"
-                  :label="v.customerWalletName"
-                  :value="v.customerWalletId"
-                >
+              <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
+                <el-option v-for="(v, i) in walletList" :key="i" :label="v.customerWalletName" :value="v.customerWalletId">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据号" prop="billNo">
-              <el-input
-                v-model="searchForm.billNo"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="开始时间" prop="startTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.startTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="结束时间" prop="endTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.endTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -104,9 +61,7 @@
           <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
               <el-button size="small" @click="resetFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFn"
-                >搜索</el-button
-              >
+              <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -115,10 +70,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-        <ExportButton
-          :exUrl="'/finance/standing/book/export'"
-          :exParams="exParams"
-        />
+        <ExportButton :exUrl="'/finance/standing/book/export'" :exParams="exParams" />
       </div>
     </div>
     <div v-show="bill == 'COMMONLY'">
@@ -145,73 +97,15 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="getSummaries"
-          >
-            <el-table-column
-              label="序号"
-              align="center"
-              width="100"
-              type="index"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据类型"
-              prop="billType"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据号"
-              prop="billNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="钱包"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="摘要"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="预付货款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
+            <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="摘要" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预付货款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 1
@@ -224,13 +118,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="订单占款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="订单占款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 2
@@ -243,13 +131,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="支付货款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="支付货款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 3
@@ -262,13 +144,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="押金"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="押金" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 4
@@ -281,13 +157,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="工程保证金"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="工程保证金" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 5
@@ -300,13 +170,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="其他暂扣款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="其他暂扣款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 6
@@ -319,13 +183,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="账户余额"
-              prop="balanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -359,98 +217,22 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="getSummaries2"
-          >
-            <el-table-column
-              label="序号"
-              align="center"
-              width="100"
-              type="index"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户编码"
-              prop="customerCode"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户名称"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="审核日期"
-              prop="examineTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据类型"
-              prop="billType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries2">
+            <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="客户编码" prop="customerCode" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.billType == 3 ? "付款单" : scope.row.billType }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="单据号"
-              prop="billNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利类型"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="摘要"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="收入"
-              prop="amountType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="摘要" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="收入" prop="amountType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "IN"
@@ -459,13 +241,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="支出"
-              prop="amountType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="支出" prop="amountType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "OUT"
@@ -474,35 +250,17 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="折让金额"
-              prop="allowanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="折让金额" prop="allowanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.allowanceAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="暂扣返利"
-              prop="withholdAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.withholdAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="结存"
-              prop="balanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="结存" prop="balanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -526,15 +284,7 @@
     </div>
     <!-- 分页 -->
     <div class="fr">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50, 500]"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="listTotal"
-      >
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50, 500]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
       </el-pagination>
     </div>
   </div>
@@ -762,7 +512,7 @@ export default {
         if (index === 0) {
           sums[index] = "合计";
         }
-        if (index === 9) {
+        if (index === 10) {
           let map1 = data.map((v) => {
             if (v.amountType == "IN") {
               return v.amount;
@@ -779,7 +529,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 10) {
+        if (index === 11) {
           let map1 = data.map((v) => {
             if (v.amountType == "OUT") {
               return v.amount;
@@ -796,7 +546,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 11) {
+        if (index === 12) {
           let map1 = data.map((v) => {
             return v.allowanceAmount;
           });
@@ -811,7 +561,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 12) {
+        if (index === 13) {
           let map1 = data.map((v) => {
             return v.withholdAmount;
           });
@@ -826,7 +576,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 13) {
+        if (index === 14) {
           let map1 = data.map((v) => {
             return v.balanceAmount;
           });
@@ -852,25 +602,25 @@ export default {
         if (index === 0) {
           sums[index] = "合计";
         }
-        if (index === 6) {
+        if (index === 7) {
           sums[index] = this.computedFn(data, 1);
         }
-        if (index === 7) {
+        if (index === 8) {
           sums[index] = this.computedFn(data, 2);
         }
-        if (index === 8) {
+        if (index === 9) {
           sums[index] = this.computedFn(data, 3);
         }
-        if (index === 9) {
+        if (index === 10) {
           sums[index] = this.computedFn(data, 4);
         }
-        if (index === 10) {
+        if (index === 11) {
           sums[index] = this.computedFn(data, 5);
         }
-        if (index === 11) {
+        if (index === 12) {
           sums[index] = this.computedFn(data, 6);
         }
-        if (index === 12) {
+        if (index === 13) {
           let map2 = data.map((v) => {
             return v.balanceAmount;
           });