From 0004cee5fbb846c71c682dfce66567f1e1a26da2 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Fri, 14 Jun 2024 14:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E5=92=8C=E6=89=80=E6=9C=89=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/CwaccountvoucherMapper.xml     |   12 +-
 .../jnpf/entity/CwaccountvoucherEntity.java   |    2 +
 .../src/views/extend/cwaccount/form.vue       |   57 +-
 .../src/views/extend/cwaccount/index.vue      |   15 +-
 .../views/extend/cwpaymentreceipt/index.vue   | 1012 +++++++++--------
 .../src/views/extend/cwsettlement/index.vue   |   33 +-
 .../views/extend/paymentapplication/index.vue | 1005 ++++++++--------
 .../src/views/scm/finance/cwcost/index.vue    |   15 +-
 .../purchaseCenter/deliveryOrder/index.vue    |   12 +-
 .../purchaseCenter/deliveryVoucher/index.vue  |   15 +-
 .../purchaseCenter/purchaseOrder/index.vue    |   15 +-
 .../scm/purchaseCenter/receiptOrder/index.vue |   12 +-
 .../purchaseCenter/receiptVoucher/index.vue   |   15 +-
 .../purchaseCenter/returnCargoOrder/index.vue |   12 +-
 .../scm/saleCenter/deliveryOrder/index.vue    |   13 +-
 .../scm/saleCenter/deliveryVoucher/index.vue  |   14 +-
 .../scm/saleCenter/receiptOrder/index.vue     |   12 +-
 .../scm/saleCenter/receiptVoucher/index.vue   |   15 +-
 .../scm/saleCenter/redeliveryOrder/index.vue  |   11 +-
 .../scm/saleCenter/returnCargoOrder/index.vue |   13 +-
 .../views/scm/saleCenter/saleOrder/index.vue  |   13 +-
 .../warehousinginspection/index.vue           |   11 +-
 .../src/views/scm/workorder/index.vue         |   16 +-
 23 files changed, 1196 insertions(+), 1154 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
index 3d5ec63d..c3f55d0b 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
@@ -164,7 +164,8 @@
         IFNULL(j.price_rate,0) contractPrice,
         f.unit settlementUnit,
         k.name productName,
-        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
+        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
+        c.business_order_id businessOrderId
         from jg_warehousing_storage_poundlist a
         LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
         LEFT JOIN jg_voucher c on a.voucher_id = c.id
@@ -208,7 +209,8 @@
         IFNULL(j.price_rate,0) contractPrice,
         f.unit settlementUnit,
         k.name productName,
-        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
+        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
+        c.business_order_id businessOrderId
         from jg_warehousing_storage_poundlist a
         LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
         LEFT JOIN jg_voucher c on a.voucher_id = c.id
@@ -295,7 +297,8 @@
         IFNULL(j.price_rate,0) contractPrice,
         f.unit settlementUnit,
         k.name productName,
-        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
+        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
+        c.business_order_id businessOrderId
         from jg_warehousing_outbound_poundlist a
         LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
         LEFT JOIN jg_voucher c on a.voucher_id = c.id
@@ -382,7 +385,8 @@
         IFNULL(j.price_rate,0) contractPrice,
         f.unit settlementUnit,
         k.name productName,
-        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
+        IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
+        c.business_order_id businessOrderId
         from jg_warehousing_outbound_poundlist a
         LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
         LEFT JOIN jg_voucher c on a.voucher_id = c.id
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
index e4c08557..91ca9b4b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
@@ -126,4 +126,6 @@ public class CwaccountvoucherEntity  {
     private String departmentId;
     @TableField("ORGANIZE_JSON_ID")
     private String organizeJsonId;
+    @TableField(exist = false)
+    private String businessOrderId;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
index 8baa7674..61071e7b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
@@ -1801,7 +1801,8 @@ export default {
           settlementTotalNoOptions: [],
           remark: '',
           remarkOptions: [],
-          enabledmark: undefined
+          enabledmark: undefined,
+          businessOrderId: undefined
         },
         cwaccountsummaryList: {
           productId: '',
@@ -2956,8 +2957,12 @@ export default {
     },
     sameReduce(arr) {
       let result = arr.reduce((acc, cur) => {
+        // let found = acc.find((item) => {
+        //   return  item.productId === cur.productId
+        // })
+        debugger
         let found = acc.find((item) => {
-          return item.productId === cur.productId
+          return item.businessOrderId === cur.businessOrderId && item.productId === cur.productId
         })
         if (found) {
           found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum)).toFixed(4);
@@ -2971,7 +2976,7 @@ export default {
             found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
           }
         } else {
-          acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo })
+          acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo, businessOrderId: cur.businessOrderId })
         }
         return acc
       }, [])
@@ -2986,32 +2991,32 @@ export default {
         })
         return
       }
-      debugger
-      var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
-      var order = this.dataForm.cwaccountstorageList[0].orderCode
-      console.log(order);
-      var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
-      var productid = this.dataForm.cwaccountvoucherList[0].productId
 
+      // var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
+      // var order = this.dataForm.cwaccountstorageList[0].orderCode
+      // console.log(order);
+      // var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
+      // var productid = this.dataForm.cwaccountvoucherList[0].productId
+      // data.forEach(item => {
+      //   dataProduct.forEach(item1 => {
+      //     // const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
+      //     // if (item.orderCode == order && item1.productId == productid) {
+      //     if (item.orderCode == order) {
+      //       this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
+      //     } else {
+      //       this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
+      //       return
+      //     }
+      //   })
+      // })
 
-      data.forEach(item => {
-        dataProduct.forEach(item1 => {
-          debugger
-          // const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
-          if (item.orderCode == order && item1.productId == productid) {
-            this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
-          } else {
-            this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
-            return
-          }
-        })
+      this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
+      this.dataForm.cwaccountsummaryList.forEach(item => {
+        item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
+        item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
+        console.log(item.settlementPriceNo + "111");
       })
-      // this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
-      // this.dataForm.cwaccountsummaryList.forEach(item => {
-      //   item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
-      //   item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
-      //   console.log(item.settlementPriceNo + "111");
-      // })
+
       // console.log(this.dataForm.cwaccountsummaryList + "111");
       /* let item = {
         productId: undefined,
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
index 06bf070c..802fe93c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -28,13 +35,7 @@
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue
index 7211a995..1987b6ff 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -10,17 +17,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="类型">
-              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
+              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
+                :props="typeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item label="收款方">
               <el-input v-model="query.payee" placeholder="请输入" clearable> </el-input>
@@ -37,7 +39,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -52,7 +55,8 @@
           <div>
             <!-- <el-button type="primary" icon="el-icon-download" @click="downPayment()">下载
             </el-button> -->
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -61,12 +65,13 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"
-          show-summary :summary-method="getTableSummaries" border>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod" show-summary :summary-method="getTableSummaries" border>
           <el-table-column label="类型" prop="type" align="center" width="150" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.type}}
@@ -122,547 +127,550 @@
               </el-button> -->
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
-              <el-button size="mini" type="text" :disabled="scope.row.flowState !=2 && ((scope.row.businessType == 1 && scope.row.type == 1) || (scope.row.businessType == 4 && scope.row.type == 2))"
+              <el-button size="mini" type="text"
+                :disabled="scope.row.flowState !=2 && ((scope.row.businessType == 1 && scope.row.type == 1) || (scope.row.businessType == 4 && scope.row.type == 2))"
                 @click="downPayment(scope.row.id)">下载</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
-
-
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getFormById
-  } from '@/api/workFlow/FormDesign'
-  import {
-    getFlowList
-  } from '@/api/workFlow/FlowEngine'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
-  import {getToken} from "@/utils/auth";
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getFormById
+} from '@/api/workFlow/FormDesign'
+import {
+  getFlowList
+} from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
+import { getToken } from "@/utils/auth";
 
-  export default {
-    components: {
-      FlowBox,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
 
-        showAll: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          code: undefined,
-          type: undefined,
-          payee: undefined,
-          payer: undefined,
-          preparationTime: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: false,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        typeOptions: [{
-          "fullName": "采购付款",
-          "id": "1"
-        }, {
-          "fullName": "销售付款",
-          "id": "2"
-        }, {
-          "fullName": "其他付款",
-          "id": "3"
-        }],
-        typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          settlementId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        code: undefined,
+        type: undefined,
+        payee: undefined,
+        payer: undefined,
+        preparationTime: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: false,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      typeOptions: [{
+        "fullName": "采购付款",
+        "id": "1"
+      }, {
+        "fullName": "销售付款",
+        "id": "2"
+      }, {
+        "fullName": "其他付款",
+        "id": "3"
+      }],
+      typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {
+        settlementId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("547733293450172677").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({
+          type: 'error',
+          message: e.message
+        });
+        this.$router.push('/404');
+      })
+    })
+  },
+  methods: {
+    downPayment(id) {
+      let url = "/api/scm/Cwpaymentreceipt/downloadPdf/" + id + "/" + getToken();
+      debugger
+      // console.log(url);
+      this.jnpf.downloadFile(url);
     },
-    created() {
-      getFormById("547733293450172677").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = 'general'
+        this.toFormDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
         })
       })
     },
-    methods: {
-      downPayment(id) {
-        let url = "/api/scm/Cwpaymentreceipt/downloadPdf/" + id +"/"+getToken();
-        debugger
-        // console.log(url);
-        this.jnpf.downloadFile(url);
-      },
-      toDetail(defaultValue, modelId) {
-        if (!defaultValue) return
-        getConfigData(modelId).then(res => {
-          if (!res.data || !res.data.formData) return
-          let formData = JSON.parse(res.data.formData)
-          formData.popupType = 'general'
-          this.toFormDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-          })
-        })
-      },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
         this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
+          this.$refs.treeBox.setCurrentKey(null)
         })
-      },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
-      },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
           }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
         }
-      },
-      getTableSummaries(param) {
-        const {
-          columns,
-          data
-        } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          } else if ([].includes(column.property)) {
-            const values = data.map(item => {
-              if (column.property.includes('.')) {
-                const [attr1, attr2] = column.property.split('.')
-                return Number(item[attr1][attr2])
-              }
-              return Number(item[column.property])
-            });
-            if (!values.every(value => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
-                if (!isNaN(value)) {
-                  return prev + curr;
-                } else {
-                  return prev;
-                }
-              }, 0).toFixed(2);
-              if ([].includes(column.property)) {
-                sums[index] = thousandsFormat(sums[index]);
-              }
-            } else {
-              sums[index] = '';
-            }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
           }
         })
-        return sums;
-      },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
-      },
-      transformColumnList(columnList) {
-        let list = []
-        for (let i = 0; i < columnList.length; i++) {
-          const e = columnList[i];
-          if (!e.prop.includes('-')) {
-            list.push(e)
-          } else {
-            let prop = e.prop.split('-')[0]
-            let label = e.label.split('-')[0]
-            let vModel = e.prop.split('-')[1]
-            let newItem = {
-              align: "center",
-              jnpfKey: "table",
-              prop,
-              label,
-              children: []
+      }
+    },
+    getTableSummaries(param) {
+      const {
+        columns,
+        data
+      } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        } else if ([].includes(column.property)) {
+          const values = data.map(item => {
+            if (column.property.includes('.')) {
+              const [attr1, attr2] = column.property.split('.')
+              return Number(item[attr1][attr2])
             }
-            e.vModel = vModel
-            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-            if (!list.some(o => o.prop === prop)) list.push(newItem)
-            for (let i = 0; i < list.length; i++) {
-              if (list[i].prop === prop) {
-                list[i].children.push(e)
-                break
+            return Number(item[column.property])
+          });
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
               }
+            }, 0).toFixed(2);
+            if ([].includes(column.property)) {
+              sums[index] = thousandsFormat(sums[index]);
             }
+          } else {
+            sums[index] = '';
           }
         }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
-      },
-      arraySpanMethod({
-        column
-      }) {
-        for (let i = 0; i < this.mergeList.length; i++) {
-          if (column.property == this.mergeList[i].prop) {
-            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      })
+      return sums;
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
+    },
+    transformColumnList(columnList) {
+      let list = []
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes('-')) {
+          list.push(e)
+        } else {
+          let prop = e.prop.split('-')[0]
+          let label = e.label.split('-')[0]
+          let vModel = e.prop.split('-')[1]
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
           }
-        }
-      },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
+          e.vModel = vModel
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+          if (!list.some(o => o.prop === prop)) list.push(newItem)
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e)
+              break
             }
-            item.children.unshift(child)
           }
-        })
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            item.children.forEach((child, index) => {
-              if (index == 0) {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 1,
-                  colspan: item.children.length
-                })
-              } else {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 0,
-                  colspan: 0
-                })
-              }
-            })
-          } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
-          }
-        })
-      },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
-            }
-          } else {
-            exportList.push(list[i])
+        }
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    arraySpanMethod({
+      column
+    }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + '-child-first'
           }
+          item.children.unshift(child)
         }
-        this.exportList = exportList
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      async initSearchDataAndListData() {
-        await this.initSearchData()
-        //this.initData()
-      },
-      //初始化查询的默认数据
-      async initSearchData() {
-        let date = new Date();
-        let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-        this.query.preparationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          keyword: this.keyword,
-          dataType: 0,
-          menuId: this.menuId,
-          moduleId: '547733293450172677',
-        };
-        request({
-          url: `/api/scm/Cwpaymentreceipt/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = res.data.list;
-          this.list = _list.map(o => ({
-            ...o,
-            ...this.expandObj,
-          }))
-          this.total = res.data.pagination.total
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Cwpaymentreceipt/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      })
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              })
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              })
+            }
           })
-        }).catch(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/Cwpaymentreceipt")
-        })
-      },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
-      },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        this.initData()
-      },
-      addOrUpdateHandle(row, flowState) {
-        if (!row) {
-          this.addHandle();
         } else {
-          this.updateHandle(row, flowState)
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
         }
+      }
+      this.exportList = exportList
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    sortChange({
+      column,
+      prop,
+      order
+    }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData()
+      //this.initData()
+    },
+    //初始化查询的默认数据
+    async initSearchData() {
+      let date = new Date();
+      let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+      this.query.preparationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: '547733293450172677',
+      };
+      request({
+        url: `/api/scm/Cwpaymentreceipt/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj,
+        }))
+        this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/scm/Cwpaymentreceipt/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Cwpaymentreceipt/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
-      },
-      //流程改造后相关调用方法
-      updateHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      toApprovalDetail(row) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId,
-          opType: 0,
-          status: row.currentState
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      addHandle() {
-        if (!this.flowList.length) {
           this.$message({
-            type: 'error',
-            message: '流程不存在'
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
-        } else {
-          this.flowListVisible = true
-        }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
-        }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Cwpaymentreceipt")
+      })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList)
+      })
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/scm/Cwpaymentreceipt/Actions/Export`,
+        method: 'post',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.sort = "desc"
+      this.listQuery.sidx = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
index 1616df09..08e2372a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -21,13 +28,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -86,13 +87,19 @@
           </el-table-column>
           <el-table-column prop="paymentState" label="付款状态" width="100" align="center">
             <template slot-scope="scope">
-              <el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)">未付款</el-tag>
-              <el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)">部分付款</el-tag>
-              <el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)">已付款</el-tag>
+              <el-tag type="warning"
+                v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)">未付款</el-tag>
+              <el-tag type="success"
+                v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)">部分付款</el-tag>
+              <el-tag type="danger"
+                v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)">已付款</el-tag>
 
-              <el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)">未收款</el-tag>
-              <el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)">部分收款</el-tag>
-              <el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)">已收款</el-tag>
+              <el-tag type="warning"
+                v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)">未收款</el-tag>
+              <el-tag type="success"
+                v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)">部分收款</el-tag>
+              <el-tag type="danger"
+                v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)">已收款</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250">
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue
index efd487c0..253844fa 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -18,13 +25,6 @@
               <el-input v-model="query.payer" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -36,7 +36,8 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -45,11 +46,13 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod" border>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod" border>
           <el-table-column label="类型" prop="type" align="center" width="150" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.type}}
@@ -87,547 +90,549 @@
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
-                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"
+                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
-              <el-button size="mini" type="text"
-                @click="downPayment(scope.row.id)">下载</el-button>
+              <el-button size="mini" type="text" @click="downPayment(scope.row.id)">下载</el-button>
               <el-button type="text" @click="closeCaseHandle(scope.row)" v-has="'btn_edit'">结案
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
-
-
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getFormById
-  } from '@/api/workFlow/FormDesign'
-  import {
-    getFlowList
-  } from '@/api/workFlow/FlowEngine'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
-  import {getToken} from "@/utils/auth";
-  import JNPFForm from './caseCloseForm'
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getFormById
+} from '@/api/workFlow/FormDesign'
+import {
+  getFlowList
+} from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
+import { getToken } from "@/utils/auth";
+import JNPFForm from './caseCloseForm'
 
-  export default {
-    components: {
-      JNPFForm,
-      FlowBox,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    JNPFForm,
+    FlowBox,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
-        formVisible: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          code: undefined,
-          payee: undefined,
-          payer: undefined,
-          preparationTime: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        typeOptions: [{
-          "fullName": "采购付款",
-          "id": "1"
-        }],
-        typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        caseStatusOptions: [{
-          "fullName": "正常",
-          "id": "1"
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
+      formVisible: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        code: undefined,
+        payee: undefined,
+        payer: undefined,
+        preparationTime: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      typeOptions: [{
+        "fullName": "采购付款",
+        "id": "1"
+      }],
+      typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      caseStatusOptions: [{
+        "fullName": "正常",
+        "id": "1"
+      }, {
+        "fullName": "结案",
+        "id": "2"
+      }],
+      caseStatusProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {
+        subjectId: [],
+        contractId: [{
+          "dataType": "varchar",
+          "defaultValue": "",
+          "field": "subjectId",
+          "fieldName": "",
+          "id": "HmoSU22",
+          "jnpfKey": "popupSelect",
+          "relationField": "subjectId",
+          "required": "1"
         }, {
-          "fullName": "结案",
-          "id": "2"
+          "dataType": "varchar",
+          "defaultValue": "",
+          "field": "contractType",
+          "fieldName": "",
+          "id": "QnvSU22",
+          "jnpfKey": "radio",
+          "relationField": "type",
+          "required": "1"
         }],
-        caseStatusProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          subjectId: [],
-          contractId: [{
-            "dataType": "varchar",
-            "defaultValue": "",
-            "field": "subjectId",
-            "fieldName": "",
-            "id": "HmoSU22",
-            "jnpfKey": "popupSelect",
-            "relationField": "subjectId",
-            "required": "1"
-          }, {
-            "dataType": "varchar",
-            "defaultValue": "",
-            "field": "contractType",
-            "fieldName": "",
-            "id": "QnvSU22",
-            "jnpfKey": "radio",
-            "relationField": "type",
-            "required": "1"
-          }],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("568458500523427653").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({
+          type: 'error',
+          message: e.message
+        });
+        this.$router.push('/404');
+      })
+    })
+  },
+  methods: {
+    downPayment(id) {
+      let url = "/api/scm/PaymentApplication/downloadPdf/" + id + "/" + getToken();
+      this.jnpf.downloadFile(url);
     },
-    created() {
-      getFormById("568458500523427653").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = 'general'
+        this.toFormDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
         })
       })
     },
-    methods: {
-      downPayment(id) {
-        let url = "/api/scm/PaymentApplication/downloadPdf/" + id +"/"+getToken();
-        this.jnpf.downloadFile(url);
-      },
-      toDetail(defaultValue, modelId) {
-        if (!defaultValue) return
-        getConfigData(modelId).then(res => {
-          if (!res.data || !res.data.formData) return
-          let formData = JSON.parse(res.data.formData)
-          formData.popupType = 'general'
-          this.toFormDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-          })
-        })
-      },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
         this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
+          this.$refs.treeBox.setCurrentKey(null)
         })
-      },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
-      },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
-          }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
-        }
-      },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
-      },
-      transformColumnList(columnList) {
-        let list = []
-        for (let i = 0; i < columnList.length; i++) {
-          const e = columnList[i];
-          if (!e.prop.includes('-')) {
-            list.push(e)
-          } else {
-            let prop = e.prop.split('-')[0]
-            let label = e.label.split('-')[0]
-            let vModel = e.prop.split('-')[1]
-            let newItem = {
-              align: "center",
-              jnpfKey: "table",
-              prop,
-              label,
-              children: []
-            }
-            e.vModel = vModel
-            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-            if (!list.some(o => o.prop === prop)) list.push(newItem)
-            for (let i = 0; i < list.length; i++) {
-              if (list[i].prop === prop) {
-                list[i].children.push(e)
-                break
-              }
-            }
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
           }
         }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
-      },
-      arraySpanMethod({
-        column
-      }) {
-        for (let i = 0; i < this.mergeList.length; i++) {
-          if (column.property == this.mergeList[i].prop) {
-            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-          }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
         }
-      },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
-            }
-            item.children.unshift(child)
-          }
-        })
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            item.children.forEach((child, index) => {
-              if (index == 0) {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 1,
-                  colspan: item.children.length
-                })
-              } else {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 0,
-                  colspan: 0
-                })
-              }
-            })
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
           } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
+            resolve([]);
           }
         })
-      },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
+      }
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
+    },
+    transformColumnList(columnList) {
+      let list = []
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes('-')) {
+          list.push(e)
+        } else {
+          let prop = e.prop.split('-')[0]
+          let label = e.label.split('-')[0]
+          let vModel = e.prop.split('-')[1]
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
+          }
+          e.vModel = vModel
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+          if (!list.some(o => o.prop === prop)) list.push(newItem)
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e)
+              break
             }
-          } else {
-            exportList.push(list[i])
           }
         }
-        this.exportList = exportList
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      async initSearchDataAndListData() {
-        await this.initSearchData()
-        this.initData()
-      },
-      //初始化查询的默认数据
-      async initSearchData() {
-        let date = new Date();
-        let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-        this.query.preparationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          keyword: this.keyword,
-          dataType: 0,
-          menuId: this.menuId,
-          moduleId: '568458500523427653',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/PaymentApplication/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = res.data.list;
-          this.list = _list.map(o => ({
-            ...o,
-            ...this.expandObj,
-          }))
-          this.total = res.data.pagination.total
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/PaymentApplication/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    arraySpanMethod({
+      column
+    }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + '-child-first'
+          }
+          item.children.unshift(child)
+        }
+      })
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              })
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              })
+            }
           })
-        }).catch(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/PaymentApplication")
-        })
-      },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
-      },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        this.initData()
-      },
-      addOrUpdateHandle(row, flowState) {
-        if (!row) {
-          this.addHandle();
         } else {
-          this.updateHandle(row, flowState)
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
         }
+      }
+      this.exportList = exportList
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    sortChange({
+      column,
+      prop,
+      order
+    }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData()
+      this.initData()
+    },
+    //初始化查询的默认数据
+    async initSearchData() {
+      let date = new Date();
+      let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+      this.query.preparationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: '568458500523427653',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/PaymentApplication/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj,
+        }))
+        this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/scm/PaymentApplication/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/PaymentApplication/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
-      },
-      //流程改造后相关调用方法
-      updateHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      closeCaseHandle(row, isDetail) {
-          let id = row?row.id:""
-          this.formVisible = true
-          this.$nextTick(() => {
-              this.$refs.JNPFForm.init(id, isDetail,this.list)
-          })
-      },
-      toApprovalDetail(row) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId,
-          opType: 0,
-          status: row.currentState
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      addHandle() {
-        if (!this.flowList.length) {
           this.$message({
-            type: 'error',
-            message: '流程不存在'
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
-        } else {
-          this.flowListVisible = true
-        }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
-        }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/PaymentApplication")
+      })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList)
+      })
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/scm/PaymentApplication/Actions/Export`,
+        method: 'post',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.sort = "desc"
+      this.listQuery.sidx = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    closeCaseHandle(row, isDetail) {
+      let id = row ? row.id : ""
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail, this.list)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
index fc29351f..87a94bd2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -14,13 +21,7 @@
                                         " clearable multiple />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item label="费用发生时间">
               <JnpfDateRangePicker v-model="query.costTime" format="yyyy-MM-dd"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
index 2d05fdb4..582b5520 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,6 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
index ceeae4e1..e1e6347d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="凭证编号">
               <el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@@ -15,13 +22,7 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="磅单编号">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
index 41244478..94415e70 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
@@ -3,6 +3,14 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="单据类型">
               <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@@ -36,12 +44,7 @@
             </el-form-item>
           </el-col>
           <template v-if="showAll">
-            <el-col :span="6">
-              <el-form-item label="制单时间">
-                <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item label="配送方式">
                 <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
index 7918d333..b45e632d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,6 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
index 39dc5f3d..fb4da694 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="凭证编号">
               <el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@@ -30,13 +37,7 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="磅单编号">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
index ef8d73de..c1460f6f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,6 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
index 9582ddfe..f5e242b2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,7 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
index 71446ccc..d72edcfb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="凭证编号">
               <el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@@ -15,13 +22,6 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="磅单编号">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
index a3048844..ae9bbe78 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,6 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
index 445f2215..ebfaa0cf 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="凭证编号">
               <el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@@ -15,13 +22,7 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
+
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="磅单编号">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
index cd0256d3..82dc1074 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
@@ -3,11 +3,6 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
-          <el-col :span="6">
-            <el-form-item label="补送订单编号">
-              <el-input v-model="query.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
               <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
@@ -15,6 +10,12 @@
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="补送订单编号">
+              <el-input v-model="query.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
index c17e8132..24e2bc81 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
               <el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@@ -15,12 +21,7 @@
               </JnpfSelect>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
index 43fd1eed..cc7f968a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
@@ -3,6 +3,12 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据类型">
               <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@@ -23,12 +29,7 @@
             </el-form-item>
           </el-col>
           <template v-if="showAll">
-            <el-col :span="6">
-              <el-form-item label="制单时间">
-                <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item label="是否紧急">
                 <JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
index f3d9613a..90dc475d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
@@ -3,17 +3,18 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
-          <el-col :span="6">
-            <el-form-item label="质检单编号">
-              <el-input v-model="query.inspectionCode" placeholder="请输入" clearable> </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
               <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
                 startPlaceholder="开始日期" endPlaceholder="结束日期" />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="质检单编号">
+              <el-input v-model="query.inspectionCode" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="质检类型">
               <JnpfSelect v-model="query.inspectionType" placeholder="请选择" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
index f95ba183..c6684708 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
@@ -3,6 +3,13 @@
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="单据编号">
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@@ -13,21 +20,12 @@
               <el-input v-model="query.businessCode" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col> -->
-
           <el-col :span="6">
             <el-form-item label="商品名称">
               <el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
-              </JnpfDateRangePicker>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="6">
             <el-form-item label="单据类型">
               <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"