diff --git a/jnpf-java-boot/jnpf-web/src/views/client/index.vue b/jnpf-java-boot/jnpf-web/src/views/client/index.vue
index 6711749..2fedc86 100644
--- a/jnpf-java-boot/jnpf-web/src/views/client/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/client/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -36,11 +29,10 @@
             <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>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -59,58 +51,62 @@
                 @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'
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod">
-          <el-table-column prop="wxOpenid" label="微信openid" align="left">
+
+          <el-table-column prop="wxOpenid" label="微信openid" sortable width="250px" align="center">
           </el-table-column>
-          <el-table-column prop="wxUserName" label="微信名" align="left">
+          <el-table-column prop="wxUserName" label="微信名" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="nickName" label="昵称" align="left">
+          <el-table-column prop="nickName" label="昵称" awidth="220px" align="center">
           </el-table-column>
-          <el-table-column prop="mobilePhone" label="手机" align="left" width="100px">
+          <el-table-column prop="mobilePhone" label="手机" width="200px" align="center">
           </el-table-column>
-          <el-table-column label="性别" prop="gender" algin="left">
+          <el-table-column label="性别" prop="gender" width="100px" align="center">
+
             <template slot-scope="scope">
               <span v-if="scope.row.gender === 1">男</span>
               <span v-else-if="scope.row.gender === 2">女</span>
               <span v-else>保密</span>
             </template>
           </el-table-column>
-          <el-table-column prop="birthday" label="生日" align="left">
+          <el-table-column prop="birthday" label="生日" width="200px" align="center">
+
             <template slot-scope="scope">
               <span v-if="scope.row.birthday">
-                {{jnpf.toDate(scope.row.birthday,'yyyy-MM-dd')}}
+                {{ jnpf.toDate(scope.row.birthday, 'yyyy-MM-dd') }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="banlance" label="账户余额" align="left">
+          <el-table-column prop="banlance" label="账户余额" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="membershipNumber" label="会员码" align="left">
+          <el-table-column prop="membershipNumber" label="会员码" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="membershipPoint" label="会员积分" align="left">
+          <el-table-column prop="membershipPoint" label="会员积分" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="membershipLevel" label="会员等级" align="left">
+          <el-table-column prop="membershipLevel" label="会员等级" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="consumePreference" label="消费喜好" align="left">
+          <el-table-column prop="consumePreference" label="消费喜好" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="taxTitle" label="发票抬头" align="left">
+          <el-table-column prop="taxTitle" label="发票抬头" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="taxId" label="企业税号" align="left">
+          <el-table-column prop="taxId" label="企业税号" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="lastLogIp" label="最后登录IP" align="left">
+          <el-table-column prop="lastLogIp" label="最后登录IP" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="lastLogTime" label="最后登录时间" align="left"  width="95px">
+          <el-table-column prop="lastLogTime" label="最后登录时间" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="enabledMark" label="有效标志" align="left">
+          <el-table-column prop="enabledMark" label="有效标志" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left"  width="90px">
+          <el-table-column prop="creatorTime" label="创建时间" width="200px" align="center">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="150" align="center">
+
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
@@ -121,19 +117,17 @@
             </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" />
 
     <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" />
+    <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" />
   </div>
 </template>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/clientaccountdetail/index.vue b/jnpf-java-boot/jnpf-web/src/views/clientaccountdetail/index.vue
index bf2fc5a..d530f3b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/clientaccountdetail/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/clientaccountdetail/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,24 +5,14 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="变动类型">
-              <JnpfSelect
-                v-model="query.changeType"
-                placeholder="请选择"
-                clearable
-                :options="changeTypeOptions"
-                :props="changeTypeProps"
-                multiple
-              >
+              <JnpfSelect v-model="query.changeType" placeholder="请选择" clearable :options="changeTypeOptions"
+                :props="changeTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
-              <el-input
-                v-model="query.orderNumber"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.orderNumber" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -42,37 +25,19 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="账户余额">
-                <el-input
-                  v-model="query.banlance"
-                  placeholder="请输入"
-                  clearable
-                >
+                <el-input v-model="query.banlance" placeholder="请输入" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
           </template>
           <el-col :span="6">
             <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="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>
-              <el-button
-                type="text"
-                icon="el-icon-arrow-up"
-                @click="showAll = false"
-                v-else
-              >
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -91,52 +56,40 @@
           </div> -->
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          :span-method="arraySpanMethod"
-        >
-          <el-table-column prop="clientId" label="散户" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+          <el-table-column prop="clientId" label="散户" sortable width="200px" align="center">
           </el-table-column>
-          <el-table-column label="变动类型" prop="changeType" algin="left">
+          <el-table-column label="变动类型" prop="changeType" width="100px" align="center">
+
             <template slot-scope="scope">
               {{ scope.row.changeType }}
             </template>
           </el-table-column>
-          <el-table-column prop="orderNumber" label="订单编号" align="left">
+          <el-table-column prop="orderNumber" label="订单编号" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="amount" label="金额" align="left">
+          <el-table-column prop="amount" label="金额" width="100px" align="center">
           </el-table-column>
-          <el-table-column prop="banlance" label="账户余额" align="left">
+          <el-table-column prop="banlance" label="账户余额" width="100px" align="center">
           </el-table-column>
-          <el-table-column prop="remark" label="备注" align="left">
+          <el-table-column prop="remark" label="备注" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" width="200px" align="center">
           </el-table-column>
           <!-- <el-table-column prop="creatorUserId" label="创建用户" align="left">
           </el-table-column> -->
-          <el-table-column label="操作" fixed="right" width="150">
-            <template slot-scope="scope">
+          <el-table-column label="操作" fixed="right" width="150" align="center">
+
+            <template slot-scope="scope" >
               <!-- <el-button type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑
               </el-button>
@@ -146,40 +99,22 @@
                 @click="handleDel(scope.row.id)"
                 >删除
               </el-button> -->
-              <el-button type="text" @click="goDetail(scope.row.id)"
-                >详情
+              <el-button type="text" @click="goDetail(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" />
 
     <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -439,7 +374,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -483,7 +418,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
index f2b9f61..7dac0d7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,48 +5,28 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="流水编号">
-              <el-input
-                v-model="query.billNumber"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.billNumber" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单编号">
-              <el-input
-                v-model="query.orderNumber"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.orderNumber" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单类型">
-              <JnpfSelect
-                v-model="query.orderTypeId"
-                placeholder="请选择"
-                clearable
-                :options="orderTypeIdOptions"
-                :props="orderTypeIdProps"
-                multiple
-              >
+              <JnpfSelect v-model="query.orderTypeId" placeholder="请选择" clearable :options="orderTypeIdOptions"
+                :props="orderTypeIdProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="单据状态">
-                <JnpfSelect
-                  v-model="query.billStatusId"
-                  placeholder="请选择"
-                  clearable
-                  :options="billStatusIdOptions"
-                  :props="billStatusIdProps"
-                  multiple
-                >
+                <JnpfSelect v-model="query.billStatusId" placeholder="请选择" clearable :options="billStatusIdOptions"
+                  :props="billStatusIdProps" multiple>
                 </JnpfSelect>
               </el-form-item>
             </el-col>
@@ -71,26 +44,12 @@
           </template>
           <el-col :span="6">
             <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="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>
-              <el-button
-                type="text"
-                icon="el-icon-arrow-up"
-                @click="showAll = false"
-                v-else
-              >
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -109,78 +68,57 @@
           </div> -->
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          :span-method="arraySpanMethod"
-        >
-          <el-table-column prop="billNumber" label="流水编号" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+          <el-table-column prop="billNumber" label="流水编号"  sortable width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="orderNumber" label="订单编号" align="left">
+          <el-table-column prop="orderNumber" label="订单编号" width="200px"  align="center">
           </el-table-column>
-          <el-table-column prop="orderTypeId" label="订单类型" align="left">
+          <el-table-column prop="orderTypeId" label="订单类型" width="100px"  align="center">
           </el-table-column>
-          <el-table-column prop="billStatusId" label="单据状态" align="left">
+          <el-table-column prop="billStatusId" label="单据状态" width="100px"  align="center">
           </el-table-column>
-          <el-table-column prop="incomeAmount" label="收入（元）" align="left">
+          <el-table-column prop="incomeAmount" label="收入（元）" width="100px"  align="center">
+
             <template slot-scope="scope">
-              <span
-                v-if="
-                  scope.row.incomeAmount != null ||
-                  scope.row.incomeAmount != undefined
-                "
-              >
+              <span v-if="scope.row.incomeAmount != null ||
+        scope.row.incomeAmount != undefined
+        ">
                 +{{ scope.row.incomeAmount }}
               </span>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column prop="payoutAmount" label="支出（元）" align="left">
+          <el-table-column prop="payoutAmount" label="支出（元）" width="100px"  align="center">
+
             <template slot-scope="scope">
-              <span
-                v-if="
-                  scope.row.payoutAmount != null ||
-                  scope.row.payoutAmount != undefined
-                "
-              >
+              <span v-if="scope.row.payoutAmount != null ||
+        scope.row.payoutAmount != undefined
+        ">
                 -{{ scope.row.payoutAmount }}
               </span>
               <span v-else></span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="accountBalance"
-            label="余额（元）"
-            align="left"
-          >
+          <el-table-column prop="accountBalance" label="余额（元）" width="100px"  align="center">
           </el-table-column>
-          <el-table-column prop="remark" label="备注" align="left">
+          <el-table-column prop="remark" label="备注" width="220px"   align="center">
           </el-table-column>
           <!-- <el-table-column prop="creatorUserId" label="创建用户" align="left">
           </el-table-column> -->
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" width="180px" align="center">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="150" align="center">
+
             <template slot-scope="scope">
               <!-- <el-button type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑
@@ -191,40 +129,22 @@
                 @click="handleDel(scope.row.id)"
                 >删除
               </el-button> -->
-              <el-button type="text" @click="goDetail(scope.row.id)"
-                >详情
+              <el-button type="text" @click="goDetail(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" />
 
     <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -494,7 +414,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -538,7 +458,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue
index 132f0a7..2d3e178 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,127 +5,70 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="回收站编号">
-              <el-input
-                v-model="query.stationCode"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.stationCode" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="回收站名称">
-              <el-input
-                v-model="query.stationName"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.stationName" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="经营模式">
-              <JnpfSelect
-                v-model="query.managementModel"
-                placeholder="请选择"
-                clearable
-                :options="managementModelOptions"
-                :props="managementModelProps"
-                multiple
-              >
+              <JnpfSelect v-model="query.managementModel" placeholder="请选择" clearable :options="managementModelOptions"
+                :props="managementModelProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="所在城市">
-                <JnpfAreaSelect
-                  v-model="query.city"
-                  placeholder="请选择"
-                  :level="1"
-                  clearable
-                />
+                <JnpfAreaSelect v-model="query.city" placeholder="请选择" :level="1" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="回收类目">
-                <JnpfSelect
-                  v-model="query.recycleTypeIds"
-                  placeholder="请选择"
-                  clearable
-                  :options="recycleTypeIdsOptions"
-                  :props="recycleTypeIdsProps"
-                  multiple
-                >
+                <JnpfSelect v-model="query.recycleTypeIds" placeholder="请选择" clearable :options="recycleTypeIdsOptions"
+                  :props="recycleTypeIdsProps" multiple>
                 </JnpfSelect>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="范围内小区-小区名称">
-                <el-input
-                  v-model="query.tableField119_housingEstateName"
-                  placeholder="请输入"
-                  clearable
-                >
+                <el-input v-model="query.tableField119_housingEstateName" placeholder="请输入" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="首联系人">
-                <el-input
-                  v-model="query.firstContactPerson"
-                  placeholder="请输入"
-                  clearable
-                >
+                <el-input v-model="query.firstContactPerson" placeholder="请输入" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="回收站简称">
-                <el-input
-                  v-model="query.shortName"
-                  placeholder="请输入"
-                  clearable
-                >
+                <el-input v-model="query.shortName" placeholder="请输入" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="价格配置-回收类目名称">
-                <JnpfSelect
-                  v-model="query.tableField135_recycleTypeName"
-                  placeholder="请选择"
-                  clearable
-                  :options="tableField135_recycleTypeNameOptions"
-                  :props="tableField135_recycleTypeNameProps"
-                  multiple
-                >
+                <JnpfSelect v-model="query.tableField135_recycleTypeName" placeholder="请选择" clearable
+                  :options="tableField135_recycleTypeNameOptions" :props="tableField135_recycleTypeNameProps" multiple>
                 </JnpfSelect>
               </el-form-item>
             </el-col>
           </template>
           <el-col :span="6">
             <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="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>
-              <el-button
-                type="text"
-                icon="el-icon-arrow-up"
-                @click="showAll = false"
-                v-else
-              >
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起
               </el-button>
             </el-form-item>
@@ -142,100 +78,57 @@
       <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"
-              @click="addOrUpdateHandle()"
-              >新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          :span-method="arraySpanMethod"
-        >
-          <el-table-column prop="stationCode" label="回收站编号" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          <el-table-column prop="stationCode" label="回收站编号" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="stationName" label="回收站名称" align="left">
+          <el-table-column prop="stationName" label="回收站名称" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="shortName" label="回收站简称" align="left">
+          <el-table-column prop="shortName" label="回收站简称" width="150px" align="center">
           </el-table-column>
-          <el-table-column prop="managementModel" label="经营模式" align="left">
+          <el-table-column prop="managementModel" label="经营模式" width="100px" align="center">
           </el-table-column>
-          <el-table-column prop="city" label="所在城市" align="left">
+          <el-table-column prop="city" label="所在城市" width="200px" align="center">
           </el-table-column>
           <!-- <el-table-column prop="recycleTypeIds" label="回收类目" align="left">
           </el-table-column> -->
           <!-- <el-table-column prop="firstContactPerson" label="首联系人" align="left">
           </el-table-column> -->
-          <el-table-column
-            prop="firstContactPersonPosition"
-            label="职位"
-            align="left"
-          >
+          <el-table-column prop="firstContactPersonPosition" label="职位" width="100px" align="center">
           </el-table-column>
-          <el-table-column
-            prop="firstContactPersonTel"
-            label="手机号码"
-            align="left"
-            width="100px"
-          >
+          <el-table-column prop="firstContactPersonTel" label="手机号码" width="150px" align="center">
           </el-table-column>
-          <el-table-column prop="address" label="详细地址" align="left">
+          <el-table-column prop="address" label="详细地址" width="200px" align="center">
           </el-table-column>
-          <el-table-column
-            prop="recycleTel"
-            label="回收电话"
-            align="left"
-            width="100px"
-          >
+          <el-table-column prop="recycleTel" label="回收电话" width="200px" align="center">
           </el-table-column>
-          <el-table-column
-            prop="stationDescription"
-            label="回收站介绍"
-            align="left"
-          >
+          <el-table-column prop="stationDescription" label="回收站介绍" width="200px" align="center">
           </el-table-column>
-          <el-table-column label="营业时间" prop="businessDays" algin="left">
+          <el-table-column label="营业时间" prop="businessDays" width="250px" align="center">
+
             <template slot-scope="scope">
               {{ scope.row.businessDays }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="appointmentTimeStart"
-            label="营业时间起"
-            align="left"
-          >
+          <el-table-column prop="appointmentTimeStart" label="营业时间起" width="160px" align="center">
           </el-table-column>
-          <el-table-column
-            prop="appointmentTimeEnd"
-            label="营业时间止"
-            align="left"
-          >
+          <el-table-column prop="appointmentTimeEnd" label="营业时间止" width="160px" align="center">
           </el-table-column>
-          <el-table-column label="接单范围" prop="acceptRange" algin="left">
+          <el-table-column label="接单范围" prop="acceptRange" width="100px" align="center">
+
             <template slot-scope="scope">
               {{ scope.row.acceptRange }}
             </template>
@@ -282,12 +175,10 @@
             </el-table-column>
             <el-table-column prop="tableField119-housingEstateName" label="小区名称" width="100" />
           </el-table-column> -->
-          <el-table-column prop="stationStatus" label="回收站状态" align="left">
+          <el-table-column prop="stationStatus" label="回收站状态" width="100px" align="center">
+
             <template slot-scope="scope">
-              <div
-                v-if="scope.row.stationStatus == '开'"
-                style="display: flex; align-items: center"
-              >
+              <div v-if="scope.row.stationStatus == '开'" style="display: flex; align-items: center">
                 <div class="green"></div>
                 <span style="margin-left: 10px">启用</span>
               </div>
@@ -350,51 +241,29 @@
             <el-table-column prop="tableField135-recycleTypeName" label="回收类目名称" width="100" />
             <el-table-column prop="tableField135-unitPrice" label="单价(kg)" width="100" />
           </el-table-column>-->
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="160px" align="center">
+
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)"
-                >编辑
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
-              <el-button
-                type="text"
-                class="JNPF-table-delBtn"
-                @click="handleDel(scope.row.id)"
-                >删除
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)"
-                >详情
+              <el-button type="text" @click="goDetail(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" />
 
     <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -696,7 +565,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -740,7 +609,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
@@ -813,6 +682,7 @@ export default {
   },
 };
 </script>
+
 <style scoped>
 .green {
   width: 10px;
@@ -820,6 +690,7 @@ export default {
   border-radius: 50%;
   background-color: rgb(95, 197, 146);
 }
+
 .red {
   width: 10px;
   height: 10px;
diff --git a/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue
index 4596f5c..8418809 100644
--- a/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -17,8 +10,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="来源">
-              <JnpfSelect v-model="query.sourceType" placeholder="请选择" clearable
-                :options="sourceTypeOptions" :props="sourceTypeProps" multiple>
+              <JnpfSelect v-model="query.sourceType" placeholder="请选择" clearable :options="sourceTypeOptions"
+                :props="sourceTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -47,63 +40,57 @@
                 @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'
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod">
-          <el-table-column prop="name" label="小区名" align="left">
+            <el-table-column prop="name" label="小区名" sortable width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="address" label="小区详细地址" align="left">
+          <el-table-column prop="address" label="小区详细地址" width="220px" align="center">
           </el-table-column>
-          <el-table-column prop="enabledMark" label="启用禁用" align="left">
+          <el-table-column prop="enabledMark" label="启用禁用" width="100px" align="center" >
             <template slot-scope="scope">
               <div v-if="scope.row.enabledMark == '开'" style="display: flex;align-items: center;">
                 <div class="green"></div>
-                <span style="margin-left:10px;">启用</span> 
+                <span style="margin-left:10px;">启用</span>
               </div>
               <div v-else style="display: flex;align-items: center;">
                 <div class="red"></div>
-                <span style="margin-left:10px;color:#8898AA;">禁用</span> 
+                <span style="margin-left:10px;color:#8898AA;">禁用</span>
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="longitude" label="经度" align="left">
-            <template slot-scope="scope" v-if="scope.row.longitude">
-              <JnpfNumber v-model="scope.row.longitude" :thousands="false" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="latitude" label="纬度" align="left">
-            <template slot-scope="scope" v-if="scope.row.latitude">
-              <JnpfNumber v-model="scope.row.latitude" :thousands="false" />
-            </template>
-          </el-table-column> -->
-          <el-table-column prop="hasSchedule" label="定时定点回收" align="left">
+        
+          <el-table-column prop="hasSchedule" label="定时定点回收" width="150px" align="center" >
+
             <template slot-scope="scope">
               <div v-if="scope.row.hasSchedule == '开'" style="display: flex;align-items: center;">
                 <div class="green"></div>
-                <span style="margin-left:10px;">开启</span> 
+                <span style="margin-left:10px;">开启</span>
               </div>
               <div v-else style="display: flex;align-items: center;">
                 <div class="red"></div>
-                <span style="margin-left:10px;color:#8898AA;">关闭</span> 
+                <span style="margin-left:10px;color:#8898AA;">关闭</span>
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="recycleAddress" label="回收地址" align="left">
+          <el-table-column prop="recycleAddress" label="回收地址" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="appointmentTimeStart" label="回收时间起" align="left">
+          <el-table-column prop="appointmentTimeStart" label="回收时间起" width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="appointmentTimeEnd" label="回收时间止" align="left">
+          <el-table-column prop="appointmentTimeEnd" label="回收时间止" width="200px" align="center">
           </el-table-column>
-          <el-table-column label="来源" prop="sourceType" algin="left">
+          <el-table-column label="来源" prop="sourceType" width="150px" align="center">
+
             <template slot-scope="scope">
-              {{ scope.row.sourceType}}
+              {{ scope.row.sourceType }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="150" align="center">
+
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
@@ -114,19 +101,17 @@
             </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" />
 
     <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" />
+    <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" />
   </div>
 </template>
 
@@ -490,6 +475,7 @@ export default {
   }
 }
 </script>
+
 <style scoped>
 .green {
   width: 10px;
@@ -497,11 +483,11 @@ export default {
   border-radius: 50%;
   background-color: rgb(95, 197, 146);
 }
+
 .red {
   width: 10px;
   height: 10px;
   border-radius: 50%;
   background-color: rgb(219, 111, 111);
 }
-
 </style>
diff --git a/jnpf-java-boot/jnpf-web/src/views/nxmanager/index.vue b/jnpf-java-boot/jnpf-web/src/views/nxmanager/index.vue
index 263ca56..d9e8ce1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/nxmanager/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/nxmanager/index.vue
@@ -1,56 +1,48 @@
-
-
-
-
-
-
-
 <template>
     <div class="JNPF-common-layout">
         <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.name" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="所属部门">
-                                        <el-input v-model="query.department" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="手机">
-                                        <el-input v-model="query.mobilePhone" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="有效标志">
-                                                <JnpfSelect v-model="query.status" placeholder="请选择" clearable
-                                                            :options="statusOptions"
-                                                            :props="statusProps" >
-                                                </JnpfSelect>
-                                        </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>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="名称">
+                            <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="所属部门">
+                            <el-input v-model="query.department" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="手机">
+                            <el-input v-model="query.mobilePhone" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="有效标志">
+                                <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
+                                    :props="statusProps">
+                                </JnpfSelect>
+                            </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>
+                    </template>
                     <el-col :span="6">
                         <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>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
+                            <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>
+                                收起
+                            </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -58,461 +50,435 @@
             <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"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
+                        <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+                        </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @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-tooltip>
+                        <el-tooltip content="高级查询" placement="top" v-if="true">
+                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                @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-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+                    <el-table-column prop="name" label="名称" sortable width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="department" label="所属部门" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="duties" label="职务" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="mobilePhone" label="手机" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column label="有效标志" prop="status" width="100px" align="center">
+
+                        <template slot-scope="scope">
+                            {{ scope.row.status }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="creatorUserId" label="创建用户" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="creatorTime" label="创建时间" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="lastModifyTime" label="修改时间" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="lastModifyUserId" label="修改用户" width="200px" align="center">
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="180px" align="center">
 
->
-                                                <el-table-column
-                                                            prop="name"
- label="名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="department"
- label="所属部门"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="duties"
- label="职务"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="mobilePhone"
- label="手机"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="有效标志"  prop="status" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.status}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorUserId"
- label="创建用户"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorTime"
- label="创建时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyTime"
- label="修改时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyUserId"
- label="修改用户"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+                            </el-button>
+                            <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+                            </el-button>
+                            <el-button type="text" @click="goDetail(scope.row.id)">详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
                 </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+                <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"/>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
         <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <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" />
+        <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 JNPFForm from './form'
-    import Detail from './Detail'
-    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 request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+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'
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
+export default {
+    components: {
+        JNPFForm,
+        Detail,
+        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: {
-                        name:undefined,
-                        department:undefined,
-                        mobilePhone:undefined,
-                        status:undefined,
-                        creatorTime:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                name: undefined,
+                department: undefined,
+                mobilePhone: undefined,
+                status: undefined,
+                creatorTime: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "",
+                sidx: "",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
-                        statusProps:{"label":"fullName","value":"id"  },
+            statusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
+            statusProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-            this.queryData = JSON.parse(JSON.stringify(this.query))
-        },
-        methods: {
-            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
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo']),
+        menuId() {
+            return this.$route.meta.modelId || ''
+        }
+    },
+    created() {
+        this.getColumnList(),
+            this.initSearchDataAndListData()
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+    },
+    methods: {
+        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.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            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
-                            }
-                        }
+            })
+        },
+        toggleTreeExpand(expands) {
+            this.refreshTree = false
+            this.expandsTree = expands
+            this.$nextTick(() => {
+                this.refreshTree = true
+                this.$nextTick(() => {
+                    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] || ''
                     }
                 }
-                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() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'549906462084718981',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/NxManager/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/NxManager/${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/NxManager")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
+                } else {
+                    this.mergeList.push({
+                        prop: item.prop,
+                        rowspan: 1,
+                        colspan: 1
                     })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            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() {
+        },
+        initData() {
+            this.listLoading = true;
+            let _query = {
+                ...this.listQuery,
+                ...this.query,
+                keyword: this.keyword,
+                dataType: 0,
+                menuId: this.menuId,
+                moduleId: '549906462084718981',
+                type: 1,
+            };
+            request({
+                url: `/api/scm/NxManager/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/NxManager/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/scm/NxManager/${id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx=""
-                this.initData()
-            },
-            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/NxManager")
+            })
+        },
+        openSuperQuery() {
+            this.superQueryVisible = true
+            this.$nextTick(() => {
+                this.$refs.SuperQuery.init()
+            })
+        },
+        superQuery(queryJson) {
+            this.listQuery.superQueryJson = queryJson
+            this.listQuery.currentPage = 1
+            this.initData()
+        },
+        addOrUpdateHandle(row, isDetail) {
+            let id = row ? row.id : ""
+            this.formVisible = true
+            this.$nextTick(() => {
+                this.$refs.JNPFForm.init(id, isDetail, this.list)
+            })
+        },
+        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/NxManager/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()
+        },
+        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/nxprice/index.vue b/jnpf-java-boot/jnpf-web/src/views/nxprice/index.vue
index 93d01f6..fece9af 100644
--- a/jnpf-java-boot/jnpf-web/src/views/nxprice/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/nxprice/index.vue
@@ -71,22 +71,23 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="productName" label="商品名称" align="left" sortable="custom">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+          <el-table-column prop="productName" label="商品名称"   width="180px"  align="center" sortable="custom">
           </el-table-column>
 
           >
-          <el-table-column prop="recoveryPrice" label="回收价" align="left" sortable="custom">
+          <el-table-column prop="recoveryPrice" label="回收价"  width="180px"  align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="unit" label="单位" align="left" sortable="custom">
+          <el-table-column prop="unit" label="单位"  width="100px"  align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="stationName" label="服务站" align="left" sortable="custom">
+          <el-table-column prop="stationName" label="服务站"  width="150px"  align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="priceStatus" label="状态" align="left" sortable="custom">
+          <el-table-column prop="priceStatus" label="状态"  width="100px"  align="center" sortable="custom">
           </el-table-column>
 
-          <el-table-column prop="priceCode" label="价格编码" align="left" sortable="custom">
+          <el-table-column prop="priceCode" label="价格编码" width="180px" align="center" sortable="custom">
           </el-table-column>
 
           <!-- <el-table-column
@@ -113,15 +114,15 @@
               {{ scope.row.priceType }}
             </template>
           </el-table-column> -->
-          <el-table-column prop="creatorUserIds" label="创建用户" align="left" sortable="custom">
+          <el-table-column prop="creatorUserIds" label="创建用户" width="180px" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left" sortable="custom">
+          <el-table-column prop="creatorTime" label="创建时间" width="180px" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="lastModifyUserIds" label="更新人" align="left" sortable="custom">
+          <el-table-column prop="lastModifyUserIds" label="更新人" width="180px" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="更新时间" align="left" sortable="custom">
+          <el-table-column prop="lastModifyTime" label="更新时间" width="180px" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" width="200">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/nxproduct/index.vue b/jnpf-java-boot/jnpf-web/src/views/nxproduct/index.vue
index d138168..1963223 100644
--- a/jnpf-java-boot/jnpf-web/src/views/nxproduct/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/nxproduct/index.vue
@@ -70,15 +70,20 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"
-          row-key="id" :tree-props="{ children: 'children', hasChildren: '' }" :default-expand-all="expandsTable"
+          row-key="id" :tree-props="{ children: 'children', hasChildren: '' }" :default-expand-all="expandsTable" has-c
+          ustom-column border @selection-change="handleSelectionChange"
+        
           v-if="refreshTable">
-          <el-table-column prop="code" label="编码" align="left" sortable="custom">
+
+      
+
+          <el-table-column prop="code" label="编码" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="name" label="名称" align="left" sortable="custom">
+          <el-table-column prop="name" label="名称" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column prop="spec" label="规格" align="left" sortable="custom">
+          <el-table-column prop="spec" label="规格" align="center" sortable="custom">
           </el-table-column>
-          <el-table-column label="库存单位" prop="unit" algin="left" sortable="custom">
+          <el-table-column label="库存单位" prop="unit" align="center" sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.unit }}
             </template>
@@ -97,6 +102,9 @@
             </template>
           </el-table-column>
         </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
+          
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
diff --git a/jnpf-java-boot/jnpf-web/src/views/nxwallet/index.vue b/jnpf-java-boot/jnpf-web/src/views/nxwallet/index.vue
index 68db96e..948f60a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/nxwallet/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/nxwallet/index.vue
@@ -71,43 +71,47 @@
                         </el-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-                    <el-table-column prop="code" label="流水编号" align="left">
+                <!-- <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+                    @selection-change="handleSelectionChange" :span-method="arraySpanMethod"> -->
+                    <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+
+                    <el-table-column prop="code" label="流水编号" sortable width="200px" align="center">
                     </el-table-column>
-                    <el-table-column label="单据类型" prop="walletType" align="left">
+                    <el-table-column label="单据类型" prop="walletType" width="100px" align="center">
                         <template slot-scope="scope">
                             {{ scope.row.walletType }}
                         </template>
                     </el-table-column>
 
-                    <el-table-column prop="orderCode" label="订单编号" align="left">
+                    <el-table-column prop="orderCode" label="订单编号" width="200px" align="center">
                     </el-table-column>
 
-                    <el-table-column prop="applyTime" label="申请时间" align="left">
+                    <el-table-column prop="applyTime" label="申请时间" width="150px" align="center">
                     </el-table-column>
 
-                    <el-table-column label="单据状态" prop="orderStatus" algin="left">
+                    <el-table-column label="单据状态" prop="orderStatus" width="150px" align="center">
                         <template slot-scope="scope">
                             {{ scope.row.orderStatus }}
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="充值状态" prop="rechargeStatus" algin="left">
+                    <el-table-column label="充值状态" prop="rechargeStatus" width="100px" align="center">
                         <template slot-scope="scope">
                             {{ scope.row.rechargeStatus }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="creatorUserId" label="创建用户" align="left">
+                    <el-table-column prop="creatorUserId" label="创建用户" width="200px" align="center">
                     </el-table-column>
-                    <el-table-column prop="creatorTime" label="创建时间" align="left">
+                    <el-table-column prop="creatorTime" label="创建时间" width="180px" align="center">
                     </el-table-column>
-                    <el-table-column prop="priceStar" label="金额" align="left">
+                    <el-table-column prop="priceStar" label="金额" width="100px" align="center">
                         <template slot-scope="scope" v-if="scope.row.priceStar">
                             <JnpfNumber v-model="scope.row.priceStar" :thousands="false" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" fixed="right" width="150">
+                    <el-table-column label="操作" fixed="right" width="150" align="center">
                         <template slot-scope="scope">
 
                             <el-button v-if="scope.row.rechargeStatus == '未充值'" type="text" class="JNPF-table-delBtn"
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
index eb3ae73..800a400 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
@@ -1,14 +1,8 @@
-
-
-
-    <template>
+<template>
   <transition name="el-zoom-in-center">
     <div class="JNPF-preview-main">
       <div class="JNPF-common-page-header">
-        <el-page-header
-          @back="goBack"
-          :content="!dataForm.id ? '新建' : '编辑'"
-        />
+        <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
         <div class="options">
           <el-dropdown class="dropdown" placement="bottom">
             <el-button style="width: 70px">
@@ -23,42 +17,22 @@
                   {{ "下一条" }}
                 </el-dropdown-item>
               </template>
-              <el-dropdown-item
-                type="primary"
-                @click.native="dataFormSubmit(2)"
-                :loading="continueBtnLoading"
-                :disabled="btnLoading"
-              >
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
+                :disabled="btnLoading">
                 {{
-                  !dataForm.id ? "确定并新增" : "确定并继续"
-                }}</el-dropdown-item
-              >
+          !dataForm.id ? "确定并新增" : "确定并继续"
+        }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
-            type="primary"
-            @click="dataFormSubmit()"
-            :loading="btnLoading"
-            :disabled="continueBtnLoading"
-          >
-            保 存</el-button
-          >
+          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled="continueBtnLoading">
+            保 存</el-button>
           <el-button @click="goBack"> 取 消</el-button>
         </div>
       </div>
-      <el-row
-        :gutter="15"
-        class="main"
-        :style="{ margin: '0 auto', width: '100%' }"
-      >
-        <el-form
-          ref="formRef"
-          :model="dataForm"
-          :rules="dataRule"
-          size="small"
-          label-width="100px"
-          label-position="right"
-        >
+      <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '100%' }">
+        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+          label-position="right">
+
           <template v-if="!loading">
             <!-- 具体表单 -->
             <el-col :span="24">
@@ -69,39 +43,22 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="订单编号" prop="orderNumber">
-                <JnpfInput
-                  v-model="dataForm.orderNumber"
-                  @change="changeData('orderNumber', -1)"
-                  placeholder="系统自动生成"
-                  readonly
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.orderNumber" @change="changeData('orderNumber', -1)" placeholder="系统自动生成"
+                  readonly :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="订单类型" prop="orderTypeId">
-                <JnpfSelect
-                  v-model="dataForm.orderTypeId"
-                  @change="changeData('orderTypeId', -1)"
-                  placeholder="请选择"
-                  disabled
-                  :style="{ width: '100%' }"
-                  :options="orderTypeIdOptions"
-                  :props="orderTypeIdProps"
-                >
+                <JnpfSelect v-model="dataForm.orderTypeId" @change="changeData('orderTypeId', -1)" placeholder="请选择"
+                  disabled :style="{ width: '100%' }" :options="orderTypeIdOptions" :props="orderTypeIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="订单金额(元)" prop="orderAmount">
-                <JnpfInput
-                  v-model="dataForm.orderAmount"
-                  @change="changeData('orderAmount', -1)"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.orderAmount" @change="changeData('orderAmount', -1)" placeholder="请输入"
+                  clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
@@ -121,53 +78,30 @@
             </el-col> -->
             <el-col :span="8">
               <jnpf-form-tip-item label="回收员状态" prop="orderStaffsStatusId">
-                <JnpfSelect
-                  v-model="dataForm.orderStaffsStatusId"
-                  @change="changeData('orderStaffsStatusId', -1)"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  :options="orderStaffsStatusIdOptions"
-                  :props="orderStaffsStatusIdProps"
-                >
+                <JnpfSelect v-model="dataForm.orderStaffsStatusId" @change="changeData('orderStaffsStatusId', -1)"
+                  placeholder="请选择" clearable :style="{ width: '100%' }" :options="orderStaffsStatusIdOptions"
+                  :props="orderStaffsStatusIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod">
-                <JnpfInput
-                  v-model="dataForm.receivePeriod"
-                  @change="changeData('receivePeriod', -1)"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.receivePeriod" @change="changeData('receivePeriod', -1)" placeholder="请输入"
+                  clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="下单地址经度" prop="longitude">
-                <JnpfInput
-                  v-model="dataForm.longitude"
-                  @change="changeData('longitude', -1)"
-                  placeholder="请输入"
-                  clearable
-                  disabled
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.longitude" @change="changeData('longitude', -1)" placeholder="请输入"
+                  clearable disabled :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="下单地址纬度" prop="latitude">
-                <JnpfInput
-                  v-model="dataForm.latitude"
-                  @change="changeData('latitude', -1)"
-                  placeholder="请输入"
-                  clearable
-                  disabled
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.latitude" @change="changeData('latitude', -1)" placeholder="请输入" clearable
+                  disabled :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
@@ -185,15 +119,8 @@
             </el-col> -->
             <el-col :span="12">
               <jnpf-form-tip-item label="订单状态" prop="orderStatusId">
-                <JnpfSelect
-                  v-model="dataForm.orderStatusId"
-                  @change="changeData('orderStatusId', -1)"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  :options="orderStatusIdOptions"
-                  :props="orderStatusIdProps"
-                >
+                <JnpfSelect v-model="dataForm.orderStatusId" @change="changeData('orderStatusId', -1)" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" :options="orderStatusIdOptions" :props="orderStatusIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
@@ -205,26 +132,11 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="散户昵称" prop="clientId">
-                <JnpfPopupSelect
-                  v-model="dataForm.clientId"
-                  @change="changeDataClient"
-                  :rowIndex="null"
-                  :formData="dataForm"
-                  :templateJson="interfaceRes.clientId"
-                  placeholder="请选择"
-                  hasPage
-                  propsValue="id"
-                  popupWidth="800px"
-                  popupTitle="选择数据"
-                  popupType="dialog"
-                  relationField="nick_name"
-                  field="clientId"
-                  interfaceId="538381360331497221"
-                  :pageSize="20"
-                  :columnOptions="clientIdcolumnOptions"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfPopupSelect v-model="dataForm.clientId" @change="changeDataClient" :rowIndex="null"
+                  :formData="dataForm" :templateJson="interfaceRes.clientId" placeholder="请选择" hasPage propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField="nick_name" field="clientId"
+                  interfaceId="538381360331497221" :pageSize="20" :columnOptions="clientIdcolumnOptions" clearable
+                  :style="{ width: '100%' }">
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
@@ -242,89 +154,43 @@
             </el-col> -->
             <el-col :span="8">
               <jnpf-form-tip-item label="散户手机号" prop="clientMobile">
-                <JnpfInput
-                  v-model="dataForm.clientMobile"
-                  @change="changeData('clientMobile', -1)"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.clientMobile" @change="changeData('clientMobile', -1)" placeholder="请输入"
+                  clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="预估重量" prop="predictWeight">
-                <JnpfInput
-                  v-model="dataForm.predictWeight"
-                  @change="changeData('predictWeight', -1)"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.predictWeight" @change="changeData('predictWeight', -1)" placeholder="请输入"
+                  clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
-              <jnpf-form-tip-item
-                label="预约时间起"
-                prop="appointmentTimeStart"
-              >
-                <JnpfDatePicker
-                  v-model="dataForm.appointmentTimeStart"
-                  @change="changeData('appointmentTimeStart', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm"
-                >
+              <jnpf-form-tip-item label="预约时间起" prop="appointmentTimeStart">
+                <JnpfDatePicker v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
               <jnpf-form-tip-item label="预约时间止" prop="appointmentTimeEnd">
-                <JnpfDatePicker
-                  v-model="dataForm.appointmentTimeEnd"
-                  @change="changeData('appointmentTimeEnd', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm"
-                >
+                <JnpfDatePicker v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="12">
-              <jnpf-form-tip-item
-                label="散户下单关联地址"
-                prop="clientAddressId"
-              >
-                <JnpfPopupSelect
-                  v-model="dataForm.clientAddressId"
-                  @change="changeDataAddress"
-                  :rowIndex="null"
-                  :formData="dataForm"
-                  :templateJson="interfaceRes.clientAddressId"
-                  placeholder="请选择"
-                  propsValue="id"
-                  popupWidth="800px"
-                  popupTitle="选择数据"
-                  popupType="dialog"
-                  relationField="receive_street"
-                  field="clientAddressId"
-                  interfaceId="538384014935858949"
-                  :pageSize="20"
-                  :columnOptions="clientAddressIdcolumnOptions"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+              <jnpf-form-tip-item label="散户下单关联地址" prop="clientAddressId" >
+                <JnpfPopupSelect v-model="dataForm.clientAddressId" @change="changeDataAddress" :rowIndex="null"
+                  :formData="dataForm" :templateJson="interfaceRes.clientAddressId" placeholder="请选择" propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField="receive_street"
+                  field="clientAddressId" interfaceId="538384014935858949" :pageSize="20"
+                  :columnOptions="clientAddressIdcolumnOptions" clearable :style="{ width: '100%' }">
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
@@ -336,41 +202,23 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站" prop="recycleStationId">
-                <JnpfSelect
-                  v-model="dataForm.recycleStationId"
-                  @change="changeData('recycleStationId', -1)"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  :options="recycleStationIdOptions"
-                  :props="recycleStationIdProps"
-                >
+                <JnpfSelect v-model="dataForm.recycleStationId" @change="changeData('recycleStationId', -1)"
+                  placeholder="请选择" clearable :style="{ width: '100%' }" :options="recycleStationIdOptions"
+                  :props="recycleStationIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收员" prop="staffsId">
-                <JnpfSelect
-                  v-model="dataForm.staffsId"
-                  @change="changeData('staffsId', -1)"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  :options="staffsIdOptions"
-                  :props="staffsIdProps"
-                >
+                <JnpfSelect v-model="dataForm.staffsId" @change="changeData('staffsId', -1)" placeholder="请选择" clearable
+                  :style="{ width: '100%' }" :options="staffsIdOptions" :props="staffsIdProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收员姓名" prop="staffsName">
-                <JnpfInput
-                  v-model="dataForm.staffsName"
-                  @change="changeData('staffsName', -1)"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
+                <JnpfInput v-model="dataForm.staffsName" @change="changeData('staffsName', -1)" placeholder="请输入"
+                  clearable :style="{ width: '100%' }">
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
@@ -383,97 +231,51 @@
 
             <el-col :span="8">
               <jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
-                <JnpfDatePicker
-                  v-model="dataForm.consultTimeStart"
-                  @change="changeData('consultTimeStart', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm"
-                >
+                <JnpfDatePicker v-model="dataForm.consultTimeStart" @change="changeData('consultTimeStart', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
               <jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd">
-                <JnpfDatePicker
-                  v-model="dataForm.consultTimeEnd"
-                  @change="changeData('consultTimeEnd', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm"
-                >
+                <JnpfDatePicker v-model="dataForm.consultTimeEnd" @change="changeData('consultTimeEnd', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
               <jnpf-form-tip-item label="收货时间" prop="receiveTime">
-                <JnpfDatePicker
-                  v-model="dataForm.receiveTime"
-                  @change="changeData('receiveTime', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                >
+                <JnpfDatePicker v-model="dataForm.receiveTime" @change="changeData('receiveTime', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm:ss">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="8">
               <jnpf-form-tip-item label="结算时间" prop="settleTime">
-                <JnpfDatePicker
-                  v-model="dataForm.settleTime"
-                  @change="changeData('settleTime', -1)"
-                  :startTime="dateTime(false, 1, 1, '', '')"
-                  :endTime="dateTime(false, 1, 1, '', '')"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                >
+                <JnpfDatePicker v-model="dataForm.settleTime" @change="changeData('settleTime', -1)"
+                  :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                  clearable :style="{ width: '100%' }" type="datetime" format="yyyy-MM-dd HH:mm:ss">
                 </JnpfDatePicker>
               </jnpf-form-tip-item>
             </el-col>
 
             <el-col :span="24">
               <jnpf-form-tip-item label="创建时间" prop="creatorTime">
-                <JnpfOpenData
-                  v-model="dataForm.creatorTime"
-                  @change="changeData('creatorTime', -1)"
-                  placeholder="系统自动生成"
-                  readonly
-                  disabled
-                  :style="{ width: '100%' }"
-                  type="currTime"
-                >
+                <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
+                  placeholder="系统自动生成" readonly disabled :style="{ width: '100%' }" type="currTime">
                 </JnpfOpenData>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
               <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
-                <JnpfOpenData
-                  v-model="dataForm.creatorUserId"
-                  @change="changeData('creatorUserId', -1)"
-                  placeholder="系统自动生成"
-                  readonly
-                  disabled
-                  :style="{ width: '100%' }"
-                  type="currUser"
-                >
+                <JnpfOpenData v-model="dataForm.creatorUserId" @change="changeData('creatorUserId', -1)"
+                  placeholder="系统自动生成" readonly disabled :style="{ width: '100%' }" type="currUser">
                 </JnpfOpenData>
               </jnpf-form-tip-item>
             </el-col>
@@ -486,84 +288,48 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="综合评分" prop="starScore">
-                <JnpfRate
-                  v-model="dataForm.starScore"
-                  @change="changeData('starScore', -1)"
-                  :max="5"
-                >
+                <JnpfRate v-model="dataForm.starScore" @change="changeData('starScore', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="评价详情" prop="comment">
-                <JnpfTextarea
-                  v-model="dataForm.comment"
-                  @change="changeData('comment', -1)"
-                  placeholder="请输入"
-                  :maxlength="200"
-                  :style="{ width: '100%' }"
-                  true
-                  type="textarea"
-                  :autosize="{ minRows: 4, maxRows: 8 }"
-                >
+                <JnpfTextarea v-model="dataForm.comment" @change="changeData('comment', -1)" placeholder="请输入"
+                  :maxlength="200" :style="{ width: '100%' }" true type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 8 }">
                 </JnpfTextarea>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="评价图片" prop="commentPics">
-                <JnpfUploadImg
-                  v-model="dataForm.commentPics"
-                  @change="changeData('commentPics', -1)"
-                  :fileSize="10"
-                  sizeUnit="MB"
-                  :limit="9"
-                  pathType="defaultPath"
-                  :isAccount="0"
-                >
+                <JnpfUploadImg v-model="dataForm.commentPics" @change="changeData('commentPics', -1)" :fileSize="10"
+                  sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="响应速度" prop="responseStar">
-                <JnpfRate
-                  v-model="dataForm.responseStar"
-                  @change="changeData('responseStar', -1)"
-                  :max="5"
-                >
+                <JnpfRate v-model="dataForm.responseStar" @change="changeData('responseStar', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="服务态度" prop="attitudeStar">
-                <JnpfRate
-                  v-model="dataForm.attitudeStar"
-                  @change="changeData('attitudeStar', -1)"
-                  :max="5"
-                >
+                <JnpfRate v-model="dataForm.attitudeStar" @change="changeData('attitudeStar', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="平台价格" prop="priceStar">
-                <JnpfRate
-                  v-model="dataForm.priceStar"
-                  @change="changeData('priceStar', -1)"
-                  :max="5"
-                >
+                <JnpfRate v-model="dataForm.priceStar" @change="changeData('priceStar', -1)" :max="5">
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
             <!-- 表单结束 -->
           </template>
         </el-form>
-        <SelectDialog
-          v-if="selectDialogVisible"
-          :config="currTableConf"
-          :formData="dataForm"
-          ref="selectDialog"
-          @select="addForSelect"
-          @close="selectDialogVisible = false"
-        />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+          @select="addForSelect" @close="selectDialogVisible = false" />
       </el-row>
     </div>
   </transition>
@@ -785,7 +551,7 @@ export default {
     this.initDefaultData();
     this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
   },
-  mounted() {},
+  mounted() { },
   methods: {
     changeDataClient(model, row) {
       this.dataForm.clientName = row.nick_name;
@@ -912,10 +678,10 @@ export default {
           if (relationFieldAll.length > 1 && index > -1) {
             val =
               this.dataForm[relationFieldAll[0] + "List"] &&
-              this.dataForm[relationFieldAll[0] + "List"].length
+                this.dataForm[relationFieldAll[0] + "List"].length
                 ? this.dataForm[relationFieldAll[0] + "List"][index][
-                    relationFieldAll[1]
-                  ]
+                relationFieldAll[1]
+                ]
                 : "";
           } else {
             val = this.dataForm[relationFieldAll];
@@ -951,10 +717,10 @@ export default {
           if (relationFieldAll.length > 1 && index > -1) {
             val =
               this.dataForm[relationFieldAll[0] + "List"] &&
-              this.dataForm[relationFieldAll[0] + "List"].length
+                this.dataForm[relationFieldAll[0] + "List"].length
                 ? this.dataForm[relationFieldAll[0] + "List"][index][
-                    relationFieldAll[1]
-                  ]
+                relationFieldAll[1]
+                ]
                 : "";
           } else {
             val = this.dataForm[relationFieldAll];
@@ -1013,7 +779,7 @@ export default {
       this.$store.commit("generator/UPDATE_RELATION_DATA", {});
     },
     //初始化默认数据
-    initDefaultData() {},
+    initDefaultData() { },
     // 表单提交
     dataFormSubmit(type) {
       this.dataFormSubmitType = type ? type : 0;
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
index f75a619..2f25099 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
@@ -1,98 +1,84 @@
-
-
-
-
-
-
-
 <template>
     <div class="JNPF-common-layout">
         <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.orderNumber" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="订单类型">
-                                        <JnpfSelect v-model="query.orderTypeId" placeholder="请选择" clearable
-                                                    :options="orderTypeIdOptions"
-                                                    :props="orderTypeIdProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="散户端状态">
-                                        <JnpfSelect v-model="query.orderClientStatusId" placeholder="请选择" clearable
-                                                    :options="orderClientStatusIdOptions"
-                                                    :props="orderClientStatusIdProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="回收员端状态">
-                                                <JnpfSelect v-model="query.orderStafstatusId" placeholder="请选择" clearable
-                                                            :options="orderStafstatusIdOptions"
-                                                            :props="orderStafstatusIdProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="散户手机号">
-                                                <el-input v-model="query.clientMobile" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="回收站">
-                                                <JnpfSelect v-model="query.recycleStationId" placeholder="请选择" clearable
-                                                            :options="recycleStationIdOptions"
-                                                            :props="recycleStationIdProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="预约时间起">
-                                                <JnpfDateRangePicker v-model="query.appointmentTimeStart"
-                                                                     format="yyyy-MM-dd HH:mm" startPlaceholder="开始日期"
-                                                                     endPlaceholder="结束日期" >
-                                                </JnpfDateRangePicker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="预约时间止">
-                                                <JnpfDateRangePicker v-model="query.appointmentTimeEnd"
-                                                                     format="yyyy-MM-dd HH:mm" startPlaceholder="开始日期"
-                                                                     endPlaceholder="结束日期" >
-                                                </JnpfDateRangePicker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="散户姓名">
-                                                <el-input v-model="query.clientName" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="回收员">
-                                                <JnpfSelect v-model="query.staffsId" placeholder="请选择" clearable
-                                                            :options="staffsIdOptions"
-                                                            :props="staffsIdProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="订单编号">
+                            <el-input v-model="query.orderNumber" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="订单类型">
+                            <JnpfSelect v-model="query.orderTypeId" placeholder="请选择" clearable
+                                :options="orderTypeIdOptions" :props="orderTypeIdProps" multiple>
+                            </JnpfSelect>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="散户端状态">
+                            <JnpfSelect v-model="query.orderClientStatusId" placeholder="请选择" clearable
+                                :options="orderClientStatusIdOptions" :props="orderClientStatusIdProps" multiple>
+                            </JnpfSelect>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="回收员端状态">
+                                <JnpfSelect v-model="query.orderStafstatusId" placeholder="请选择" clearable
+                                    :options="orderStafstatusIdOptions" :props="orderStafstatusIdProps" multiple>
+                                </JnpfSelect>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="散户手机号">
+                                <el-input v-model="query.clientMobile" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="回收站">
+                                <JnpfSelect v-model="query.recycleStationId" placeholder="请选择" clearable
+                                    :options="recycleStationIdOptions" :props="recycleStationIdProps" multiple>
+                                </JnpfSelect>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="预约时间起">
+                                <JnpfDateRangePicker v-model="query.appointmentTimeStart" format="yyyy-MM-dd HH:mm"
+                                    startPlaceholder="开始日期" endPlaceholder="结束日期">
+                                </JnpfDateRangePicker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="预约时间止">
+                                <JnpfDateRangePicker v-model="query.appointmentTimeEnd" format="yyyy-MM-dd HH:mm"
+                                    startPlaceholder="开始日期" endPlaceholder="结束日期">
+                                </JnpfDateRangePicker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="散户姓名">
+                                <el-input v-model="query.clientName" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="回收员">
+                                <JnpfSelect v-model="query.staffsId" placeholder="请选择" clearable
+                                    :options="staffsIdOptions" :props="staffsIdProps" multiple>
+                                </JnpfSelect>
+                            </el-form-item>
+                        </el-col>
+                    </template>
                     <el-col :span="6">
                         <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>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
+                            <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>
+                                收起
+                            </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -100,563 +86,502 @@
             <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"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
+                        <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+                        </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @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-tooltip>
+                        <el-tooltip content="高级查询" placement="top" v-if="true">
+                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                @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-tooltip>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+
+                    <el-table-column prop="orderNumber"    label="订单编号" width="200px" sortable align="center">
+                    </el-table-column>
+                    <el-table-column prop="orderTypeId"    label="订单类型" width="100px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="orderAmount" label="订单金额(元)" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="orderClientStatusId" label="散户端状态" width="100px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="orderStafstatusId" label="回收员端状态" width="100px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="receivePeriod" label="接单周期(分)" width="100px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="clientId" label="散户id" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="clientMobile" label="散户手机号" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="recycleAddress" label="回收地址" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="appointmentTimeStart" label="预约时间起" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="appointmentTimeEnd" label="预约时间止" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="recycleStationId" label="回收站" width="105px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="creatorUserId" label="创建用户" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="creatorTime" label="创建时间" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="consultTimeStart" label="协商时间起" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="consultTimeEnd" label="协商时间止" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="receiveTime" label="收货时间" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="settleTime" label="结算时间" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="comment" label="评价详情" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column prop="clientName" label="散户姓名" width="150px" align="center">
+                    </el-table-column>
+                    <el-table-column label="回收员" prop="staffsId" align="center" width="150px">
+
+                        <template slot-scope="scope">
+                            {{ scope.row.staffsId }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="150" >
 
->
-                                                <el-table-column
-                                                            prop="orderNumber"
- label="订单编号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="orderTypeId"
- label="订单类型"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="orderAmount"
- label="订单金额(元)"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="orderClientStatusId"
- label="散户端状态"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="orderStafstatusId"
- label="回收员端状态"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="receivePeriod"
- label="接单周期(分)"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="clientId"
- label="散户id"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="clientMobile"
- label="散户手机号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="recycleAddress"
- label="回收地址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="appointmentTimeStart"
- label="预约时间起"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="appointmentTimeEnd"
- label="预约时间止"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="recycleStationId"
- label="回收站"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorUserId"
- label="创建用户"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="creatorTime"
- label="创建时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="consultTimeStart"
- label="协商时间起"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="consultTimeEnd"
- label="协商时间止"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="receiveTime"
- label="收货时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="settleTime"
- label="结算时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="comment"
- label="评价详情"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="clientName"
- label="散户姓名"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="回收员"  prop="staffsId" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.staffsId}}
-                                            </template>
-                                        </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
+                        <template slot-scope="scope" >
+                            <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+                            </el-button>
+                            <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+                            </el-button>
+                            <el-button type="text" @click="goDetail(scope.row.id)">详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
                 </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+                <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"/>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
         <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <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" />
+        <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 JNPFForm from './form'
-    import Detail from './Detail'
-    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 request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import JNPFForm from './form'
+import Detail from './Detail'
+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'
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
+export default {
+    components: {
+        JNPFForm,
+        Detail,
+        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: {
-                        orderNumber:undefined,
-                        orderTypeId:undefined,
-                        orderClientStatusId:undefined,
-                        orderStafstatusId:undefined,
-                        clientMobile:undefined,
-                        recycleStationId:undefined,
-                        appointmentTimeStart:undefined,
-                        appointmentTimeEnd:undefined,
-                        clientName:undefined,
-                        staffsId:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                orderNumber: undefined,
+                orderTypeId: undefined,
+                orderClientStatusId: undefined,
+                orderStafstatusId: undefined,
+                clientMobile: undefined,
+                recycleStationId: undefined,
+                appointmentTimeStart: undefined,
+                appointmentTimeEnd: undefined,
+                clientName: undefined,
+                staffsId: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "",
+                sidx: "",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                orderTypeIdOptions:[],
-                        orderTypeIdProps:{"label":"fullName","value":"id"  },
-                            orderClientStatusIdOptions:[],
-                        orderClientStatusIdProps:{"label":"fullName","value":"id"  },
-                            orderStaffsStatusIdOptions:[],
-                        orderStaffsStatusIdProps:{"label":"fullName","value":"id"  },
-                            orderStatusIdOptions:[],
-                        orderStatusIdProps:{"label":"fullName","value":"id"  },
-                            recycleStationIdOptions:[],
-                        recycleStationIdProps:{"label":"station_name","value":"id"  },
-                            staffsIdOptions:[],
-                        staffsIdProps:{"label":"staffs_name","value":"id"  },
+            orderTypeIdOptions: [],
+            orderTypeIdProps: { "label": "fullName", "value": "id" },
+            orderClientStatusIdOptions: [],
+            orderClientStatusIdProps: { "label": "fullName", "value": "id" },
+            orderStaffsStatusIdOptions: [],
+            orderStaffsStatusIdProps: { "label": "fullName", "value": "id" },
+            orderStatusIdOptions: [],
+            orderStatusIdProps: { "label": "fullName", "value": "id" },
+            recycleStationIdOptions: [],
+            recycleStationIdProps: { "label": "station_name", "value": "id" },
+            staffsIdOptions: [],
+            staffsIdProps: { "label": "staffs_name", "value": "id" },
             interfaceRes: {
-                        clientId:[] ,
-                        clientAddressId:[{"dataType":"varchar","defaultValue":"","field":"clientId","fieldName":"","id":"434Ri02","jnpfKey":"popupSelect","relationField":"clientId","required":"0"}] ,
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getorderTypeIdOptions();
-                    this.getorderClientStatusIdOptions();
-                    this.getorderStafstatusIdOptions();
-                    this.getrecycleStationIdOptions();
-            this.queryData = JSON.parse(JSON.stringify(this.query))
-        },
-        methods: {
-            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)
-                    })
-                })
+                clientId: [],
+                clientAddressId: [{ "dataType": "varchar", "defaultValue": "", "field": "clientId", "fieldName": "", "id": "434Ri02", "jnpfKey": "popupSelect", "relationField": "clientId", "required": "0" }],
             },
-            toggleTreeExpand(expands) {
-                this.refreshTree = false
-                this.expandsTree = expands
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo']),
+        menuId() {
+            return this.$route.meta.modelId || ''
+        }
+    },
+    created() {
+        this.getColumnList(),
+            this.initSearchDataAndListData()
+        this.getorderTypeIdOptions();
+        this.getorderClientStatusIdOptions();
+        this.getorderStafstatusIdOptions();
+        this.getrecycleStationIdOptions();
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+    },
+    methods: {
+        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.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            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
-                            }
-                        }
+            })
+        },
+        toggleTreeExpand(expands) {
+            this.refreshTree = false
+            this.expandsTree = expands
+            this.$nextTick(() => {
+                this.refreshTree = true
+                this.$nextTick(() => {
+                    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] || ''
                     }
                 }
-                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
-            },
-                    getorderTypeIdOptions() {
-                        getDictionaryDataSelector('520193298627825989').then(res => {
-                            this.orderTypeIdOptions = res.data.list
-                        })
-                    },
-                    getorderClientStatusIdOptions() {
-                        getDictionaryDataSelector('520192751392788805').then(res => {
-                            this.orderClientStatusIdOptions = res.data.list
-                        })
-                    },
-                    getorderStafstatusIdOptions() {
-                        getDictionaryDataSelector('520192751392788805').then(res => {
-                            this.orderStafstatusIdOptions = res.data.list
-                        })
-                    },
-                    getrecycleStationIdOptions() {
-                        getDataInterfaceRes('520259300875047493').then(res => {
-                            let data = res.data
-                            this.recycleStationIdOptions = data
-                        })
-                    },
-            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() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'520255187403674181',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/RecycleOrder/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/RecycleOrder/${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/RecycleOrder")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
+                } else {
+                    this.mergeList.push({
+                        prop: item.prop,
+                        rowspan: 1,
+                        colspan: 1
                     })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            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
+        },
+        getorderTypeIdOptions() {
+            getDictionaryDataSelector('520193298627825989').then(res => {
+                this.orderTypeIdOptions = res.data.list
+            })
+        },
+        getorderClientStatusIdOptions() {
+            getDictionaryDataSelector('520192751392788805').then(res => {
+                this.orderClientStatusIdOptions = res.data.list
+            })
+        },
+        getorderStafstatusIdOptions() {
+            getDictionaryDataSelector('520192751392788805').then(res => {
+                this.orderStafstatusIdOptions = res.data.list
+            })
+        },
+        getrecycleStationIdOptions() {
+            getDataInterfaceRes('520259300875047493').then(res => {
+                let data = res.data
+                this.recycleStationIdOptions = data
+            })
+        },
+        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() {
+        },
+        initData() {
+            this.listLoading = true;
+            let _query = {
+                ...this.listQuery,
+                ...this.query,
+                keyword: this.keyword,
+                dataType: 0,
+                menuId: this.menuId,
+                moduleId: '520255187403674181',
+                type: 1,
+            };
+            request({
+                url: `/api/scm/RecycleOrder/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/RecycleOrder/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/scm/RecycleOrder/${id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx=""
-                this.initData()
-            },
-            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/RecycleOrder")
+            })
+        },
+        openSuperQuery() {
+            this.superQueryVisible = true
+            this.$nextTick(() => {
+                this.$refs.SuperQuery.init()
+            })
+        },
+        superQuery(queryJson) {
+            this.listQuery.superQueryJson = queryJson
+            this.listQuery.currentPage = 1
+            this.initData()
+        },
+        addOrUpdateHandle(row, isDetail) {
+            let id = row ? row.id : ""
+            this.formVisible = true
+            this.$nextTick(() => {
+                this.$refs.JNPFForm.init(id, isDetail, this.list)
+            })
+        },
+        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/RecycleOrder/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()
+        },
+        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/recyclestationstaff/index.vue b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/index.vue
index d550953..0f1bd06 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,45 +5,27 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="回收站">
-              <JnpfSelect
-                v-model="query.stationId"
-                placeholder="请选择"
-                clearable
-                :options="stationIdOptions"
-                :props="stationIdProps"
-                multiple
-              >
+              <JnpfSelect v-model="query.stationId" placeholder="请选择" clearable :options="stationIdOptions"
+                :props="stationIdProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="回收员姓名">
-              <el-input
-                v-model="query.staffsName"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.staffsName" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="回收员手机">
-              <el-input
-                v-model="query.mobilePhone"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.mobilePhone" 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
-              >
-              <el-button icon="el-icon-refresh-right" @click="reset()"
-                >重置</el-button
-              >
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -58,59 +33,39 @@
       <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"
-              @click="addOrUpdateHandle()"
-              >新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          :span-method="arraySpanMethod"
-        >
-          <el-table-column prop="stationId" label="回收站" align="left">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
+                    <el-table-column prop="stationId" label="回收站" sortable width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="staffsName" label="回收员姓名" align="left">
+          <el-table-column prop="staffsName" label="回收员姓名"  width="200px" align="center">
           </el-table-column>
-          <el-table-column prop="mobilePhone" label="回收员手机" align="left">
+          <el-table-column prop="mobilePhone" label="回收员手机"  width="200px" align="center">
           </el-table-column>
-          <el-table-column label="性别" prop="gender" algin="left">
+          <el-table-column label="性别" prop="gender"  width="100px" align="center">
             <template slot-scope="scope">
               {{ scope.row.gender }}
             </template>
           </el-table-column>
-          <el-table-column prop="birthday" label="生日" align="left">
+          <el-table-column prop="birthday" label="生日"  width="150px" align="center">
           </el-table-column>
-          <el-table-column prop="autoEnabled" label="自动接单" align="left">
+          <el-table-column prop="autoEnabled" label="自动接单"  width="80px" align="center">
+
             <template slot-scope="scope">
-              <div
-                v-if="scope.row.autoEnabled == '开'"
-                style="display: flex; align-items: center"
-              >
+              <div v-if="scope.row.autoEnabled == '开'" style="display: flex; align-items: center">
                 <div class="green"></div>
                 <span style="margin-left: 10px">开</span>
               </div>
@@ -121,51 +76,29 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right"  width="160px" align="center">
+
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)"
-                >编辑
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
               </el-button>
-              <el-button
-                type="text"
-                class="JNPF-table-delBtn"
-                @click="handleDel(scope.row.id)"
-                >删除
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)"
-                >详情
+              <el-button type="text" @click="goDetail(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" />
 
     <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -429,7 +362,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -473,7 +406,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
@@ -545,6 +478,7 @@ export default {
   },
 };
 </script>
+
 <style scoped>
 .green {
   width: 10px;
@@ -552,6 +486,7 @@ export default {
   border-radius: 50%;
   background-color: rgb(95, 197, 146);
 }
+
 .red {
   width: 10px;
   height: 10px;