From 85fe01e1c20795e6ac15b8ea431b4100f54d5943 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 17 Jun 2024 18:52:04 +0800
Subject: [PATCH] md

---
 src/views/emis/emisSiteSettleRecord/index.vue | 172 +++++++++++-------
 src/views/emis/emisSmsSendRecord/index.vue    |   2 +-
 2 files changed, 106 insertions(+), 68 deletions(-)

diff --git a/src/views/emis/emisSiteSettleRecord/index.vue b/src/views/emis/emisSiteSettleRecord/index.vue
index 678be2b6..d355fe78 100644
--- a/src/views/emis/emisSiteSettleRecord/index.vue
+++ b/src/views/emis/emisSiteSettleRecord/index.vue
@@ -1,45 +1,60 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="billCode">
+      <el-form-item label="运单号" prop="billCode">
+          <XdTextareaInput
+            v-model="queryParams.billCode"
+            :placeholder="$t('多个流水号逗号或换行隔开')"
+            clearable
+            :rows="2"
+          />
+      </el-form-item>
+
+      <el-form-item label="结算日期" prop="changeDate">
+        <elDateSimplePicker1 v-model="dateTimeRange1"  ></elDateSimplePicker1>
+      </el-form-item>
+
+      <el-form-item label="账单日期" prop="changeDate">
+        <elDateSimplePicker2 v-model="dateTimeRange2"  ></elDateSimplePicker2>
+      </el-form-item>
+
+      <el-form-item label="财务中心" prop="centerCode">
+        <EmisSiteSimplePicker0 :placeholder="$t('财务中心')"  v-model="queryParams.centerCode" :isInitiated="true" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker0>
+      </el-form-item>
+      <el-form-item label="网点名称" prop="siteCode">
+        <EmisSiteSimplePicker1 :placeholder="$t('网点名称')"  v-model="queryParams.siteCode" :isInitiated="true" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker1>
+      </el-form-item>
+      <el-form-item label="结算类型" prop="settleType">
+        <SettleTypePicker v-model="queryParams.settleType"></SettleTypePicker>
+      </el-form-item>
+      <el-form-item label="收支类型" prop="recPayType">
+        <el-select v-model="queryParams.recPayType" clearable filterable  placeholder="收支类型" >
+            <el-option :key="1" label="应收" value="1" ></el-option>
+            <el-option :key="2" label="应付" value="2" ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
         <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
+          v-model="queryParams.customerName"
+          :placeholder="$t('客户名称')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="settleType">
+      <el-form-item label="客户编码" prop="customerCode">
         <el-input
-          v-model="queryParams.settleType"
-          :placeholder="$t('结算类型:')"
+          v-model="queryParams.customerCode"
+          :placeholder="$t('客户编码')"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="centerCode">
-        <el-input
-          v-model="queryParams.centerCode"
-          :placeholder="$t('财务中心代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteCode">
-        <el-input
-          v-model="queryParams.siteCode"
-          :placeholder="$t('站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
     </SearchForm>
 
 
     <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisSiteSettleRecordList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -98,48 +113,65 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('流水号')" align="center" prop="id" min-width="100" />
+      <el-table-column :label="$t('流水号')" align="center" prop="id" min-width="80" />
       <!-- <el-table-column :label="$t('账户编号')" align="center" prop="accCode" min-width="100" /> -->
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('收支类型：应收')" align="center" prop="recPayType" min-width="100" />
-      <el-table-column :label="$t('结算类型:')" align="center" prop="settleType" min-width="100" />
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
+      <el-table-column :label="$t('财务中心')" align="center" prop="centerName" min-width="100" />
+      <!-- <el-table-column :label="$t('网点名称')" align="center" prop="siteCode" min-width="100" /> -->
+      <el-table-column :label="$t('网点名称')" align="center" prop="siteName" min-width="100" />
+
+      <el-table-column :label="$t('结算日期')" align="center" prop="changeDate" min-width="170" />
+      <el-table-column :label="$t('账单日期')" align="center" prop="financeDate" min-width="170" />
+      <el-table-column :label="$t('结算类型')" align="center" prop="settleTypeName" min-width="100" />
+
+      <el-table-column :label="$t('收支类型')" align="center" prop="recPayType" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.recPayType==1">应收</span>
+             <span v-if="scope.row.recPayType==2">应付</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
       <el-table-column :label="$t('前余额')" align="center" prop="preBalance" min-width="100" />
-      <el-table-column :label="$t('前确认余额')" align="center" prop="preConfirmBalance" min-width="100" />
-      <el-table-column :label="$t('当前操作金额')" align="center" prop="curMoney" min-width="100" />
-      <el-table-column :label="$t('当前确认金额')" align="center" prop="curConfirmMoney" min-width="100" />
-      <el-table-column :label="$t('变动后余额')" align="center" prop="backBalance" min-width="100" />
-      <el-table-column :label="$t('变动后确认余额')" align="center" prop="backConfirmBalance" min-width="100" />
-      <el-table-column :label="$t('币种')" align="center" prop="currency" min-width="100" />
-      <el-table-column :label="$t(' 改变类型 1-加 ')" align="center" prop="changeType" min-width="100" />
-      <el-table-column :label="$t('结算日期')" align="center" prop="changeDate" min-width="100" />
-      <el-table-column :label="$t('财务中心代码')" align="center" prop="centerCode" min-width="100" />
-      <el-table-column :label="$t('站点')" align="center" prop="siteCode" min-width="100" />
+      <!-- <el-table-column :label="$t('前确认余额')" align="center" prop="preConfirmBalance" min-width="100" /> -->
+      <el-table-column :label="$t('结算金额')" align="center" prop="curMoney" min-width="100" />
+      <!-- <el-table-column :label="$t('当前确认金额')" align="center" prop="curConfirmMoney" min-width="100" /> -->
+      <el-table-column :label="$t('后余额')" align="center" prop="backBalance" min-width="100" />
+      <!-- <el-table-column :label="$t('变动后确认余额')" align="center" prop="backConfirmBalance" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('币种')" align="center" prop="currency" min-width="100" /> -->
+      <el-table-column :label="$t('变动类型')" align="center" prop="changeType" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.changeType==1">加</span>
+             <span v-if="scope.row.changeType==2">减</span>
+          </template>
+      </el-table-column>
+      <!-- <el-table-column :label="$t('结算网点')" align="center" prop="confirmSiteCode" min-width="100" /> -->
+      <el-table-column :label="$t('结算网点')" align="center" prop="confirmSiteName" min-width="100" />
+      <el-table-column :label="$t('结算人')" align="center" prop="settleManName" min-width="100" />
+      <el-table-column :label="$t('结算人编号')" align="center" prop="settleManCode" min-width="100" />
+
       <el-table-column :label="$t('来源')" align="center" prop="sourceType" min-width="100" />
-      <el-table-column :label="$t('账单时间')" align="center" prop="financeDate" min-width="100" />
-      <el-table-column :label="$t('结算时间')" align="center" prop="operataDate" min-width="100" />
-      <el-table-column :label="$t('是否确认')" align="center" prop="blConfirm" min-width="100" />
-      <el-table-column :label="$t('确认人代码')" align="center" prop="confirmManCode" min-width="100" />
-      <el-table-column :label="$t('确认站点代码')" align="center" prop="confirmSiteCode" min-width="100" />
-      <el-table-column :label="$t('结算人代码')" align="center" prop="settleManCode" min-width="100" />
-      <el-table-column :label="$t('是否中心审核')" align="center" prop="blCenter" min-width="100" />
-      <el-table-column :label="$t('中心人代码')" align="center" prop="centerManCode" min-width="100" />
-      <el-table-column :label="$t('是否站点审核')" align="center" prop="blSite" min-width="100" />
-      <el-table-column :label="$t('站点人代码')" align="center" prop="siteManCode" min-width="100" />
-      <el-table-column :label="$t('站点日期')" align="center" prop="siteDate" min-width="100" />
-      <el-table-column :label="$t('是否改变费用')" align="center" prop="blChargeFee" min-width="100" />
-      <el-table-column :label="$t('转发单号')" align="center" prop="transferCode" min-width="100" />
-      <el-table-column :label="$t('结算ebr代码')" align="center" prop="settleEbrCode" min-width="100" />
-      <el-table-column :label="$t('结算ebr日期')" align="center" prop="settleEbrDate" min-width="100" />
-      <el-table-column :label="$t('客户代码')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('中心日期')" align="center" prop="centerDate" min-width="100" />
+      <!-- <el-table-column :label="$t('结算时间')" align="center" prop="operataDate" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('是否确认')" align="center" prop="blConfirm" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('确认人代码')" align="center" prop="confirmManCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('是否中心审核')" align="center" prop="blCenter" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('中心人代码')" align="center" prop="centerManCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('是否站点审核')" align="center" prop="blSite" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('站点人代码')" align="center" prop="siteManCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('站点日期')" align="center" prop="siteDate" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('是否改变费用')" align="center" prop="blChargeFee" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('转发单号')" align="center" prop="transferCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('结算ebr代码')" align="center" prop="settleEbrCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('结算ebr日期')" align="center" prop="settleEbrDate" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('中心日期')" align="center" prop="centerDate" min-width="100" /> -->
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('创建者')" align="center" prop="createBy" min-width="100" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="100" />
-      <el-table-column :label="$t('更新者')" align="center" prop="updateBy" min-width="100" />
-      <el-table-column :label="$t('更新时间')" align="center" prop="updateTime" min-width="100" />
-      <el-table-column :label="$t('创建站点')" align="center" prop="createSite" min-width="100" />
-      <el-table-column :label="$t('更新站点')" align="center" prop="updateSite" min-width="100" />
+      <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('创建者')" align="center" prop="createBy" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('更新者')" align="center" prop="updateBy" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('更新时间')" align="center" prop="updateTime" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('创建站点')" align="center" prop="createSite" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('更新站点')" align="center" prop="updateSite" min-width="100" /> -->
 
     </XdTable>
 
@@ -148,11 +180,16 @@
 
 <script>
 import { listEmisSiteSettleRecord, getEmisSiteSettleRecord, delEmisSiteSettleRecord, addEmisSiteSettleRecord, updateEmisSiteSettleRecord } from "@/api/emis/emisSiteSettleRecord";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import elDateSimplePicker1 from '@/components/DatePickerAdv/elDateSimplePicker';
+import elDateSimplePicker2 from '@/components/DatePickerAdv/elDateSimplePicker';
+
+import EmisSiteSimplePicker0 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import SettleTypePicker from '@/views/emis/EmisBaseTools/SettleTypePicker.vue';
 
 export default {
   name: "SettleRecordList",
-  components: { elDateSimplePicker },
+  components: { elDateSimplePicker1,elDateSimplePicker2,EmisSiteSimplePicker0,EmisSiteSimplePicker1,SettleTypePicker },
   dicts: [
   ],
   data() {
@@ -168,7 +205,8 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
-      dateTimeRange:[],
+      dateTimeRange1:[],
+      dateTimeRange2:[],
       // 总条数
       total: 0,
       // 网点账户结算记录表格数据
diff --git a/src/views/emis/emisSmsSendRecord/index.vue b/src/views/emis/emisSmsSendRecord/index.vue
index 42abbf5b..69a4e929 100644
--- a/src/views/emis/emisSmsSendRecord/index.vue
+++ b/src/views/emis/emisSmsSendRecord/index.vue
@@ -147,7 +147,7 @@
              <span v-if="scope.row.smsType==2">签收</span>
              <span v-if="scope.row.smsType==3">问题件</span>
           </template>
-        </el-table-column>
+      </el-table-column>
       <el-table-column :label="$t('渠道发送状态')" align="center" prop="sendStatus" min-width="160" >
         <template slot-scope="scope">
              <span v-if="scope.row.sendStatus==1">已发送</span>