部分bug解决

src/components/process/SF/CostControl.vue

@@ -892,10 +892,10 @@ const formConfig = computed(() => {
         changeShroffAccount(val);
       },
       disabled: !isHaveFinance.value,
-      isShow:
-        isShowAtt("paymentAccountId", "mainObj") &&
-        formData.data.isPublicTransfer &&
-        formData.data.isPublicTransfer == "1",
+      isShow: isShowAtt("paymentAccountId", "mainObj"),
+      // isShowAtt("paymentAccountId", "mainObj") &&
+      // formData.data.isPublicTransfer &&
+      // formData.data.isPublicTransfer == "1",
     },
     {
       type: "input",
@@ -904,10 +904,11 @@ const formConfig = computed(() => {
       placeholder: "请输入开户行",
       itemWidth: 25,
       disabled: !isHaveFinance.value,
-      isShow:
-        isShowAtt("paymentAccountId", "mainObj") &&
-        formData.data.isPublicTransfer &&
-        formData.data.isPublicTransfer == "1",
+      isShow: isShowAtt("paymentAccountId", "mainObj"),
+      // isShow:
+      //   isShowAtt("paymentAccountId", "mainObj") &&
+      //   formData.data.isPublicTransfer &&
+      //   formData.data.isPublicTransfer == "1",
     },
     {
       type: "input",
@@ -916,10 +917,11 @@ const formConfig = computed(() => {
       placeholder: "请输入开户名",
       itemWidth: 25,
       disabled: !isHaveFinance.value,
-      isShow:
-        isShowAtt("paymentAccountId", "mainObj") &&
-        formData.data.isPublicTransfer &&
-        formData.data.isPublicTransfer == "1",
+      isShow: isShowAtt("paymentAccountId", "mainObj"),
+      // isShow:
+      //   isShowAtt("paymentAccountId", "mainObj") &&
+      //   formData.data.isPublicTransfer &&
+      //   formData.data.isPublicTransfer == "1",
     },
     {
       type: "input",
@@ -928,10 +930,11 @@ const formConfig = computed(() => {
       placeholder: "请输入账号",
       itemWidth: 25,
       disabled: !isHaveFinance.value,
-      isShow:
-        isShowAtt("paymentAccountId", "mainObj") &&
-        formData.data.isPublicTransfer &&
-        formData.data.isPublicTransfer == "1",
+      isShow: isShowAtt("paymentAccountId", "mainObj"),
+      // isShow:
+      //   isShowAtt("paymentAccountId", "mainObj") &&
+      //   formData.data.isPublicTransfer &&
+      //   formData.data.isPublicTransfer == "1",
     },
     {
       type: "title",

src/views/EHSD/saleContract/accountingSubjects/index.vue

@@ -11,6 +11,7 @@
     <div style="padding: 0 20px 20px 20px; background-color: white" v-if="false">
       <!-- default-expand-all   :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" -->
       <el-table v-loading="loading" :height="tableHeight" :data="sourceList.data" row-key="id">
+        <el-table-column prop="subjectsCode" label="代码" width="120" />
         <el-table-column prop="subjectsName" label="名称" />
         <el-table-column prop="calculateItemName" label="核算项目名称" />
         <el-table-column prop="remark" label="备注" />
@@ -122,6 +123,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "代码",
+        prop: "subjectsCode",
+        width: 120,
+      },
+    },
+    {
+      attrs: {
         label: "名称",
         prop: "subjectsName",
         // width: 110,
@@ -144,14 +152,14 @@ const config = computed(() => {
       attrs: {
         label: "排序",
         prop: "sort",
-        // width: 120,
+        width: 80,
       },
     },
     {
       attrs: {
         label: "创建时间",
         prop: "createTime",
-        // width: 160,
+        width: 160,
       },
     },
 

src/views/JST/shopManage/index.vue

@@ -287,12 +287,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/finance/fundManage/costControl/index.vue

@@ -323,7 +323,7 @@ const config = computed(() => {
                     },
                   }
                 : {},
-              row.status == 10 || row.status == 30
+              row.status == 10
                 ? {
                     attrs: {
                       label: "作废",

src/views/finance/fundManage/kdCompany/index.vue

@@ -257,12 +257,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/finance/fundManage/payee/index.vue

@@ -203,12 +203,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/finance/fundManage/paymentType/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="pageIndexClass">
     <div class="content">
-      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" highlight-current-row :action-list="[
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :hidePagination="true" :config="config" :loading="loading"
+               highlight-current-row :action-list="[
           {
             text: '添加',
             action: () => openModal('add'),
@@ -64,7 +65,7 @@ const sourceList = ref({
   pagination: {
     total: 0,
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 999,
     keyword: "",
   },
 });

src/views/report/accountBalance/index.vue

@@ -17,7 +17,7 @@
       <div style="padding:0 15px;background:#fff">
         <el-table :data="sourceList.data" :height="tableHeight" style="width: 100%;margin-top:-10px" v-loading="loading" border
                   :span-method="objectSpanMethod" :row-class-name="getRowClass" id="my-table">
-          <el-table-column prop="subjectsCode" label="科目代码" width="120" fixed="left">
+          <el-table-column prop="subjectsCode" label="科目代码" width="80" fixed="left">
             <template #default="{ row, $index }">
               <div style="width: 100%">
                 <span v-if="$index < sourceList.data.length - 1"> {{row.subjectsCode}}</span>
@@ -27,7 +27,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="subjectsName" label="科目名称" width="90" fixed="left" />
+          <el-table-column prop="subjectsName" label="科目名称" width="140" fixed="left" />
           <el-table-column prop="calculateItemStr" label="核算项目" min-width="150" fixed="left" />
           <el-table-column prop="yearBeginBalance" label="年初余额" width="90" fixed="left" align="right">
             <template #default="{ row, $index }">

src/views/report/remittanceDetails/index.vue

@@ -3,14 +3,13 @@
     <div class="content">
       <byTable :source="sourceList.data" :pagination="sourceList.pagination" :selectConfig="selectConfig" :config="config" :loading="loading"
                highlight-current-row :action-list="[
-        
-        ]" @get-list="getList">
-
-        <!-- {
+           {
         text: '导出Excel',
         action: () => exportExcel(),
         disabled: false,
-        } -->
+        }
+        ]" @get-list="getList">
+
         <template #code="{item}">
           <div style="width:100%">
             <span class="el-click" @click="getDtl(item)">{{item.code}}</span>
@@ -93,6 +92,8 @@ const sourceList = ref({
     isSettlement: "",
     accountAgeDate: "",
     accountAge: "",
+    beginTime: "",
+    endTime: "",
   },
 });
 const loading = ref(false);
@@ -149,32 +150,15 @@ const contractType = ref([
 ]);
 const selectConfig = computed(() => {
   return [
-    // {
-    //   label: "是否可结算",
-    //   prop: "isSettlement",
-    //   data: [
-    //     {
-    //       label: "是",
-    //       value: "1",
-    //     },
-    //     {
-    //       label: "否",
-    //       value: "0",
-    //     },
-    //   ],
-    // },
-    // {
-    //   type: "time",
-    //   itemType: "date",
-    //   label: "账龄日期",
-    //   placeholder: "请选择",
-    //   prop: "accountAgeDate",
-    //   placeholderOne: "",
-    //   propOne: "",
-    //   fn: () => {
-    //     getList();
-    //   },
-    // },
+    {
+      type: "time",
+      itemType: "date",
+      label: "交易日期",
+      placeholder: "开始日期",
+      prop: "beginTime",
+      placeholderOne: "结束日期",
+      propOne: "endTime",
+    },
     // {
     //   label: "账龄",
     //   prop: "accountAge",
@@ -194,7 +178,7 @@ const config = computed(() => {
     // },
     {
       attrs: {
-        label: "打款日期",
+        label: "交易时间",
         prop: "transactionTime",
         width: 160,
         fixed: "left",
@@ -720,9 +704,12 @@ const changeDate = (settleStartDate, settleEndDate, id) => {
 const exportExcel = () => {
   proxy.msgTip("正在导出，请稍后", 2);
   proxy
-    .postTwo("/report/orderSummaryExcelExport", sourceList.value.pagination)
+    .postTwo(
+      "/report/finance/remitDetailExcelExport",
+      sourceList.value.pagination
+    )
     .then((res) => {
-      proxy.downloadFile(res, "订单汇总.xlsx");
+      proxy.downloadFile(res, "汇款明细.xlsx");
     });
 };
 </script>

src/views/systemTenant/otherManage/artCopyright/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/systemTenant/otherManage/contractor/index.vue

@@ -202,12 +202,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/systemTenant/otherManage/patentManage/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/systemTenant/otherManage/trademarkManage/index.vue

@@ -195,12 +195,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
   ];
 });

src/views/systemTenant/tenant/deptTenant/index.vue

@@ -211,12 +211,12 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
     },
 
     // {

src/views/systemTenant/tenant/userTenant/index.vue

@@ -477,17 +477,16 @@ const formConfig = computed(() => {
       itemWidth: 50,
       itemType: "text",
     },
-
     {
       type: "input",
       prop: "jdSubjectCode",
-      label: "金蝶编号",
+      label: "金蝶核算项目编号",
       itemWidth: 50,
     },
     {
       type: "input",
       prop: "jdSubjectName",
-      label: "金蝶名称",
+      label: "金蝶核算项目名称",
       itemWidth: 50,
     },
     {