diff --git a/jnpf-java-boot/jnpf-web/src/views/enterprise/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/enterprise/Detail.vue
index 4966bd8..9b6c841 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterprise/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterprise/Detail.vue
@@ -1,263 +1,238 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取消</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" size="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="基础信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户代码"  
- prop="enterpriseCode"  >
-                        <p>{{dataForm.enterpriseCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户名称"  
- prop="enterpriseName"  >
-                        <p>{{dataForm.enterpriseName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户简称"  
- prop="enterpriseShortName"  >
-                        <p>{{dataForm.enterpriseShortName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="主体类型"  
- prop="principalTypeId"  >
-                        <p>{{dataForm.principalTypeId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="所在城市"  
- prop="city"  >
-                        <p>{{dataForm.city}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="行业分类"  
- prop="industryTypeId"  >
-                        <p>{{dataForm.industryTypeId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="首联系人"  
- prop="firstContactPerson"  >
-                        <p>{{dataForm.firstContactPerson}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="职位"  
- prop="firstContactPersonPosition"  >
-                        <p>{{dataForm.firstContactPersonPosition}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="手机号码"  
- prop="firstContactPersonTel"  >
-                        <p>{{dataForm.firstContactPersonTel}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="详细信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户logo"  
- prop="enterpriseLogo"  >
-                    <JnpfUploadImg    v-model="dataForm.enterpriseLogo"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="default" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="基础信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户代码" prop="enterpriseCode">
+                <p>{{dataForm.enterpriseCode}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户名称" prop="enterpriseName">
+                <p>{{dataForm.enterpriseName}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户简称" prop="enterpriseShortName">
+                <p>{{dataForm.enterpriseShortName}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="主体类型" prop="principalTypeId">
+                <p>{{dataForm.principalTypeId}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="所在城市" prop="city">
+                <p>{{dataForm.city}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="行业分类" prop="industryTypeId">
+                <p>{{dataForm.industryTypeId}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
+                <p>{{dataForm.firstContactPerson}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
+                <p>{{dataForm.firstContactPersonPosition}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
+                <p>{{dataForm.firstContactPersonTel}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="详细信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户logo" prop="enterpriseLogo">
+                <JnpfUploadImg v-model="dataForm.enterpriseLogo" disabled detailed :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="address"  >
-                        <p>{{dataForm.address}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="固话"  
- prop="landline"  >
-                        <p>{{dataForm.landline}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="传真"  
- prop="fax"  >
-                        <p>{{dataForm.fax}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="公司网址"  
- prop="website"  >
-                        <p>https://{{dataForm.website}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户介绍"  
- prop="description"  >
-                        <p>{{dataForm.description}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="财务信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="发票抬头"  
- prop="invoiceHeader"  >
-                        <p>{{dataForm.invoiceHeader}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="商户税号"  
- prop="taxId"  >
-                        <p>{{dataForm.taxId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="开户银行"  
- prop="depositBank"  >
-                        <p>{{dataForm.depositBank}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="开户银行账号"  
- prop="depositBankAccount"  >
-                        <p>{{dataForm.depositBankAccount}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="电话号码"  
- prop="financeTel"  >
-                        <p>{{dataForm.financeTel}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="注册地址"  
- prop="registerAddress"  >
-                        <p>{{dataForm.registerAddress}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="详细地址" prop="address">
+                <p>{{dataForm.address}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="固话" prop="landline">
+                <p>{{dataForm.landline}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="传真" prop="fax">
+                <p>{{dataForm.fax}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="公司网址" prop="website">
+                <p>https://{{dataForm.website}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户介绍" prop="description">
+                <p>{{dataForm.description}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="财务信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="发票抬头" prop="invoiceHeader">
+                <p>{{dataForm.invoiceHeader}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户税号" prop="taxId">
+                <p>{{dataForm.taxId}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="开户银行" prop="depositBank">
+                <p>{{dataForm.depositBank}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="开户银行账号" prop="depositBankAccount">
+                <p>{{dataForm.depositBankAccount}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="电话号码" prop="financeTel">
+                <p>{{dataForm.financeTel}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="注册地址" prop="registerAddress">
+                <p>{{dataForm.registerAddress}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            enterpriseCode : '',
-                            enterpriseName : '',
-                            enterpriseShortName : '',
-                            principalTypeId : "",
-                            city : [],
-                            industryTypeId : "",
-                            firstContactPerson : '',
-                            firstContactPersonPosition : '',
-                            firstContactPersonTel : '',
-                            enterpriseLogo : [],
-                            address : '',
-                            landline : '',
-                            fax : '',
-                            website : '',
-                            description : '',
-                            invoiceHeader : '',
-                            taxId : '',
-                            depositBank : '',
-                            depositBankAccount : '',
-                            financeTel : '',
-                            registerAddress : '',
-            },
-                        principalTypeIdProps:{"label":"fullName","value":"id"  },
-                        industryTypeIdProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        enterpriseCode: '',
+        enterpriseName: '',
+        enterpriseShortName: '',
+        principalTypeId: "",
+        city: [],
+        industryTypeId: "",
+        firstContactPerson: '',
+        firstContactPersonPosition: '',
+        firstContactPersonTel: '',
+        enterpriseLogo: [],
+        address: '',
+        landline: '',
+        fax: '',
+        website: '',
+        description: '',
+        invoiceHeader: '',
+        taxId: '',
+        depositBank: '',
+        depositBankAccount: '',
+        financeTel: '',
+        registerAddress: '',
+      },
+      principalTypeIdProps: { "label": "fullName", "value": "id" },
+      industryTypeIdProps: { "label": "fullName", "value": "id" },
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/Enterprise/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/Enterprise/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterprise/form.vue b/jnpf-java-boot/jnpf-web/src/views/enterprise/form.vue
index 8c2a94c..27d0c82 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterprise/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterprise/form.vue
@@ -2,761 +2,752 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="基础信息"  contentPosition="left" >
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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="default"
+          label-width="100px" label-position="right">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="基础信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户代码"   prop="enterpriseCode" >
-        <JnpfInput   v-model="dataForm.enterpriseCode" @change="changeData('enterpriseCode',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户名称"   prop="enterpriseName" >
-        <JnpfInput   v-model="dataForm.enterpriseName" @change="changeData('enterpriseName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户简称"   prop="enterpriseShortName" >
-        <JnpfInput   v-model="dataForm.enterpriseShortName" @change="changeData('enterpriseShortName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="主体类型"   prop="principalTypeId" >
-        <JnpfSelect   v-model="dataForm.principalTypeId" @change="changeData('principalTypeId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="principalTypeIdOptions" :props="principalTypeIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="所在城市"   prop="city" >
-        <JnpfAreaSelect   v-model="dataForm.city" @change="changeData('city',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :level="1" >
-    </JnpfAreaSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="行业分类"   prop="industryTypeId" >
-        <JnpfSelect   v-model="dataForm.industryTypeId" @change="changeData('industryTypeId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="industryTypeIdOptions" :props="industryTypeIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="首联系人"   prop="firstContactPerson" >
-        <JnpfInput   v-model="dataForm.firstContactPerson" @change="changeData('firstContactPerson',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="职位"   prop="firstContactPersonPosition" >
-        <JnpfInput   v-model="dataForm.firstContactPersonPosition" @change="changeData('firstContactPersonPosition',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="手机号码"   prop="firstContactPersonTel" >
-        <JnpfInput   v-model="dataForm.firstContactPersonTel" @change="changeData('firstContactPersonTel',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="详细信息"  contentPosition="left" >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户代码" prop="enterpriseCode">
+                <JnpfInput v-model="dataForm.enterpriseCode"
+                  @change="changeData('enterpriseCode',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户名称" prop="enterpriseName">
+                <JnpfInput v-model="dataForm.enterpriseName"
+                  @change="changeData('enterpriseName',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户简称" prop="enterpriseShortName">
+                <JnpfInput v-model="dataForm.enterpriseShortName"
+                  @change="changeData('enterpriseShortName',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="主体类型" prop="principalTypeId">
+                <JnpfSelect v-model="dataForm.principalTypeId"
+                  @change="changeData('principalTypeId',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="principalTypeIdOptions"
+                  :props="principalTypeIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="所在城市" prop="city">
+                <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
+                  placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
+                </JnpfAreaSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="行业分类" prop="industryTypeId">
+                <JnpfSelect v-model="dataForm.industryTypeId"
+                  @change="changeData('industryTypeId',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="industryTypeIdOptions"
+                  :props="industryTypeIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
+                <JnpfInput v-model="dataForm.firstContactPerson"
+                  @change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
+                <JnpfInput v-model="dataForm.firstContactPersonPosition"
+                  @change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
+                <JnpfInput v-model="dataForm.firstContactPersonTel"
+                  @change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="详细信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户logo"   prop="enterpriseLogo" >
-        <JnpfUploadImg   v-model="dataForm.enterpriseLogo" @change="changeData('enterpriseLogo',-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="address" >
-        <JnpfInput   v-model="dataForm.address" @change="changeData('address',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="固话"   prop="landline" >
-        <JnpfInput   v-model="dataForm.landline" @change="changeData('landline',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="传真"   prop="fax" >
-        <JnpfInput   v-model="dataForm.fax" @change="changeData('fax',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="公司网址"   prop="website" >
-        <JnpfInput   v-model="dataForm.website" @change="changeData('website',-1)" 
- placeholder="请输入"  addonBefore="https://"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户介绍"   prop="description" >
-        <JnpfTextarea   v-model="dataForm.description" @change="changeData('description',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="财务信息"  contentPosition="left" >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户logo" prop="enterpriseLogo">
+                <JnpfUploadImg v-model="dataForm.enterpriseLogo"
+                  @change="changeData('enterpriseLogo',-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="address">
+                <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="固话" prop="landline">
+                <JnpfInput v-model="dataForm.landline" @change="changeData('landline',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="传真" prop="fax">
+                <JnpfInput v-model="dataForm.fax" @change="changeData('fax',-1)" placeholder="请输入"
+                  clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="公司网址" prop="website">
+                <JnpfInput v-model="dataForm.website" @change="changeData('website',-1)"
+                  placeholder="请输入" addonBefore="https://" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户介绍" prop="description">
+                <JnpfTextarea v-model="dataForm.description" @change="changeData('description',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'
+                  :autosize='{"minRows":4,"maxRows":4}'>
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="财务信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="发票抬头" prop="invoiceHeader">
+                <JnpfInput v-model="dataForm.invoiceHeader" @change="changeData('invoiceHeader',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="商户税号" prop="taxId">
+                <JnpfInput v-model="dataForm.taxId" @change="changeData('taxId',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="开户银行" prop="depositBank">
+                <JnpfInput v-model="dataForm.depositBank" @change="changeData('depositBank',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="发票抬头"   prop="invoiceHeader" >
-        <JnpfInput   v-model="dataForm.invoiceHeader" @change="changeData('invoiceHeader',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="商户税号"   prop="taxId" >
-        <JnpfInput   v-model="dataForm.taxId" @change="changeData('taxId',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="开户银行"   prop="depositBank" >
-        <JnpfInput   v-model="dataForm.depositBank" @change="changeData('depositBank',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="开户银行账号"   prop="depositBankAccount" >
-        <JnpfInput   v-model="dataForm.depositBankAccount" @change="changeData('depositBankAccount',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="电话号码"   prop="financeTel" >
-        <JnpfInput   v-model="dataForm.financeTel" @change="changeData('financeTel',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="注册地址"   prop="registerAddress" >
-        <JnpfInput   v-model="dataForm.registerAddress" @change="changeData('registerAddress',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="开户银行账号" prop="depositBankAccount">
+                <JnpfInput v-model="dataForm.depositBankAccount"
+                  @change="changeData('depositBankAccount',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="电话号码" prop="financeTel">
+                <JnpfInput v-model="dataForm.financeTel" @change="changeData('financeTel',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="注册地址" prop="registerAddress">
+                <JnpfInput v-model="dataForm.registerAddress"
+                  @change="changeData('registerAddress',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                enterpriseCode : undefined,
-                                enterpriseName : undefined,
-                                enterpriseShortName : undefined,
-                                    principalTypeId : undefined,
-                                    city : [],
-                                    industryTypeId : undefined,
-                                firstContactPerson : undefined,
-                                firstContactPersonPosition : undefined,
-                                firstContactPersonTel : undefined,
-                                    enterpriseLogo : [],
-                                address : undefined,
-                                landline : undefined,
-                                fax : undefined,
-                                website : undefined,
-                                description : undefined,
-                                invoiceHeader : undefined,
-                                taxId : undefined,
-                                depositBank : undefined,
-                                depositBankAccount : undefined,
-                                financeTel : undefined,
-                                registerAddress : undefined,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            enterpriseCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            enterpriseName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            principalTypeId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            city: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            industryTypeId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            firstContactPerson: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            firstContactPersonTel: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-                                        message: '请输入正确的联系方式',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            enterpriseLogo: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            address: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            landline: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-                                        message: '请输入正确的联系方式',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            invoiceHeader: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            taxId: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            depositBank: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            depositBankAccount: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            financeTel: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            registerAddress: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-                    principalTypeIdOptions:[],
-                            principalTypeIdProps:{"label":"fullName","value":"id"  },
-                    industryTypeIdOptions:[],
-                            industryTypeIdProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        enterpriseCode:[] ,
-                        enterpriseName:[] ,
-                        enterpriseShortName:[] ,
-                        principalTypeId:[] ,
-                        city:[] ,
-                        industryTypeId:[] ,
-                        firstContactPerson:[] ,
-                        firstContactPersonPosition:[] ,
-                        firstContactPersonTel:[] ,
-                        enterpriseLogo:[] ,
-                        address:[] ,
-                        landline:[] ,
-                        fax:[] ,
-                        website:[] ,
-                        description:[] ,
-                        invoiceHeader:[] ,
-                        taxId:[] ,
-                        depositBank:[] ,
-                        depositBankAccount:[] ,
-                        financeTel:[] ,
-                        registerAddress:[] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        enterpriseCode: undefined,
+        enterpriseName: undefined,
+        enterpriseShortName: undefined,
+        principalTypeId: undefined,
+        city: [],
+        industryTypeId: undefined,
+        firstContactPerson: undefined,
+        firstContactPersonPosition: undefined,
+        firstContactPersonTel: undefined,
+        enterpriseLogo: [],
+        address: undefined,
+        landline: undefined,
+        fax: undefined,
+        website: undefined,
+        description: undefined,
+        invoiceHeader: undefined,
+        taxId: undefined,
+        depositBank: undefined,
+        depositBankAccount: undefined,
+        financeTel: undefined,
+        registerAddress: undefined,
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+        enterpriseCode: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        enterpriseName: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        principalTypeId: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        city: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ],
+        industryTypeId: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        firstContactPerson: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        firstContactPersonTel: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+          {
+            pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+            message: '请输入正确的联系方式',
+            trigger: 'blur'
+          },
+        ],
+        enterpriseLogo: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ],
+        address: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        landline: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+          {
+            pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+            message: '请输入正确的联系方式',
+            trigger: 'blur'
+          },
+        ],
+        invoiceHeader: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        taxId: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        depositBank: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        depositBankAccount: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        financeTel: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        registerAddress: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+      },
+      principalTypeIdOptions: [],
+      principalTypeIdProps: { "label": "fullName", "value": "id" },
+      industryTypeIdOptions: [],
+      industryTypeIdProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        enterpriseCode: [],
+        enterpriseName: [],
+        enterpriseShortName: [],
+        principalTypeId: [],
+        city: [],
+        industryTypeId: [],
+        firstContactPerson: [],
+        firstContactPersonPosition: [],
+        firstContactPersonTel: [],
+        enterpriseLogo: [],
+        address: [],
+        landline: [],
+        fax: [],
+        website: [],
+        description: [],
+        invoiceHeader: [],
+        taxId: [],
+        depositBank: [],
+        depositBankAccount: [],
+        financeTel: [],
+        registerAddress: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/Enterprise/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getprincipalTypeIdOptions();
-                        this.getindustryTypeIdOptions();
-            },
-                    getprincipalTypeIdOptions() {
-                    getDictionaryDataSelector('9b542177a477488994ce09fff3c93901').then(res => {
-                        this.principalTypeIdOptions = res.data.list
-                    })
-                },
-                    getindustryTypeIdOptions() {
-                    getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
-                        this.industryTypeIdOptions = res.data.list
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/Enterprise/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/Enterprise/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getprincipalTypeIdOptions();
+      this.getindustryTypeIdOptions();
+    },
+    getprincipalTypeIdOptions() {
+      getDictionaryDataSelector('9b542177a477488994ce09fff3c93901').then(res => {
+        this.principalTypeIdOptions = res.data.list
+      })
+    },
+    getindustryTypeIdOptions() {
+      getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
+        this.industryTypeIdOptions = res.data.list
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/Enterprise/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/Enterprise',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/Enterprise/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/Enterprise',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/Enterprise/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterprise/index.vue b/jnpf-java-boot/jnpf-web/src/views/enterprise/index.vue
index 022beb9..46d700e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterprise/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterprise/index.vue
@@ -6,633 +6,568 @@
 
 
 <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.enterpriseCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="商户名称">
-                                        <el-input v-model="query.enterpriseName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="主体类型">
-                                        <JnpfSelect v-model="query.principalTypeId" placeholder="请选择" clearable
-                                                    :options="principalTypeIdOptions"
-                                                    :props="principalTypeIdProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="商户简称">
-                                                <el-input v-model="query.enterpriseShortName" 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>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="所在城市">
-                                                <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.industryTypeId" placeholder="请选择" clearable
-                                                            :options="industryTypeIdOptions"
-                                                            :props="industryTypeIdProps"  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-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" >批量删除
-                                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'   has-c @selection-change="handleSelectionChange"
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="enterpriseCode"
- label="商户代码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="enterpriseName"
- label="商户名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="principalTypeId"
- label="主体类型"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="enterpriseShortName"
- label="商户简称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="city"
- label="所在城市"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="industryTypeId"
- 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>
-                                                <el-table-column
-                                                            prop="firstContactPersonTel"
- label="手机号码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="address"
- label="详细地址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="landline"
- label="固话"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="fax"
- label="传真"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="website"
- label="公司网址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="description"
- label="商户介绍"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="invoiceHeader"
- label="发票抬头"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="taxId"
- label="商户税号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="depositBank"
- label="开户银行"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="depositBankAccount"
- label="开户银行账号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="financeTel"
- label="电话号码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="registerAddress"
- 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>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <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.enterpriseCode" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="商户名称">
+              <el-input v-model="query.enterpriseName" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="主体类型">
+              <JnpfSelect v-model="query.principalTypeId" placeholder="请选择" clearable
+                :options="principalTypeIdOptions" :props="principalTypeIdProps" multiple>
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="商户简称">
+                <el-input v-model="query.enterpriseShortName" 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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="所在城市">
+                <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.industryTypeId" placeholder="请选择" clearable
+                  :options="industryTypeIdOptions" :props="industryTypeIdProps" 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-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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="text" icon="icon-ym icon-ym-btn-download" @click="exportData()">导出
+            </el-button>
+            <el-button type="text" icon="icon-ym icon-ym-btn-clearn"
+              @click="handleBatchRemoveDel()">批量删除
+            </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>
+          </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" />
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          <el-table-column prop="enterpriseCode" label="商户代码" align="left">
+          </el-table-column>
+          <el-table-column prop="enterpriseName" label="商户名称" align="left">
+          </el-table-column>
+          <el-table-column prop="principalTypeId" label="主体类型" align="left">
+          </el-table-column>
+          <el-table-column prop="enterpriseShortName" label="商户简称" align="left">
+          </el-table-column>
+          <el-table-column prop="city" label="所在城市" align="left">
+          </el-table-column>
+          <el-table-column prop="industryTypeId" 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>
+          <el-table-column prop="firstContactPersonTel" label="手机号码" align="left">
+          </el-table-column>
+          <el-table-column prop="address" label="详细地址" align="left">
+          </el-table-column>
+          <el-table-column prop="landline" label="固话" align="left">
+          </el-table-column>
+          <el-table-column prop="fax" label="传真" align="left">
+          </el-table-column>
+          <el-table-column prop="website" label="公司网址" align="left">
+          </el-table-column>
+          <el-table-column prop="description" label="商户介绍" align="left">
+          </el-table-column>
+          <el-table-column prop="invoiceHeader" label="发票抬头" align="left">
+          </el-table-column>
+          <el-table-column prop="taxId" label="商户税号" align="left">
+          </el-table-column>
+          <el-table-column prop="depositBank" label="开户银行" align="left">
+          </el-table-column>
+          <el-table-column prop="depositBankAccount" label="开户银行账号" align="left">
+          </el-table-column>
+          <el-table-column prop="financeTel" label="电话号码" align="left">
+          </el-table-column>
+          <el-table-column prop="registerAddress" 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>
+        </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" />
+    <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" />
+  </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: {
-                        enterpriseCode:undefined,
-                        enterpriseName:undefined,
-                        principalTypeId:undefined,
-                        enterpriseShortName:undefined,
-                        firstContactPerson:undefined,
-                        city:undefined,
-                        industryTypeId:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
- multipleSelection: [],                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                principalTypeIdOptions:[],
-                        principalTypeIdProps:{"label":"fullName","value":"id"  },
-                            industryTypeIdOptions:[],
-                        industryTypeIdProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        enterpriseCode: undefined,
+        enterpriseName: undefined,
+        principalTypeId: undefined,
+        enterpriseShortName: undefined,
+        firstContactPerson: undefined,
+        city: undefined,
+        industryTypeId: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [], total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      principalTypeIdOptions: [],
+      principalTypeIdProps: { "label": "fullName", "value": "id" },
+      industryTypeIdOptions: [],
+      industryTypeIdProps: { "label": "fullName", "value": "id" },
+      interfaceRes: {
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.getprincipalTypeIdOptions();
+    this.getindustryTypeIdOptions();
+    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
+      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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getprincipalTypeIdOptions();
-                    this.getindustryTypeIdOptions();
-            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
-                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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-                    getprincipalTypeIdOptions() {
-                        getDictionaryDataSelector('9b542177a477488994ce09fff3c93901').then(res => {
-                            this.principalTypeIdOptions = res.data.list
-                        })
-                    },
-                    getindustryTypeIdOptions() {
-                        getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
-                            this.industryTypeIdOptions = res.data.list
-                        })
-                    },
-            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:'517667717726077765',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/Enterprise/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/Enterprise/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/Enterprise")
-                })
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/scm/Enterprise/batchRemove`,
-                            data: ids,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-                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/Enterprise/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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    getprincipalTypeIdOptions() {
+      getDictionaryDataSelector('9b542177a477488994ce09fff3c93901').then(res => {
+        this.principalTypeIdOptions = res.data.list
+      })
+    },
+    getindustryTypeIdOptions() {
+      getDictionaryDataSelector('d59a3cf65f9847dbb08be449e3feae16').then(res => {
+        this.industryTypeIdOptions = res.data.list
+      })
+    },
+    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: '517667717726077765',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Enterprise/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/Enterprise/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Enterprise")
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/Enterprise/batchRemove`,
+          data: ids,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      })
+    },
+    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/Enterprise/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/enterpriseaccountbill/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/Detail.vue
index 7a8cf4e..76c35f1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/Detail.vue
@@ -1,148 +1,140 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取 消</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" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="流水编号"  
- prop="billNumber"  >
-                        <p>{{dataForm.billNumber}}</p>
-                </jnpf-form-tip-item>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="small" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="8">
+              <jnpf-form-tip-item label="流水编号" prop="billNumber">
+                <p>{{dataForm.billNumber}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="订单编号"  
- prop="orderNumber"  >
-                        <p>{{dataForm.orderNumber}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单编号" prop="orderNumber">
+                <p>{{dataForm.orderNumber}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="订单类型"  
- prop="orderTypeId"  >
-                        <p>{{dataForm.orderTypeId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单类型" prop="orderTypeId">
+                <p>{{dataForm.orderTypeId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="单据状态"  
- prop="billStatusId"  >
-                        <p>{{dataForm.billStatusId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="单据状态" prop="billStatusId">
+                <p>{{dataForm.billStatusId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="收入（元）"  
- prop="incomeAmount"  >
-                        <p>{{dataForm.incomeAmount}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="收入（元）" prop="incomeAmount">
+                <p>{{dataForm.incomeAmount}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="支出（元）"  
- prop="payoutAmount"  >
-                        <p>{{dataForm.payoutAmount}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="支出（元）" prop="payoutAmount">
+                <p>{{dataForm.payoutAmount}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="余额（元）"  
- prop="accountBalance"  >
-                        <p>{{dataForm.accountBalance}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="余额（元）" prop="accountBalance">
+                <p>{{dataForm.accountBalance}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="备注"  
- prop="remark"  >
-                        <p>{{dataForm.remark}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="备注" prop="remark">
+                <p>{{dataForm.remark}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-    </template>
-</el-form>
-    </el-row>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            billNumber : '',
-                            orderNumber : '',
-                            orderTypeId : "",
-                            billStatusId : "",
-                            incomeAmount : '',
-                            payoutAmount : '',
-                            accountBalance : '',
-                            remark : '',
-            },
-                        orderTypeIdProps:{"label":"fullName","value":"id"  },
-                        billStatusIdProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        billNumber: '',
+        orderNumber: '',
+        orderTypeId: "",
+        billStatusId: "",
+        incomeAmount: '',
+        payoutAmount: '',
+        accountBalance: '',
+        remark: '',
+      },
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      billStatusIdProps: { "label": "fullName", "value": "id" },
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/EnterpriseAccountBill/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/EnterpriseAccountBill/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue
index 508709e..902c8e7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/form.vue
@@ -2,488 +2,485 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="流水编号"   prop="billNumber" >
-        <JnpfInput   v-model="dataForm.billNumber" @change="changeData('billNumber',-1)" 
- placeholder="请输入"  disabled  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="订单编号"   prop="orderNumber" >
-        <JnpfInput   v-model="dataForm.orderNumber" @change="changeData('orderNumber',-1)" 
- placeholder="请输入"  clearable  :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="请选择"  clearable  :style='{"width":"100%"}' :options="orderTypeIdOptions" :props="orderTypeIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="单据状态"   prop="billStatusId" >
-        <JnpfSelect   v-model="dataForm.billStatusId" @change="changeData('billStatusId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="billStatusIdOptions" :props="billStatusIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="收入（元）"   prop="incomeAmount" >
-        <JnpfInput   v-model="dataForm.incomeAmount" @change="changeData('incomeAmount',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="支出（元）"   prop="payoutAmount" >
-        <JnpfInput   v-model="dataForm.payoutAmount" @change="changeData('payoutAmount',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="余额（元）"   prop="accountBalance" >
-        <JnpfInput   v-model="dataForm.accountBalance" @change="changeData('accountBalance',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="备注"   prop="remark" >
-        <JnpfTextarea   v-model="dataForm.remark" @change="changeData('remark',-1)" 
- placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="8">
+              <jnpf-form-tip-item label="流水编号" prop="billNumber">
+                <JnpfInput v-model="dataForm.billNumber" @change="changeData('billNumber',-1)"
+                  placeholder="请输入" disabled readonly clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单编号" prop="orderNumber">
+                <JnpfInput v-model="dataForm.orderNumber" @change="changeData('orderNumber',-1)"
+                  placeholder="请输入" clearable :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="请选择" clearable :style='{"width":"100%"}'
+                  :options="orderTypeIdOptions" :props="orderTypeIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="单据状态" prop="billStatusId">
+                <JnpfSelect v-model="dataForm.billStatusId" @change="changeData('billStatusId',-1)"
+                  placeholder="请选择" clearable :style='{"width":"100%"}'
+                  :options="billStatusIdOptions" :props="billStatusIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="收入（元）" prop="incomeAmount">
+                <JnpfInput v-model="dataForm.incomeAmount" @change="changeData('incomeAmount',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="支出（元）" prop="payoutAmount">
+                <JnpfInput v-model="dataForm.payoutAmount" @change="changeData('payoutAmount',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="余额（元）" prop="accountBalance">
+                <JnpfInput v-model="dataForm.accountBalance"
+                  @change="changeData('accountBalance',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="备注" prop="remark">
+                <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark',-1)"
+                  placeholder="请输入" :style='{"width":"100%"}' true type="textarea"
+                  :autosize='{"minRows":4,"maxRows":4}'>
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                billNumber : undefined,
-                                orderNumber : undefined,
-                                    orderTypeId : undefined,
-                                    billStatusId : undefined,
-                                incomeAmount : undefined,
-                                payoutAmount : undefined,
-                                accountBalance : undefined,
-                                remark : undefined,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-            },
-                    orderTypeIdOptions:[],
-                            orderTypeIdProps:{"label":"fullName","value":"id"  },
-                    billStatusIdOptions:[],
-                            billStatusIdProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        billNumber:[] ,
-                        orderNumber:[] ,
-                        orderTypeId:[] ,
-                        billStatusId:[] ,
-                        incomeAmount:[] ,
-                        payoutAmount:[] ,
-                        accountBalance:[] ,
-                        remark:[] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        billNumber: undefined,
+        orderNumber: undefined,
+        orderTypeId: undefined,
+        billStatusId: undefined,
+        incomeAmount: undefined,
+        payoutAmount: undefined,
+        accountBalance: undefined,
+        remark: undefined,
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+      },
+      orderTypeIdOptions: [],
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      billStatusIdOptions: [],
+      billStatusIdProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        billNumber: [],
+        orderNumber: [],
+        orderTypeId: [],
+        billStatusId: [],
+        incomeAmount: [],
+        payoutAmount: [],
+        accountBalance: [],
+        remark: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/EnterpriseAccountBill/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getorderTypeIdOptions();
-                        this.getbillStatusIdOptions();
-            },
-                    getorderTypeIdOptions() {
-                    getDictionaryDataSelector('520193298627825989').then(res => {
-                        this.orderTypeIdOptions = res.data.list
-                    })
-                },
-                    getbillStatusIdOptions() {
-                    getDictionaryDataSelector('521683590119955205').then(res => {
-                        this.billStatusIdOptions = res.data.list
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/EnterpriseAccountBill/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/EnterpriseAccountBill/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getorderTypeIdOptions();
+      this.getbillStatusIdOptions();
+    },
+    getorderTypeIdOptions() {
+      getDictionaryDataSelector('520193298627825989').then(res => {
+        this.orderTypeIdOptions = res.data.list
+      })
+    },
+    getbillStatusIdOptions() {
+      getDictionaryDataSelector('521683590119955205').then(res => {
+        this.billStatusIdOptions = res.data.list
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/EnterpriseAccountBill/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/EnterpriseAccountBill',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/EnterpriseAccountBill/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/EnterpriseAccountBill',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/EnterpriseAccountBill/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
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 5715022..157b843 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriseaccountbill/index.vue
@@ -6,523 +6,492 @@
 
 
 <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.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>
-                                </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>
-                        <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>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="备注">
-                                                <el-input v-model="query.remark" 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>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="billNumber"
- label="流水编号"  align="left"
- >
-                                                </el-table-column>
-                                                <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="billStatusId"
- label="单据状态"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="incomeAmount"
- label="收入（元）"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="payoutAmount"
- label="支出（元）"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="accountBalance"
- label="余额（元）"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="remark"
- 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>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <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.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>
+            </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>
+          <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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="备注">
+                <el-input v-model="query.remark" 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>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                收起
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+          </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>
+          </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" />
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <el-table-column prop="billNumber" label="流水编号" align="left">
+          </el-table-column>
+          <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="billStatusId" label="单据状态" align="left">
+          </el-table-column>
+          <el-table-column prop="incomeAmount" label="收入（元）" align="left">
+          </el-table-column>
+          <el-table-column prop="payoutAmount" label="支出（元）" align="left">
+          </el-table-column>
+          <el-table-column prop="accountBalance" label="余额（元）" align="left">
+          </el-table-column>
+          <el-table-column prop="remark" 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>
+        </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" />
+    <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" />
+  </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: {
-                        billNumber:undefined,
-                        orderNumber:undefined,
-                        orderTypeId:undefined,
-                        billStatusId:undefined,
-                        remark:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                orderTypeIdOptions:[],
-                        orderTypeIdProps:{"label":"fullName","value":"id"  },
-                            billStatusIdOptions:[],
-                        billStatusIdProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        billNumber: undefined,
+        orderNumber: undefined,
+        orderTypeId: undefined,
+        billStatusId: undefined,
+        remark: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      orderTypeIdOptions: [],
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      billStatusIdOptions: [],
+      billStatusIdProps: { "label": "fullName", "value": "id" },
+      interfaceRes: {
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.getorderTypeIdOptions();
+    this.getbillStatusIdOptions();
+    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
+      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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getorderTypeIdOptions();
-                    this.getbillStatusIdOptions();
-            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
-                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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-                    getorderTypeIdOptions() {
-                        getDictionaryDataSelector('520193298627825989').then(res => {
-                            this.orderTypeIdOptions = res.data.list
-                        })
-                    },
-                    getbillStatusIdOptions() {
-                        getDictionaryDataSelector('521683590119955205').then(res => {
-                            this.billStatusIdOptions = res.data.list
-                        })
-                    },
-            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:'521683377103837957',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/EnterpriseAccountBill/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/EnterpriseAccountBill/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/EnterpriseAccountBill")
-                })
-            },
-                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/EnterpriseAccountBill/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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    getorderTypeIdOptions() {
+      getDictionaryDataSelector('520193298627825989').then(res => {
+        this.orderTypeIdOptions = res.data.list
+      })
+    },
+    getbillStatusIdOptions() {
+      getDictionaryDataSelector('521683590119955205').then(res => {
+        this.billStatusIdOptions = res.data.list
+      })
+    },
+    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: '521683377103837957',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/EnterpriseAccountBill/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/EnterpriseAccountBill/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/EnterpriseAccountBill")
+      })
+    },
+    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/EnterpriseAccountBill/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/enterpriserecyclestation/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/Detail.vue
index 8c98e43..2a07c5b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/Detail.vue
@@ -1,292 +1,270 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取消</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" size="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="基础信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站编号"  
- prop="stationCode"  >
-                        <p>{{dataForm.stationCode}}</p>
-                </jnpf-form-tip-item>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="default" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="基础信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站编号" prop="stationCode">
+                <p>{{dataForm.stationCode}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站名称"  
- prop="stationName"  >
-                        <p>{{dataForm.stationName}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站名称" prop="stationName">
+                <p>{{dataForm.stationName}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站简称"  
- prop="shortName"  >
-                        <p>{{dataForm.shortName}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站简称" prop="shortName">
+                <p>{{dataForm.shortName}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="经营模式"  
- prop="managementModel"  >
-                        <p>{{dataForm.managementModel}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="经营模式" prop="managementModel">
+                <p>{{dataForm.managementModel}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="所在城市"  
- prop="city"  >
-                        <p>{{dataForm.city}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="所在城市" prop="city">
+                <p>{{dataForm.city}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收类目"  
- prop="recycleTypeIds"  >
-                        <p>{{dataForm.recycleTypeIds}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
+                <p>{{dataForm.recycleTypeIds}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="首联系人"  
- prop="firstContactPerson"  >
-                        <p>{{dataForm.firstContactPerson}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
+                <p>{{dataForm.firstContactPerson}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="职位"  
- prop="firstContactPersonPosition"  >
-                        <p>{{dataForm.firstContactPersonPosition}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
+                <p>{{dataForm.firstContactPersonPosition}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="手机号码"  
- prop="firstContactPersonTel"  >
-                        <p>{{dataForm.firstContactPersonTel}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
+                <p>{{dataForm.firstContactPersonTel}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站状态"  
- prop="stationStatus"  >
-                        <p>{{dataForm.stationStatus}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站状态" prop="stationStatus">
+                <p>{{dataForm.stationStatus}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="详细信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站照片"  
- prop="stationImg"  >
-                    <JnpfUploadImg    v-model="dataForm.stationImg"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="1"  pathType="defaultPath"  :isAccount="0"  >
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="详细信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站照片" prop="stationImg">
+                <JnpfUploadImg v-model="dataForm.stationImg" disabled detailed :fileSize="10"
+                  sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="详细地址" prop="address">
+                <p>{{dataForm.address}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="详细地址"  
- prop="address"  >
-                        <p>{{dataForm.address}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收电话" prop="recycleTel">
+                <p>{{dataForm.recycleTel}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收电话"  
- prop="recycleTel"  >
-                        <p>{{dataForm.recycleTel}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="16">
+              <jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
+                <p>{{dataForm.stationDescription}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="16"  >
-                <jnpf-form-tip-item  label="回收站介绍"  
- prop="stationDescription"  >
-                        <p>{{dataForm.stationDescription}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>价格配置</h2>
+                </div>
+                <el-table :data="dataForm.tableField135" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column prop="recycleTypeId" label="回收类目">
+                    <template slot-scope="scope">
+                      <p>{{scope.row.recycleTypeId}}</p>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="unitPrice" label="单价(kg)">
+                    <template slot-scope="scope">
+                      <p>{{scope.row.unitPrice}}</p>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
             </el-col>
-    <el-col :span="24"  >
-    <jnpf-form-tip-item label-width="0">
-            <div class="JNPF-common-title">
-              <h2>价格配置</h2>
-            </div>
-    <el-table :data="dataForm.tableField135" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="recycleTypeId" label="回收类目" >
-            <template slot-scope="scope">
-                            <p>{{scope.row.recycleTypeId}}</p>
-        </template>
-        </el-table-column>
-            <el-table-column prop="unitPrice" label="单价(kg)" >
-            <template slot-scope="scope">
-                            <p>{{scope.row.unitPrice}}</p>
-        </template>
-        </el-table-column>
-    </el-table>
-    </jnpf-form-tip-item>
-    </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="业务配置" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-        <el-col   :span="24" >
-        <el-card class="mb-20" shadow ="never"  header ="营业时间配置">
-            <el-col :span="12"  >
-                <jnpf-form-tip-item  label="营业时间"  
- prop="businessDays"  >
-                         <p>{{ dataForm.businessDays }} </p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="业务配置">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="6"  >
-                <jnpf-form-tip-item  label="营业时间起"  
- prop="appointmentTimeStart"  >
-                        <p>{{dataForm.appointmentTimeStart}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <el-card class="mb-20" shadow="never" header="营业时间配置">
+                <el-col :span="12">
+                  <jnpf-form-tip-item label="营业时间" prop="businessDays">
+                    <p>{{ dataForm.businessDays }} </p>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="6">
+                  <jnpf-form-tip-item label="营业时间起" prop="appointmentTimeStart">
+                    <p>{{dataForm.appointmentTimeStart}}</p>
+                  </jnpf-form-tip-item>
+                </el-col>
+                <el-col :span="6">
+                  <jnpf-form-tip-item label="营业时间止" prop="appointmentTimeEnd">
+                    <p>{{dataForm.appointmentTimeEnd}}</p>
+                  </jnpf-form-tip-item>
+                </el-col>
+              </el-card>
             </el-col>
-            <el-col :span="6"  >
-                <jnpf-form-tip-item  label="营业时间止"  
- prop="appointmentTimeEnd"  >
-                        <p>{{dataForm.appointmentTimeEnd}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <el-card class="mb-20" shadow="never" header="接单范围配置">
+                <el-col :span="8">
+                  <jnpf-form-tip-item label="接单范围" prop="acceptRange">
+                    <p>{{ dataForm.acceptRange }} </p>
+                  </jnpf-form-tip-item>
+                </el-col>
+              </el-card>
             </el-col>
-        </el-card>
-        </el-col>
-        <el-col   :span="24" >
-        <el-card class="mb-20" shadow ="never"  header ="接单范围配置">
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="接单范围"  
- prop="acceptRange"  >
-                         <p>{{ dataForm.acceptRange }} </p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>范围内小区</h2>
+                </div>
+                <el-table :data="dataForm.tableField119" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column prop="housingEstateId" label="小区id">
+                    <template slot-scope="scope">
+                      <p>{{scope.row.housingEstateId}}</p>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
             </el-col>
-        </el-card>
-        </el-col>
-    <el-col :span="24"  >
-    <jnpf-form-tip-item label-width="0">
-            <div class="JNPF-common-title">
-              <h2>范围内小区</h2>
-            </div>
-    <el-table :data="dataForm.tableField119" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="housingEstateId" label="小区id" >
-            <template slot-scope="scope">
-                            <p>{{scope.row.housingEstateId}}</p>
-        </template>
-        </el-table-column>
-    </el-table>
-    </jnpf-form-tip-item>
-    </el-col>
-    </template>
-</el-form>
-    </el-row>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            stationCode : '',
-                            stationName : '',
-                            shortName : '',
-                            managementModel : "",
-                            city : [],
-                            recycleTypeIds : "",
-                            firstContactPerson : '',
-                            firstContactPersonPosition : '',
-                            firstContactPersonTel : '',
-                            stationStatus : 1,
-                            stationImg : [],
-                            address : '',
-                            recycleTel : '',
-                            stationDescription : '',
-                            businessDays : [],
-                            appointmentTimeStart : "",
-                            appointmentTimeEnd : "",
-                            acceptRange : "",
-                        recyclestationpriceList:[],
-                        recyclestationhousingestateList:[],
-            },
-                        managementModelProps:{"label":"fullName","value":"id"  },
-                        recycleTypeIdsProps:{"label":"fullName","value":"id"  },
-                            businessDaysOptions:[{"fullName":"周一","id":"1"},{"fullName":"周二","id":"2"},{"fullName":"周三","id":"3"},{"fullName":"周四","id":"4"},{"fullName":"周五","id":"5"},{"fullName":"周六","id":"6"},{"fullName":"周日","id":"7"}],
-                        businessDaysProps:{"label":"fullName","value":"id"  },
-                            acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
-                        acceptRangeProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        stationCode: '',
+        stationName: '',
+        shortName: '',
+        managementModel: "",
+        city: [],
+        recycleTypeIds: "",
+        firstContactPerson: '',
+        firstContactPersonPosition: '',
+        firstContactPersonTel: '',
+        stationStatus: 1,
+        stationImg: [],
+        address: '',
+        recycleTel: '',
+        stationDescription: '',
+        businessDays: [],
+        appointmentTimeStart: "",
+        appointmentTimeEnd: "",
+        acceptRange: "",
+        recyclestationpriceList: [],
+        recyclestationhousingestateList: [],
+      },
+      managementModelProps: { "label": "fullName", "value": "id" },
+      recycleTypeIdsProps: { "label": "fullName", "value": "id" },
+      businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
+      businessDaysProps: { "label": "fullName", "value": "id" },
+      acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
+      acceptRangeProps: { "label": "fullName", "value": "id" },
 
-                            recycleTypeIdProps:{"label":"fullName","value":"id"  },
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+      recycleTypeIdProps: { "label": "fullName", "value": "id" },
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/Enterpriserecyclestation/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/Enterpriserecyclestation/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
index 4a381c2..c104c6e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
@@ -2,872 +2,880 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="基础信息"  contentPosition="left" >
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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="default"
+          label-width="100px" label-position="right">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="基础信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站编号" prop="stationCode">
+                <JnpfInput v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站名称" prop="stationName">
+                <JnpfInput v-model="dataForm.stationName" @change="changeData('stationName',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站简称" prop="shortName">
+                <JnpfInput v-model="dataForm.shortName" @change="changeData('shortName',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="经营模式" prop="managementModel">
+                <JnpfSelect v-model="dataForm.managementModel"
+                  @change="changeData('managementModel',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="managementModelOptions"
+                  :props="managementModelProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="所在城市" prop="city">
+                <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
+                  placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
+                </JnpfAreaSelect>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站编号"   prop="stationCode" >
-        <JnpfInput   v-model="dataForm.stationCode" @change="changeData('stationCode',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站名称"   prop="stationName" >
-        <JnpfInput   v-model="dataForm.stationName" @change="changeData('stationName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站简称"   prop="shortName" >
-        <JnpfInput   v-model="dataForm.shortName" @change="changeData('shortName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="经营模式"   prop="managementModel" >
-        <JnpfSelect   v-model="dataForm.managementModel" @change="changeData('managementModel',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="managementModelOptions" :props="managementModelProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="所在城市"   prop="city" >
-        <JnpfAreaSelect   v-model="dataForm.city" @change="changeData('city',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :level="1" >
-    </JnpfAreaSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收类目"   prop="recycleTypeIds" >
-        <JnpfSelect   v-model="dataForm.recycleTypeIds" @change="changeData('recycleTypeIds',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="recycleTypeIdsOptions" :props="recycleTypeIdsProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="首联系人"   prop="firstContactPerson" >
-        <JnpfInput   v-model="dataForm.firstContactPerson" @change="changeData('firstContactPerson',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="职位"   prop="firstContactPersonPosition" >
-        <JnpfInput   v-model="dataForm.firstContactPersonPosition" @change="changeData('firstContactPersonPosition',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="手机号码"   prop="firstContactPersonTel" >
-        <JnpfInput   v-model="dataForm.firstContactPersonTel" @change="changeData('firstContactPersonTel',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站状态"   prop="stationStatus" >
-        <JnpfSwitch   v-model="dataForm.stationStatus" @change="changeData('stationStatus',-1)" 
- :active-value="1"  :inactive-value="0" >
-    </JnpfSwitch>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="详细信息"  contentPosition="left" >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
+                <JnpfSelect v-model="dataForm.recycleTypeIds"
+                  @change="changeData('recycleTypeIds',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="recycleTypeIdsOptions"
+                  :props="recycleTypeIdsProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
+                <JnpfInput v-model="dataForm.firstContactPerson"
+                  @change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
+                <JnpfInput v-model="dataForm.firstContactPersonPosition"
+                  @change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
+                <JnpfInput v-model="dataForm.firstContactPersonTel"
+                  @change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站状态" prop="stationStatus">
+                <JnpfSwitch v-model="dataForm.stationStatus"
+                  @change="changeData('stationStatus',-1)" :active-value="1" :inactive-value="0">
+                </JnpfSwitch>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="详细信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站照片"   prop="stationImg" >
-        <JnpfUploadImg   v-model="dataForm.stationImg" @change="changeData('stationImg',-1)" 
- :fileSize="10" sizeUnit="MB"  :limit="1"  pathType="defaultPath"  :isAccount="0" >
-    </JnpfUploadImg>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="详细地址"   prop="address" >
-        <JnpfInput   v-model="dataForm.address" @change="changeData('address',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收电话"   prop="recycleTel" >
-        <JnpfInput   v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="16" >
-        <jnpf-form-tip-item
- label="回收站介绍"   prop="stationDescription" >
-        <JnpfTextarea   v-model="dataForm.stationDescription" @change="changeData('stationDescription',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24"  >
-            <jnpf-form-tip-item label-width="0">
-                    <div class="JNPF-common-title">
-                        <h2>价格配置</h2>
-                    </div>
-                <el-table :data="dataForm.recyclestationpriceList" size='mini' >
-                    <el-table-column type="index" width="50" label="序号" align="center" />
-        <el-table-column
- label="回收类目"   prop="recycleTypeId" >
-                <template slot="header"  v-if="false"  >
-                    <span class="required-sign"  >*</span>回收类目
-                </template>
-        <template slot-scope="scope">
-        <JnpfSelect   v-model="scope.row.recycleTypeId" @change="changeData('recyclestationprice-recycleTypeId',scope.$index)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="recyclestationpricerecycleTypeIdOptions" :props="recyclestationpricerecycleTypeIdProps" >
-    </JnpfSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="单价(kg)"   prop="unitPrice" >
-                <template slot="header"  v-if="false"  >
-                    <span class="required-sign"  >*</span>单价(kg)
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.unitPrice" @change="changeData('recyclestationprice-unitPrice',scope.$index)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-                        <el-table-column label="操作" width="50"  >
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationpriceList(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站照片" prop="stationImg">
+                <JnpfUploadImg v-model="dataForm.stationImg" @change="changeData('stationImg',-1)"
+                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                </JnpfUploadImg>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="详细地址" prop="address">
+                <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收电话" prop="recycleTel">
+                <JnpfInput v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="16">
+              <jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
+                <JnpfTextarea v-model="dataForm.stationDescription"
+                  @change="changeData('stationDescription',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}'>
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>价格配置</h2>
+                </div>
+                <el-table :data="dataForm.recyclestationpriceList" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column label="回收类目" prop="recycleTypeId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>回收类目
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfSelect v-model="scope.row.recycleTypeId"
+                        @change="changeData('recyclestationprice-recycleTypeId',scope.$index)"
+                        placeholder="请选择" clearable :style='{"width":"100%"}'
+                        :options="recyclestationpricerecycleTypeIdOptions"
+                        :props="recyclestationpricerecycleTypeIdProps">
+                      </JnpfSelect>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="单价(kg)" prop="unitPrice">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>单价(kg)
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.unitPrice"
+                        @change="changeData('recyclestationprice-unitPrice',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                        @click="delrecyclestationpriceList(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
                 </el-table>
-                    <div class="table-actions" @click="addrecyclestationpriceList()" >
-                        <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div>
-            </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="业务配置"  contentPosition="left" >
+                <div class="table-actions" @click="addrecyclestationpriceList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="业务配置" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-                <el-card class="mb-20" shadow ="never" header="营业时间配置">
-        <el-col :span="12" >
-        <jnpf-form-tip-item
- label="营业时间"   prop="businessDays" >
-        <JnpfCheckbox   v-model="dataForm.businessDays" @change="changeData('businessDays',-1)" 
- optionType="default"  direction="horizontal"  :style='{"width":"100%"}' :options="businessDaysOptions" :props="businessDaysProps" >
-    </JnpfCheckbox>
-    </jnpf-form-tip-item>
-        </el-col>
+            <el-card class="mb-20" shadow="never" header="营业时间配置">
+              <el-col :span="12">
+                <jnpf-form-tip-item label="营业时间" prop="businessDays">
+                  <JnpfCheckbox v-model="dataForm.businessDays"
+                    @change="changeData('businessDays',-1)" optionType="default"
+                    direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions"
+                    :props="businessDaysProps">
+                  </JnpfCheckbox>
+                </jnpf-form-tip-item>
+              </el-col>
 
-        <el-col :span="6" >
-        <jnpf-form-tip-item
- label="营业时间起"   prop="appointmentTimeStart" >
-        <JnpfTimePicker   v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart',-1)" 
- :startTime="time(false,1,1,'','HH:mm','')"  :endTime="time(false,1,1,'','HH:mm','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' format="HH:mm" >
-    </JnpfTimePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+              <el-col :span="6">
+                <jnpf-form-tip-item label="营业时间起" prop="appointmentTimeStart">
+                  <JnpfTimePicker v-model="dataForm.appointmentTimeStart"
+                    @change="changeData('appointmentTimeStart',-1)"
+                    :startTime="time(false,1,1,'','HH:mm','')"
+                    :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
+                    :style='{"width":"100%"}' format="HH:mm">
+                  </JnpfTimePicker>
+                </jnpf-form-tip-item>
+              </el-col>
 
-        <el-col :span="6" >
-        <jnpf-form-tip-item
- label="营业时间止"   prop="appointmentTimeEnd" >
-        <JnpfTimePicker   v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd',-1)" 
- :startTime="time(false,1,1,'','HH:mm','')"  :endTime="time(false,1,1,'','HH:mm','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' format="HH:mm" >
-    </JnpfTimePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-                </el-card>
-                <el-card class="mb-20" shadow ="never" header="接单范围配置">
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="接单范围"   prop="acceptRange" >
-        <JnpfSelect   v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="acceptRangeOptions" :props="acceptRangeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-                </el-card>
-        <el-col :span="24"  >
-            <jnpf-form-tip-item label-width="0">
-                    <div class="JNPF-common-title">
-                        <h2>范围内小区</h2>
-                    </div>
-                <el-table :data="dataForm.recyclestationhousingestateList" size='mini' >
-                    <el-table-column type="index" width="50" label="序号" align="center" />
-        <el-table-column
- label="小区id"   prop="housingEstateId" >
-                <template slot="header"  v-if="false"  >
-                    <span class="required-sign"  >*</span>小区id
-                </template>
-        <template slot-scope="scope">
-        <JnpfPopupSelect   v-model="scope.row.housingEstateId" @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)" 
- :rowIndex="scope.$index"  :formData="dataForm"  :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  :field="'housingEstateId'+scope.$index"  interfaceId="520155939362312325"  :pageSize="20"  :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-            </template>
-    </el-table-column>
-                        <el-table-column label="操作" width="50"  >
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
+              <el-col :span="6">
+                <jnpf-form-tip-item label="营业时间止" prop="appointmentTimeEnd">
+                  <JnpfTimePicker v-model="dataForm.appointmentTimeEnd"
+                    @change="changeData('appointmentTimeEnd',-1)"
+                    :startTime="time(false,1,1,'','HH:mm','')"
+                    :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
+                    :style='{"width":"100%"}' format="HH:mm">
+                  </JnpfTimePicker>
+                </jnpf-form-tip-item>
+              </el-col>
+            </el-card>
+            <el-card class="mb-20" shadow="never" header="接单范围配置">
+              <el-col :span="8">
+                <jnpf-form-tip-item label="接单范围" prop="acceptRange">
+                  <JnpfSelect v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)"
+                    placeholder="请选择" clearable :style='{"width":"100%"}'
+                    :options="acceptRangeOptions" :props="acceptRangeProps">
+                  </JnpfSelect>
+                </jnpf-form-tip-item>
+              </el-col>
+            </el-card>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>范围内小区</h2>
+                </div>
+                <el-table :data="dataForm.recyclestationhousingestateList" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column label="小区id" prop="housingEstateId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>小区id
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfPopupSelect v-model="scope.row.housingEstateId"
+                        @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)"
+                        :rowIndex="scope.$index" :formData="dataForm"
+                        :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId"
+                        placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                        popupType="dialog" relationField='name'
+                        :field="'housingEstateId'+scope.$index" interfaceId="520155939362312325"
+                        :pageSize="20"
+                        :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions"
+                        clearable :style='{"width":"100%"}'>
+                      </JnpfPopupSelect>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                        @click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
                 </el-table>
-                    <div class="table-actions" @click="addrecyclestationhousingestateList()" >
-                        <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div>
-            </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+                <div class="table-actions" @click="addrecyclestationhousingestateList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-                            recyclestationpriceList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
-                            recyclestationhousingestateList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-                    recyclestationpriceList:{
-                                recycleTypeIdOptions:[],
-                            unitPrice : '',
-                                unitPriceOptions:[],
-                    enabledmark:undefined
-            },
-                    recyclestationhousingestateList:{
-                            housingEstateId : '',
-                                housingEstateIdOptions:[],
-                    enabledmark:undefined
-            },
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                stationCode : undefined,
-                                stationName : undefined,
-                                shortName : undefined,
-                                    managementModel : undefined,
-                                    city : [],
-                                    recycleTypeIds : undefined,
-                                firstContactPerson : undefined,
-                                firstContactPersonPosition : undefined,
-                                firstContactPersonTel : undefined,
-                                    stationStatus : 1,
-                                    stationImg : [],
-                                address : undefined,
-                                recycleTel : undefined,
-                                stationDescription : undefined,
-                                    businessDays : [],
-                                    appointmentTimeStart : undefined,
-                                    appointmentTimeEnd : undefined,
-                                    acceptRange : undefined,
-                        recyclestationpriceList:[],
-                        recyclestationhousingestateList:[],
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            stationCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            stationName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            managementModel: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            city: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            firstContactPerson: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            firstContactPersonTel: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            address: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            recycleTel: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-                                        message: '请输入正确的联系方式',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            businessDays: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            appointmentTimeStart: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            appointmentTimeEnd: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            acceptRange: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                    managementModelOptions:[],
-                            managementModelProps:{"label":"fullName","value":"id"  },
-                    recycleTypeIdsOptions:[],
-                            recycleTypeIdsProps:{"label":"fullName","value":"id"  },
-                            businessDaysOptions:[{"fullName":"周一","id":"1"},{"fullName":"周二","id":"2"},{"fullName":"周三","id":"3"},{"fullName":"周四","id":"4"},{"fullName":"周五","id":"5"},{"fullName":"周六","id":"6"},{"fullName":"周日","id":"7"}],
-                            businessDaysProps:{"label":"fullName","value":"id"  },
-                            acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
-                            acceptRangeProps:{"label":"fullName","value":"id"  },
-                        recyclestationpricerecycleTypeIdOptions:[],
-                                recyclestationpricerecycleTypeIdProps:{"label":"fullName","value":"id"  },
-                        recyclestationhousingestatehousingEstateIdcolumnOptions:[ {"label":"小区名称","value":"name"},],
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        stationCode:[] ,
-                        stationName:[] ,
-                        shortName:[] ,
-                        managementModel:[] ,
-                        city:[] ,
-                        recycleTypeIds:[] ,
-                        firstContactPerson:[] ,
-                        firstContactPersonPosition:[] ,
-                        firstContactPersonTel:[] ,
-                        stationStatus:[] ,
-                        stationImg:[] ,
-                        address:[] ,
-                        recycleTel:[] ,
-                        stationDescription:[] ,
-                        businessDays:[] ,
-                        appointmentTimeStart:[] ,
-                        appointmentTimeEnd:[] ,
-                        acceptRange:[] ,
-                            recyclestationpricerecycleTypeId: [] ,
-                            recyclestationpriceunitPrice: [] ,
-                            recyclestationhousingestatehousingEstateId: [] ,
-            },
-        }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+        recyclestationpriceList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+        recyclestationhousingestateList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+        recyclestationpriceList: {
+          recycleTypeIdOptions: [],
+          unitPrice: '',
+          unitPriceOptions: [],
+          enabledmark: undefined
         },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        recyclestationhousingestateList: {
+          housingEstateId: '',
+          housingEstateIdOptions: [],
+          enabledmark: undefined
         },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/Enterpriserecyclestation/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getmanagementModelOptions();
-                        this.getrecycleTypeIdsOptions();
-                            this.getrecyclestationpricerecycleTypeIdOptions();
-            },
-                recyclestationpriceExist() {
-                let isOk = true;
-            for(let i=0;i<this.dataForm.recyclestationpriceList.length;i++){
-                const e = this.dataForm.recyclestationpriceList[i];
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        stationCode: undefined,
+        stationName: undefined,
+        shortName: undefined,
+        managementModel: undefined,
+        city: [],
+        recycleTypeIds: undefined,
+        firstContactPerson: undefined,
+        firstContactPersonPosition: undefined,
+        firstContactPersonTel: undefined,
+        stationStatus: 1,
+        stationImg: [],
+        address: undefined,
+        recycleTel: undefined,
+        stationDescription: undefined,
+        businessDays: [],
+        appointmentTimeStart: undefined,
+        appointmentTimeEnd: undefined,
+        acceptRange: undefined,
+        recyclestationpriceList: [],
+        recyclestationhousingestateList: [],
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+        stationCode: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        stationName: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        managementModel: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        city: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ],
+        firstContactPerson: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        firstContactPersonTel: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        address: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        recycleTel: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+          {
+            pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+            message: '请输入正确的联系方式',
+            trigger: 'blur'
+          },
+        ],
+        businessDays: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ],
+        appointmentTimeStart: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        appointmentTimeEnd: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        acceptRange: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+      },
+      managementModelOptions: [],
+      managementModelProps: { "label": "fullName", "value": "id" },
+      recycleTypeIdsOptions: [],
+      recycleTypeIdsProps: { "label": "fullName", "value": "id" },
+      businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
+      businessDaysProps: { "label": "fullName", "value": "id" },
+      acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
+      acceptRangeProps: { "label": "fullName", "value": "id" },
+      recyclestationpricerecycleTypeIdOptions: [],
+      recyclestationpricerecycleTypeIdProps: { "label": "fullName", "value": "id" },
+      recyclestationhousingestatehousingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" },],
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        stationCode: [],
+        stationName: [],
+        shortName: [],
+        managementModel: [],
+        city: [],
+        recycleTypeIds: [],
+        firstContactPerson: [],
+        firstContactPersonPosition: [],
+        firstContactPersonTel: [],
+        stationStatus: [],
+        stationImg: [],
+        address: [],
+        recycleTel: [],
+        stationDescription: [],
+        businessDays: [],
+        appointmentTimeStart: [],
+        appointmentTimeEnd: [],
+        acceptRange: [],
+        recyclestationpricerecycleTypeId: [],
+        recyclestationpriceunitPrice: [],
+        recyclestationhousingestatehousingEstateId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/Enterpriserecyclestation/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
             }
-                return isOk;
-            },
-                recyclestationhousingestateExist() {
-                let isOk = true;
-            for(let i=0;i<this.dataForm.recyclestationhousingestateList.length;i++){
-                const e = this.dataForm.recyclestationhousingestateList[i];
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
             }
-                return isOk;
-            },
-                    getmanagementModelOptions() {
-                    getDictionaryDataSelector('519073654609283077').then(res => {
-                        this.managementModelOptions = res.data.list
-                    })
-                },
-                    getrecycleTypeIdsOptions() {
-                    getDictionaryDataSelector('519096374193555461').then(res => {
-                        this.recycleTypeIdsOptions = res.data.list
-                    })
-                },
-                        getrecyclestationpricerecycleTypeIdOptions() {
-                        getDictionaryDataSelector('519096374193555461').then(res => {
-                            this.recyclestationpricerecycleTypeIdOptions = res.data.list
-                        })
-                    },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/Enterpriserecyclestation/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getmanagementModelOptions();
+      this.getrecycleTypeIdsOptions();
+      this.getrecyclestationpricerecycleTypeIdOptions();
+    },
+    recyclestationpriceExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.recyclestationpriceList.length; i++) {
+        const e = this.dataForm.recyclestationpriceList[i];
+      }
+      return isOk;
+    },
+    recyclestationhousingestateExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.recyclestationhousingestateList.length; i++) {
+        const e = this.dataForm.recyclestationhousingestateList[i];
+      }
+      return isOk;
+    },
+    getmanagementModelOptions() {
+      getDictionaryDataSelector('519073654609283077').then(res => {
+        this.managementModelOptions = res.data.list
+      })
+    },
+    getrecycleTypeIdsOptions() {
+      getDictionaryDataSelector('519096374193555461').then(res => {
+        this.recycleTypeIdsOptions = res.data.list
+      })
+    },
+    getrecyclestationpricerecycleTypeIdOptions() {
+      getDictionaryDataSelector('519096374193555461').then(res => {
+        this.recyclestationpricerecycleTypeIdOptions = res.data.list
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/Enterpriserecyclestation/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                            if (!this.recyclestationpriceExist()) return
-                            if (!this.recyclestationhousingestateExist()) return
-                        this.request()
-                    }
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          if (!this.recyclestationpriceExist()) return
+          if (!this.recyclestationhousingestateExist()) return
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/Enterpriserecyclestation',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/Enterpriserecyclestation',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/Enterpriserecyclestation/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-                addrecyclestationpriceList(){
-                let item = {
-                            recycleTypeId:'',
-                                    recycleTypeIdOptions:[],
-                            unitPrice:undefined,
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
             }
-                this.getrecyclestationpriceList(item)
-            },
-                delrecyclestationpriceList(index) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.dataForm.recyclestationpriceList.splice(index, 1);
-                }).catch(() => {
-                });
-            },
-                getrecyclestationpriceList(value){
-                let item={...this.tableRows.recyclestationpriceList,...value}
-                this.dataForm.recyclestationpriceList.push(item)
-                this.childIndex=this.dataForm.recyclestationpriceList.length-1
-                this.isEdit = true
-                this.isEdit = false
-                this.childIndex = -1
-            },
-                addrecyclestationhousingestateList(){
-                let item = {
-                            housingEstateId:'',
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/Enterpriserecyclestation/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
             }
-                this.getrecyclestationhousingestateList(item)
-            },
-                delrecyclestationhousingestateList(index) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.dataForm.recyclestationhousingestateList.splice(index, 1);
-                }).catch(() => {
-                });
-            },
-                getrecyclestationhousingestateList(value){
-                let item={...this.tableRows.recyclestationhousingestateList,...value}
-                this.dataForm.recyclestationhousingestateList.push(item)
-                this.childIndex=this.dataForm.recyclestationhousingestateList.length-1
-                this.isEdit = true
-                this.isEdit = false
-                this.childIndex = -1
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
-                })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                    for(let i=0;i<_dataAll.recyclestationpriceList.length;i++){
-                        this.childIndex = i
-                    }
-                    for(let i=0;i<_dataAll.recyclestationhousingestateList.length;i++){
-                        this.childIndex = i
-                    }
-                this.childIndex=-1
-            },
-        },
-    }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    addrecyclestationpriceList() {
+      let item = {
+        recycleTypeId: '',
+        recycleTypeIdOptions: [],
+        unitPrice: undefined,
+      }
+      this.getrecyclestationpriceList(item)
+    },
+    delrecyclestationpriceList(index) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.recyclestationpriceList.splice(index, 1);
+      }).catch(() => {
+      });
+    },
+    getrecyclestationpriceList(value) {
+      let item = { ...this.tableRows.recyclestationpriceList, ...value }
+      this.dataForm.recyclestationpriceList.push(item)
+      this.childIndex = this.dataForm.recyclestationpriceList.length - 1
+      this.isEdit = true
+      this.isEdit = false
+      this.childIndex = -1
+    },
+    addrecyclestationhousingestateList() {
+      let item = {
+        housingEstateId: '',
+      }
+      this.getrecyclestationhousingestateList(item)
+    },
+    delrecyclestationhousingestateList(index) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.recyclestationhousingestateList.splice(index, 1);
+      }).catch(() => {
+      });
+    },
+    getrecyclestationhousingestateList(value) {
+      let item = { ...this.tableRows.recyclestationhousingestateList, ...value }
+      this.dataForm.recyclestationhousingestateList.push(item)
+      this.childIndex = this.dataForm.recyclestationhousingestateList.length - 1
+      this.isEdit = true
+      this.isEdit = false
+      this.childIndex = -1
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      for (let i = 0; i < _dataAll.recyclestationpriceList.length; i++) {
+        this.childIndex = i
+      }
+      for (let i = 0; i < _dataAll.recyclestationhousingestateList.length; i++) {
+        this.childIndex = i
+      }
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
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 c10573e..049b7b3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/index.vue
@@ -6,705 +6,654 @@
 
 
 <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.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>
-                                </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>
-                                </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/>
-                                        </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>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="范围内小区-小区名称">
-                                                <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>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="回收站简称">
-                                                <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>
-                                        </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-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="stationCode"
- label="回收站编号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="stationName"
- label="回收站名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="shortName"
- label="回收站简称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="managementModel"
- label="经营模式"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="city"
- label="所在城市"  align="left"
- >
-                                                </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>
-                                                <el-table-column
-                                                            prop="firstContactPersonTel"
- label="手机号码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="address"
- label="详细地址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="recycleTel"
- label="回收电话"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="stationDescription"
- label="回收站介绍"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="营业时间"  prop="businessDays" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.businessDays}}
-                                            </template>
-                                        </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 label="接单范围"  prop="acceptRange" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.acceptRange}}
-                                            </template>
-                                        </el-table-column>
-                                    <el-table-column prop="tableField119"  label="范围内小区" align="center"   >
-                                        <el-table-column prop="tableField119-child-first" width="1px"
-                                                         label-class-name="table-child-first" >
-                                            <template slot-scope="scope" v-if="!scope.row.top">
-                                                <div class="child-table-column">
-                                                    <template v-if="!scope.row.tableField119Expand">
-                                                        <tr v-for="(item, index) in scope.row.tableField119.slice(0, 3)"
-                                                            class="child-table__row" :key="index">
-                                                            <td class="td-child-first">
-                                                                <div class="cell"></div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.housingEstateName}}
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </template>
-                                                    <template v-if="scope.row.tableField119Expand">
-                                                        <tr v-for="(item, index) in scope.row.tableField119" class="child-table__row" :key="index">
-                                                            <td class="td-child-first">
-                                                                <div class="cell"></div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.housingEstateName}}
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </template>
-                                                    <div class="expand-more-btn" v-if="scope.row.tableField119.length > 3">
-                                                        <el-button v-if="scope.row.tableField119Expand" type="text"
-                                                                   @click="scope.row.tableField119Expand=!scope.row.tableField119Expand">隐藏部分</el-button>
-                                                        <el-button v-if="!scope.row.tableField119Expand" type="text"
-                                                                   @click="scope.row.tableField119Expand=!scope.row.tableField119Expand">加载更多</el-button>
-                                                    </div>
-                                                </div>
-                                            </template>
-                                        </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>
-                                    <el-table-column prop="tableField135"  label="价格配置" align="center"   >
-                                        <el-table-column prop="tableField135-child-first" width="1px"
-                                                         label-class-name="table-child-first" >
-                                            <template slot-scope="scope" v-if="!scope.row.top">
-                                                <div class="child-table-column">
-                                                    <template v-if="!scope.row.tableField135Expand">
-                                                        <tr v-for="(item, index) in scope.row.tableField135.slice(0, 3)"
-                                                            class="child-table__row" :key="index">
-                                                            <td class="td-child-first">
-                                                                <div class="cell"></div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.recycleTypeName}}
-                                                                </div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.unitPrice}}
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </template>
-                                                    <template v-if="scope.row.tableField135Expand">
-                                                        <tr v-for="(item, index) in scope.row.tableField135" class="child-table__row" :key="index">
-                                                            <td class="td-child-first">
-                                                                <div class="cell"></div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.recycleTypeName}}
-                                                                </div>
-                                                            </td>
-                                                                <td class="td-flex-1" >
-                                                                <div class="cell">
-                                                                        {{ item.unitPrice}}
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </template>
-                                                    <div class="expand-more-btn" v-if="scope.row.tableField135.length > 3">
-                                                        <el-button v-if="scope.row.tableField135Expand" type="text"
-                                                                   @click="scope.row.tableField135Expand=!scope.row.tableField135Expand">隐藏部分</el-button>
-                                                        <el-button v-if="!scope.row.tableField135Expand" type="text"
-                                                                   @click="scope.row.tableField135Expand=!scope.row.tableField135Expand">加载更多</el-button>
-                                                    </div>
-                                                </div>
-                                            </template>
-                                        </el-table-column>
-                                            <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" >
-                            <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>
+  <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.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>
+            </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>
+            </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 />
+              </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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="范围内小区-小区名称">
+                <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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="回收站简称">
+                <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>
+              </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-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+          </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>
+          </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" />
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <el-table-column prop="stationCode" label="回收站编号" align="left">
+          </el-table-column>
+          <el-table-column prop="stationName" label="回收站名称" align="left">
+          </el-table-column>
+          <el-table-column prop="shortName" label="回收站简称" align="left">
+          </el-table-column>
+          <el-table-column prop="managementModel" label="经营模式" align="left">
+          </el-table-column>
+          <el-table-column prop="city" label="所在城市" align="left">
+          </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>
+          <el-table-column prop="firstContactPersonTel" label="手机号码" align="left">
+          </el-table-column>
+          <el-table-column prop="address" label="详细地址" align="left">
+          </el-table-column>
+          <el-table-column prop="recycleTel" label="回收电话" align="left">
+          </el-table-column>
+          <el-table-column prop="stationDescription" label="回收站介绍" align="left">
+          </el-table-column>
+          <el-table-column label="营业时间" prop="businessDays" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.businessDays}}
+            </template>
+          </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 label="接单范围" prop="acceptRange" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.acceptRange}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="tableField119" label="范围内小区" align="center">
+            <el-table-column prop="tableField119-child-first" width="1px"
+              label-class-name="table-child-first">
+              <template slot-scope="scope" v-if="!scope.row.top">
+                <div class="child-table-column">
+                  <template v-if="!scope.row.tableField119Expand">
+                    <tr v-for="(item, index) in scope.row.tableField119.slice(0, 3)"
+                      class="child-table__row" :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.housingEstateName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <template v-if="scope.row.tableField119Expand">
+                    <tr v-for="(item, index) in scope.row.tableField119" class="child-table__row"
+                      :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.housingEstateName}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <div class="expand-more-btn" v-if="scope.row.tableField119.length > 3">
+                    <el-button v-if="scope.row.tableField119Expand" type="text"
+                      @click="scope.row.tableField119Expand=!scope.row.tableField119Expand">隐藏部分</el-button>
+                    <el-button v-if="!scope.row.tableField119Expand" type="text"
+                      @click="scope.row.tableField119Expand=!scope.row.tableField119Expand">加载更多</el-button>
+                  </div>
+                </div>
+              </template>
+            </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>
+          <el-table-column prop="tableField135" label="价格配置" align="center">
+            <el-table-column prop="tableField135-child-first" width="1px"
+              label-class-name="table-child-first">
+              <template slot-scope="scope" v-if="!scope.row.top">
+                <div class="child-table-column">
+                  <template v-if="!scope.row.tableField135Expand">
+                    <tr v-for="(item, index) in scope.row.tableField135.slice(0, 3)"
+                      class="child-table__row" :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.recycleTypeName}}
+                        </div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.unitPrice}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <template v-if="scope.row.tableField135Expand">
+                    <tr v-for="(item, index) in scope.row.tableField135" class="child-table__row"
+                      :key="index">
+                      <td class="td-child-first">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.recycleTypeName}}
+                        </div>
+                      </td>
+                      <td class="td-flex-1">
+                        <div class="cell">
+                          {{ item.unitPrice}}
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <div class="expand-more-btn" v-if="scope.row.tableField135.length > 3">
+                    <el-button v-if="scope.row.tableField135Expand" type="text"
+                      @click="scope.row.tableField135Expand=!scope.row.tableField135Expand">隐藏部分</el-button>
+                    <el-button v-if="!scope.row.tableField135Expand" type="text"
+                      @click="scope.row.tableField135Expand=!scope.row.tableField135Expand">加载更多</el-button>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <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">
+            <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>
     </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" />
+  </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: {
-                        stationCode:undefined,
-                        stationName:undefined,
-                        managementModel:undefined,
-                        city:undefined,
-                        recycleTypeIds:undefined,
-                        tableField119_housingEstateName:undefined,
-                        firstContactPerson:undefined,
-                        shortName:undefined,
-                        tableField135_recycleTypeName:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                managementModelOptions:[],
-                        managementModelProps:{"label":"fullName","value":"id"  },
-                            recycleTypeIdsOptions:[],
-                        recycleTypeIdsProps:{"label":"fullName","value":"id"  },
-                            businessDaysOptions:[{"fullName":"周一","id":"1"},{"fullName":"周二","id":"2"},{"fullName":"周三","id":"3"},{"fullName":"周四","id":"4"},{"fullName":"周五","id":"5"},{"fullName":"周六","id":"6"},{"fullName":"周日","id":"7"}],
-                        businessDaysProps:{"label":"fullName","value":"id"  },
-                            acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
-                        acceptRangeProps:{"label":"fullName","value":"id"  },
-                        tableField135_recycleTypeIdOptions:[],
-                                tableField135_recycleTypeIdProps:{"label":"fullName","value":"id"  },
-                        tableField119_housingEstateIdcolumnOptions:[ {"label":"小区名称","value":"name"},],
-            interfaceRes: {
-                                    tableField119_housingEstateId: [] ,
-                },
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        stationCode: undefined,
+        stationName: undefined,
+        managementModel: undefined,
+        city: undefined,
+        recycleTypeIds: undefined,
+        tableField119_housingEstateName: undefined,
+        firstContactPerson: undefined,
+        shortName: undefined,
+        tableField135_recycleTypeName: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      managementModelOptions: [],
+      managementModelProps: { "label": "fullName", "value": "id" },
+      recycleTypeIdsOptions: [],
+      recycleTypeIdsProps: { "label": "fullName", "value": "id" },
+      businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
+      businessDaysProps: { "label": "fullName", "value": "id" },
+      acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
+      acceptRangeProps: { "label": "fullName", "value": "id" },
+      tableField135_recycleTypeIdOptions: [],
+      tableField135_recycleTypeIdProps: { "label": "fullName", "value": "id" },
+      tableField119_housingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" },],
+      interfaceRes: {
+        tableField119_housingEstateId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.getmanagementModelOptions();
+    this.getrecycleTypeIdsOptions();
+    this.gettableField135_recycleTypeNameOptions();
+    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
+      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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getmanagementModelOptions();
-                    this.getrecycleTypeIdsOptions();
-                    this.gettableField135_recycleTypeNameOptions();
-            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
-                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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-                    getmanagementModelOptions() {
-                        getDictionaryDataSelector('519073654609283077').then(res => {
-                            this.managementModelOptions = res.data.list
-                        })
-                    },
-                    getrecycleTypeIdsOptions() {
-                        getDictionaryDataSelector('519096374193555461').then(res => {
-                            this.recycleTypeIdsOptions = res.data.list
-                        })
-                    },
-                    gettableField135_recycleTypeNameOptions() {
-                        getDictionaryDataSelector('519096374193555461').then(res => {
-                            this.tableField135_recycleTypeNameOptions = res.data.list
-                        })
-                    },
-            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:'518043449954403781',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/Enterpriserecyclestation/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/Enterpriserecyclestation/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/Enterpriserecyclestation")
-                })
-            },
-                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/Enterpriserecyclestation/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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    getmanagementModelOptions() {
+      getDictionaryDataSelector('519073654609283077').then(res => {
+        this.managementModelOptions = res.data.list
+      })
+    },
+    getrecycleTypeIdsOptions() {
+      getDictionaryDataSelector('519096374193555461').then(res => {
+        this.recycleTypeIdsOptions = res.data.list
+      })
+    },
+    gettableField135_recycleTypeNameOptions() {
+      getDictionaryDataSelector('519096374193555461').then(res => {
+        this.tableField135_recycleTypeNameOptions = res.data.list
+      })
+    },
+    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: '518043449954403781',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Enterpriserecyclestation/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/Enterpriserecyclestation/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Enterpriserecyclestation")
+      })
+    },
+    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/Enterpriserecyclestation/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/housingestate/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue
index 6111ee3..a4b945d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue
@@ -1,182 +1,168 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取消</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" size="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="基本信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="小区名"  
- prop="name"  >
-                        <p>{{dataForm.name}}</p>
-                </jnpf-form-tip-item>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="default" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="基本信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="小区名" prop="name">
+                <p>{{dataForm.name}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="小区详细地址"  
- prop="address"  >
-                        <p>{{dataForm.address}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="10">
+              <jnpf-form-tip-item label="小区详细地址" prop="address">
+                <p>{{dataForm.address}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="启用禁用"  
- prop="enabledMark"  >
-                        <p>{{dataForm.enabledMark}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="启用禁用" prop="enabledMark">
+                <p>{{dataForm.enabledMark}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="经度"  
- prop="longitude"  >
-                    <JnpfNumber    v-model="dataForm.longitude"
- placeholder="请输入"  disabled
- :style='{"width":"100%"}' :step="1"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="纬度" prop="latitude">
+                <JnpfNumber v-model="dataForm.latitude" placeholder="请输入" disabled
+                  :style='{"width":"100%"}' :step="1">
                 </JnpfNumber>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="纬度"  
- prop="latitude"  >
-                    <JnpfNumber    v-model="dataForm.latitude"
- placeholder="请输入"  disabled
- :style='{"width":"100%"}' :step="1"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="经度" prop="longitude">
+                <JnpfNumber v-model="dataForm.longitude" placeholder="请输入" disabled
+                  :style='{"width":"100%"}' :step="1">
                 </JnpfNumber>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="定时回收配置" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="定时定点回收"  
- prop="hasSchedule"  >
-                        <p>{{dataForm.hasSchedule}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="定时回收配置">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="定点回收地址"  
- prop="recycleAddress"  >
-                        <p>{{dataForm.recycleAddress}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="定时定点回收" prop="hasSchedule">
+                <p>{{dataForm.hasSchedule}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="定点回收时间起"  
- prop="appointmentTimeStart"  >
-                        <p>{{dataForm.appointmentTimeStart}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收地址" prop="recycleAddress">
+                <p>{{dataForm.recycleAddress}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="定点回收时间止"  
- prop="appointmentTimeEnd"  >
-                        <p>{{dataForm.appointmentTimeEnd}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收时间起" prop="appointmentTimeStart">
+                <p>{{dataForm.appointmentTimeStart}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="来源"  
- prop="sourceType"  >
-                         <p>{{ dataForm.sourceType }} </p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收时间止" prop="appointmentTimeEnd">
+                <p>{{dataForm.appointmentTimeEnd}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-    </template>
-</el-form>
-    </el-row>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="来源" prop="sourceType">
+                <p>{{ dataForm.sourceType }} </p>
+              </jnpf-form-tip-item>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            name : '',
-                            address : '',
-                            enabledMark : 1,
-                            longitude : '',
-                            latitude : '',
-                            hasSchedule : 0,
-                            recycleAddress : '',
-                            appointmentTimeStart : "",
-                            appointmentTimeEnd : "",
-                            sourceType : "1",
-            },
-                            sourceTypeOptions:[{"fullName":"系统导入","id":"1"},{"fullName":"用户自定义","id":"2"}],
-                        sourceTypeProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        name: '',
+        address: '',
+        enabledMark: 1,
+        latitude: '',
+        longitude: '',
+        hasSchedule: 0,
+        recycleAddress: '',
+        appointmentTimeStart: "",
+        appointmentTimeEnd: "",
+        sourceType: "1",
+      },
+      sourceTypeOptions: [{ "fullName": "系统导入", "id": "1" }, { "fullName": "用户自定义", "id": "2" }],
+      sourceTypeProps: { "label": "fullName", "value": "id" },
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/HousingEstate/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/HousingEstate/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue
index 1ae3c4b..8978fc3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/form.vue
@@ -2,517 +2,514 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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="default" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="基本信息"  contentPosition="left" >
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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="default"
+          label-width="100px" label-position="right">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="基本信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="小区名"   prop="name" >
-        <JnpfInput   v-model="dataForm.name" @change="changeData('name',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="小区详细地址"   prop="address" >
-        <JnpfInput   v-model="dataForm.address" @change="changeData('address',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="启用禁用"   prop="enabledMark" >
-        <JnpfSwitch   v-model="dataForm.enabledMark" @change="changeData('enabledMark',-1)" 
- :active-value="1"  :inactive-value="0" >
-    </JnpfSwitch>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="经度"   prop="longitude" >
-        <JnpfInputNumber   v-model="dataForm.longitude" @change="changeData('longitude',-1)" 
- placeholder="请输入"  :style='{"width":"100%"}' :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="纬度"   prop="latitude" >
-        <JnpfInputNumber   v-model="dataForm.latitude" @change="changeData('latitude',-1)" 
- placeholder="请输入"  :style='{"width":"100%"}' :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="定时回收配置"  contentPosition="left" >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="小区名" prop="name">
+                <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
+                  clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="10">
+              <jnpf-form-tip-item label="小区详细地址" prop="address">
+                <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="启用禁用" prop="enabledMark">
+                <JnpfSwitch v-model="dataForm.enabledMark" @change="changeData('enabledMark',-1)"
+                  :active-value="1" :inactive-value="0">
+                </JnpfSwitch>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="纬度" prop="latitude">
+                <JnpfInputNumber v-model="dataForm.latitude" @change="changeData('latitude',-1)"
+                  placeholder="请输入" :style='{"width":"100%"}' :step="1">
+                </JnpfInputNumber>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="经度" prop="longitude">
+                <JnpfInputNumber v-model="dataForm.longitude" @change="changeData('longitude',-1)"
+                  placeholder="请输入" :style='{"width":"100%"}' :step="1">
+                </JnpfInputNumber>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="定时回收配置" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="定时定点回收" prop="hasSchedule">
+                <JnpfSwitch v-model="dataForm.hasSchedule" @change="changeData('hasSchedule',-1)"
+                  :active-value="1" :inactive-value="0">
+                </JnpfSwitch>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收地址" prop="recycleAddress">
+                <JnpfInput v-model="dataForm.recycleAddress"
+                  @change="changeData('recycleAddress',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="定时定点回收"   prop="hasSchedule" >
-        <JnpfSwitch   v-model="dataForm.hasSchedule" @change="changeData('hasSchedule',-1)" 
- :active-value="1"  :inactive-value="0" >
-    </JnpfSwitch>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="定点回收地址"   prop="recycleAddress" >
-        <JnpfInput   v-model="dataForm.recycleAddress" @change="changeData('recycleAddress',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="定点回收时间起"   prop="appointmentTimeStart" >
-        <JnpfTimePicker   v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart',-1)" 
- :startTime="time(false,1,1,'','HH:mm','')"  :endTime="time(false,1,1,'','HH:mm','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' format="HH:mm" >
-    </JnpfTimePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收时间起" prop="appointmentTimeStart">
+                <JnpfTimePicker v-model="dataForm.appointmentTimeStart"
+                  @change="changeData('appointmentTimeStart',-1)"
+                  :startTime="time(false,1,1,'','HH:mm','')"
+                  :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' format="HH:mm">
+                </JnpfTimePicker>
+              </jnpf-form-tip-item>
+            </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="定点回收时间止"   prop="appointmentTimeEnd" >
-        <JnpfTimePicker   v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd',-1)" 
- :startTime="time(false,1,1,'','HH:mm','')"  :endTime="time(false,1,1,'','HH:mm','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' format="HH:mm" >
-    </JnpfTimePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="来源"   prop="sourceType" >
-        <JnpfSelect   v-model="dataForm.sourceType" @change="changeData('sourceType',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="sourceTypeOptions" :props="sourceTypeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="定点回收时间止" prop="appointmentTimeEnd">
+                <JnpfTimePicker v-model="dataForm.appointmentTimeEnd"
+                  @change="changeData('appointmentTimeEnd',-1)"
+                  :startTime="time(false,1,1,'','HH:mm','')"
+                  :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' format="HH:mm">
+                </JnpfTimePicker>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="来源" prop="sourceType">
+                <JnpfSelect v-model="dataForm.sourceType" @change="changeData('sourceType',-1)"
+                  placeholder="请选择" clearable :style='{"width":"100%"}' :options="sourceTypeOptions"
+                  :props="sourceTypeProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                name : undefined,
-                                address : undefined,
-                                    enabledMark : 1,
-                                longitude : undefined,
-                                latitude : undefined,
-                                    hasSchedule : 0,
-                                recycleAddress : undefined,
-                                    appointmentTimeStart : undefined,
-                                    appointmentTimeEnd : undefined,
-                                    sourceType : "1",
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            name: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-                            sourceTypeOptions:[{"fullName":"系统导入","id":"1"},{"fullName":"用户自定义","id":"2"}],
-                            sourceTypeProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        name:[] ,
-                        address:[] ,
-                        enabledMark:[] ,
-                        longitude:[] ,
-                        latitude:[] ,
-                        hasSchedule:[] ,
-                        recycleAddress:[] ,
-                        appointmentTimeStart:[] ,
-                        appointmentTimeEnd:[] ,
-                        sourceType:[] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        name: undefined,
+        address: undefined,
+        enabledMark: 1,
+        latitude: undefined,
+        longitude: undefined,
+        hasSchedule: 0,
+        recycleAddress: undefined,
+        appointmentTimeStart: undefined,
+        appointmentTimeEnd: undefined,
+        sourceType: "1",
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+        name: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+      },
+      sourceTypeOptions: [{ "fullName": "系统导入", "id": "1" }, { "fullName": "用户自定义", "id": "2" }],
+      sourceTypeProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        name: [],
+        address: [],
+        enabledMark: [],
+        latitude: [],
+        longitude: [],
+        hasSchedule: [],
+        recycleAddress: [],
+        appointmentTimeStart: [],
+        appointmentTimeEnd: [],
+        sourceType: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/HousingEstate/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-            },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/HousingEstate/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/HousingEstate/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/HousingEstate/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/HousingEstate',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/HousingEstate/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/HousingEstate',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/HousingEstate/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
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 3d2e7aa..1ed70e2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/index.vue
@@ -6,496 +6,461 @@
 
 
 <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="来源">
-                                        <JnpfSelect v-model="query.sourceType" placeholder="请选择" clearable
-                                                    :options="sourceTypeOptions"
-                                                    :props="sourceTypeProps"  multiple >
-                                        </JnpfSelect>
-                                </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-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="name"
- label="小区名"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="address"
- label="小区详细地址"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="enabledMark"
- label="启用禁用"  align="left"
- >
-                                                </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>
-                                                <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 label="来源"  prop="sourceType" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.sourceType}}
-                                            </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>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <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="来源">
+              <JnpfSelect v-model="query.sourceType" placeholder="请选择" clearable
+                :options="sourceTypeOptions" :props="sourceTypeProps" multiple>
+              </JnpfSelect>
+            </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-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+          </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>
+          </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" />
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <el-table-column prop="name" label="小区名" align="left">
+          </el-table-column>
+          <el-table-column prop="address" label="小区详细地址" align="left">
+          </el-table-column>
+          <el-table-column prop="enabledMark" label="启用禁用" align="left">
+          </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>
+          <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 label="来源" prop="sourceType" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.sourceType}}
+            </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>
+        </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" />
+    <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" />
+  </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,
 
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        name:undefined,
-                        sourceType:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                sourceTypeOptions:[{"fullName":"系统导入","id":"1"},{"fullName":"用户自定义","id":"2"}],
-                        sourceTypeProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        name: undefined,
+        sourceType: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      sourceTypeOptions: [{ "fullName": "系统导入", "id": "1" }, { "fullName": "用户自定义", "id": "2" }],
+      sourceTypeProps: { "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
+      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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        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
-                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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.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:'520187426459619589',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/HousingEstate/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/HousingEstate/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/HousingEstate")
-                })
-            },
-                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/HousingEstate/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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.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: '520187426459619589',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/HousingEstate/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/HousingEstate/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/HousingEstate")
+      })
+    },
+    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/HousingEstate/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/recycleorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
index 9987db4..cfc6f8d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
@@ -1,316 +1,279 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取 消</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" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="订单信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="订单编号"  
- prop="orderNumber"  >
-                        <p>{{dataForm.orderNumber}}</p>
-                </jnpf-form-tip-item>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="small" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="订单信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单编号" prop="orderNumber">
+                <p>{{dataForm.orderNumber}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单类型" prop="orderTypeId">
+                <p>{{dataForm.orderTypeId}}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="订单金额(元)" prop="orderAmount">
+                <p>{{dataForm.orderAmount}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="订单类型"  
- prop="orderTypeId"  >
-                        <p>{{dataForm.orderTypeId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="散户端状态" prop="orderClientStatusId">
+                <p>{{dataForm.orderClientStatusId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="订单金额(元)"  
- prop="orderAmount"  >
-                        <p>{{dataForm.orderAmount}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员端状态" prop="orderStafstatusId">
+                <p>{{dataForm.orderStafstatusId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="散户端状态"  
- prop="orderClientStatusId"  >
-                        <p>{{dataForm.orderClientStatusId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="接单周期(分)" prop="receivePeriod">
+                <p>{{dataForm.receivePeriod}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收员端状态"  
- prop="orderStafstatusId"  >
-                        <p>{{dataForm.orderStafstatusId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="散户信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="接单周期(分)"  
- prop="receivePeriod"  >
-                        <p>{{dataForm.receivePeriod}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="散户姓名" prop="clientName">
+                <p>{{dataForm.clientName}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="散户信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="散户姓名"  
- prop="clientName"  >
-                        <p>{{dataForm.clientName}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="散户手机号" prop="clientMobile">
+                <p>{{dataForm.clientMobile}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="散户手机号"  
- prop="clientMobile"  >
-                        <p>{{dataForm.clientMobile}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收地址" prop="recycleAddress">
+                <p>{{dataForm.recycleAddress}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收地址"  
- prop="recycleAddress"  >
-                        <p>{{dataForm.recycleAddress}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="预约时间起" prop="appointmentTimeStart">
+                <p>{{dataForm.appointmentTimeStart}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="预约时间起"  
- prop="appointmentTimeStart"  >
-                        <p>{{dataForm.appointmentTimeStart}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="预约时间止" prop="appointmentTimeEnd">
+                <p>{{dataForm.appointmentTimeEnd}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="预约时间止"  
- prop="appointmentTimeEnd"  >
-                        <p>{{dataForm.appointmentTimeEnd}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="收货员信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
             </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="收货员信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站"  
- prop="recycleStationId"  >
-                        <p>{{dataForm.recycleStationId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站" prop="recycleStationId">
+                <p>{{dataForm.recycleStationId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收员"  
- prop="staffsId"  >
-                         <p>{{ dataForm.staffsId }} </p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员" prop="staffsId">
+                <p>{{ dataForm.staffsId }} </p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="24"  >
-                <JnpfDivider   contentPosition="center" >
- 其他信息             </JnpfDivider>
+            <el-col :span="24">
+              <JnpfDivider contentPosition="center">
+                其他信息 </JnpfDivider>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="创建用户"  
- prop="creatorUserId"  >
-                        <p>{{dataForm.creatorUserId}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
+                <p>{{dataForm.creatorUserId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="创建时间"  
- prop="creatorTime"  >
-                        <p>{{dataForm.creatorTime}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="创建时间" prop="creatorTime">
+                <p>{{dataForm.creatorTime}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="协商时间起"  
- prop="consultTimeStart"  >
-                        <p>{{dataForm.consultTimeStart}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="协商时间起" prop="consultTimeStart">
+                <p>{{dataForm.consultTimeStart}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="协商时间止"  
- prop="consultTimeEnd"  >
-                        <p>{{dataForm.consultTimeEnd}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="协商时间止" prop="consultTimeEnd">
+                <p>{{dataForm.consultTimeEnd}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="收货时间"  
- prop="receiveTime"  >
-                        <p>{{dataForm.receiveTime}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="收货时间" prop="receiveTime">
+                <p>{{dataForm.receiveTime}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="结算时间"  
- prop="settleTime"  >
-                        <p>{{dataForm.settleTime}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="结算时间" prop="settleTime">
+                <p>{{dataForm.settleTime}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="24"  >
-                <JnpfDivider   contentPosition="center" >
- 用户评论             </JnpfDivider>
+            <el-col :span="24">
+              <JnpfDivider contentPosition="center">
+                用户评论 </JnpfDivider>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="综合评分"  
- prop="starScore"  >
-                    <JnpfRate    v-model="dataForm.starScore"
- disabled
- :max="5"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="综合评分" prop="starScore">
+                <JnpfRate v-model="dataForm.starScore" disabled :max="5">
                 </JnpfRate>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="评价详情"  
- prop="comment"  >
-                        <p>{{dataForm.comment}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="评价详情" prop="comment">
+                <p>{{dataForm.comment}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="评价图片"  
- prop="commentPics"  >
-                    <JnpfUploadImg    v-model="dataForm.commentPics"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="评价图片" prop="commentPics">
+                <JnpfUploadImg v-model="dataForm.commentPics" disabled detailed :fileSize="10"
+                  sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="响应速度"  
- prop="responseStar"  >
-                    <JnpfRate    v-model="dataForm.responseStar"
- disabled
- :max="5"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="响应速度" prop="responseStar">
+                <JnpfRate v-model="dataForm.responseStar" disabled :max="5">
                 </JnpfRate>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="服务态度"  
- prop="attitudeStar"  >
-                    <JnpfRate    v-model="dataForm.attitudeStar"
- disabled
- :max="5"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="服务态度" prop="attitudeStar">
+                <JnpfRate v-model="dataForm.attitudeStar" disabled :max="5">
                 </JnpfRate>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="平台价格"  
- prop="priceStar"  >
-                    <JnpfRate    v-model="dataForm.priceStar"
- disabled
- :max="5"  >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="平台价格" prop="priceStar">
+                <JnpfRate v-model="dataForm.priceStar" disabled :max="5">
                 </JnpfRate>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-    </template>
-</el-form>
-    </el-row>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            orderNumber : '',
-                            orderTypeId : "521999177572425477",
-                            orderAmount : '',
-                            orderClientStatusId : "",
-                            orderStafstatusId : "",
-                            receivePeriod : '',
-                            clientId : '',
-                            clientName : '',
-                            clientMobile : '',
-                            recycleAddress : '',
-                            appointmentTimeStart : '',
-                            appointmentTimeEnd : '',
-                            recycleStationId : "",
-                            staffsId : "",
-                            creatorUserId : '',
-                            creatorTime : '',
-                            consultTimeStart : '',
-                            consultTimeEnd : '',
-                            receiveTime : '',
-                            settleTime : '',
-                            starScore : 0,
-                            comment : '',
-                            commentPics : [],
-                            responseStar : 0,
-                            attitudeStar : 0,
-                            priceStar : 0,
-            },
-                        orderTypeIdProps:{"label":"fullName","value":"id"  },
-                        orderClientStatusIdProps:{"label":"fullName","value":"id"  },
-                        orderStafstatusIdProps:{"label":"fullName","value":"id"  },
-                        recycleStationIdProps:{"label":"station_name","value":"id"  },
-                            staffsIdOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-                        staffsIdProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        orderNumber: '',
+        orderTypeId: "521999177572425477",
+        orderAmount: '',
+        orderClientStatusId: "",
+        orderStafstatusId: "",
+        receivePeriod: '',
+        clientId: '',
+        clientName: '',
+        clientMobile: '',
+        recycleAddress: '',
+        appointmentTimeStart: '',
+        appointmentTimeEnd: '',
+        recycleStationId: "",
+        staffsId: "",
+        creatorUserId: '',
+        creatorTime: '',
+        consultTimeStart: '',
+        consultTimeEnd: '',
+        receiveTime: '',
+        settleTime: '',
+        starScore: 0,
+        comment: '',
+        commentPics: [],
+        responseStar: 0,
+        attitudeStar: 0,
+        priceStar: 0,
+      },
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      orderClientStatusIdProps: { "label": "fullName", "value": "id" },
+      orderStafstatusIdProps: { "label": "fullName", "value": "id" },
+      recycleStationIdProps: { "label": "station_name", "value": "id" },
+      staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+      staffsIdProps: { "label": "fullName", "value": "id" },
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleOrder/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/RecycleOrder/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
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 612076b..0762552 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
@@ -2,761 +2,759 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="订单信息"  contentPosition="left" >
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="订单信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </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>
-    </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>
-    </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>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="散户端状态"   prop="orderClientStatusId" >
-        <JnpfSelect   v-model="dataForm.orderClientStatusId" @change="changeData('orderClientStatusId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="orderClientStatusIdOptions" :props="orderClientStatusIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收员端状态"   prop="orderStafstatusId" >
-        <JnpfSelect   v-model="dataForm.orderStafstatusId" @change="changeData('orderStafstatusId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="orderStafstatusIdOptions" :props="orderStafstatusIdProps" >
-    </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>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="散户信息"  contentPosition="left" >
+            <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>
+              </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>
+              </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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="散户端状态" prop="orderClientStatusId">
+                <JnpfSelect v-model="dataForm.orderClientStatusId"
+                  @change="changeData('orderClientStatusId',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="orderClientStatusIdOptions"
+                  :props="orderClientStatusIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员端状态" prop="orderStafstatusId">
+                <JnpfSelect v-model="dataForm.orderStafstatusId"
+                  @change="changeData('orderStafstatusId',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="orderStafstatusIdOptions"
+                  :props="orderStafstatusIdProps">
+                </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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="散户信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="散户姓名" prop="clientName">
+                <JnpfInput v-model="dataForm.clientName" @change="changeData('clientName',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收地址" prop="recycleAddress">
+                <JnpfInput v-model="dataForm.recycleAddress"
+                  @change="changeData('recycleAddress',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="散户姓名"   prop="clientName" >
-        <JnpfInput   v-model="dataForm.clientName" @change="changeData('clientName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </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>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收地址"   prop="recycleAddress" >
-        <JnpfInput   v-model="dataForm.recycleAddress" @change="changeData('recycleAddress',-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" >
-    </JnpfDatePicker>
-    </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">
+                </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>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="收货员信息"  contentPosition="left" >
+            <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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="收货员信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </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>
+              </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>
+              </jnpf-form-tip-item>
             </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>
-    </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>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfDivider 
- content="其他信息"  contentPosition="center" >
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfDivider content="其他信息" contentPosition="center">
                 </JnpfDivider>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
+                <JnpfInput v-model="dataForm.creatorUserId" @change="changeData('creatorUserId',-1)"
+                  placeholder="请输入" disabled clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="创建用户"   prop="creatorUserId" >
-        <JnpfInput   v-model="dataForm.creatorUserId" @change="changeData('creatorUserId',-1)" 
- placeholder="请输入"  disabled  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="创建时间"   prop="creatorTime" >
-        <JnpfTimePicker   v-model="dataForm.creatorTime" @change="changeData('creatorTime',-1)" 
- :startTime="time(false,1,1,'','HH:mm:ss','')"  :endTime="time(false,1,1,'','HH:mm:ss','')"  placeholder="请选择"  disabled  clearable  :style='{"width":"100%"}' format="HH:mm:ss" >
-    </JnpfTimePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="创建时间" prop="creatorTime">
+                <JnpfTimePicker v-model="dataForm.creatorTime"
+                  @change="changeData('creatorTime',-1)"
+                  :startTime="time(false,1,1,'','HH:mm:ss','')"
+                  :endTime="time(false,1,1,'','HH:mm:ss','')" placeholder="请选择" disabled clearable
+                  :style='{"width":"100%"}' format="HH:mm:ss">
+                </JnpfTimePicker>
+              </jnpf-form-tip-item>
+            </el-col>
 
-        <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>
-    </jnpf-form-tip-item>
-        </el-col>
+            <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>
+              </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>
-    </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>
+              </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>
-    </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>
+              </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>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfDivider 
- content="用户评论"  contentPosition="center" >
+            <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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfDivider content="用户评论" contentPosition="center">
                 </JnpfDivider>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </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>
+              </jnpf-form-tip-item>
             </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+            <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>
+              </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>
+              </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>
+              </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>
+              </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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                orderNumber : undefined,
-                                    orderTypeId : "521999177572425477",
-                                orderAmount : undefined,
-                                    orderClientStatusId : undefined,
-                                    orderStafstatusId : undefined,
-                                receivePeriod : undefined,
-                                clientId : undefined,
-                                clientName : undefined,
-                                clientMobile : undefined,
-                                recycleAddress : undefined,
-                                appointmentTimeStart : undefined,
-                                appointmentTimeEnd : undefined,
-                                    recycleStationId : undefined,
-                                    staffsId : undefined,
-                                creatorUserId : undefined,
-                                creatorTime : undefined,
-                                consultTimeStart : undefined,
-                                consultTimeEnd : undefined,
-                                receiveTime : undefined,
-                                settleTime : undefined,
-                                    starScore : 0,
-                                comment : undefined,
-                                    commentPics : [],
-                                    responseStar : 0,
-                                    attitudeStar : 0,
-                                    priceStar : 0,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            orderTypeId: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            orderAmount: [
-                                    {
-                                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                                        message: '请输入正确的金额',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            recycleStationId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                    orderTypeIdOptions:[],
-                            orderTypeIdProps:{"label":"fullName","value":"id"  },
-                    orderClientStatusIdOptions:[],
-                            orderClientStatusIdProps:{"label":"fullName","value":"id"  },
-                    orderStafstatusIdOptions:[],
-                            orderStafstatusIdProps:{"label":"fullName","value":"id"  },
-                    recycleStationIdOptions:[],
-                            recycleStationIdProps:{"label":"station_name","value":"id"  },
-                            staffsIdOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-                            staffsIdProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        orderNumber:[] ,
-                        orderTypeId:[] ,
-                        orderAmount:[] ,
-                        orderClientStatusId:[] ,
-                        orderStafstatusId:[] ,
-                        receivePeriod:[] ,
-                        clientId:[] ,
-                        clientName:[] ,
-                        clientMobile:[] ,
-                        recycleAddress:[] ,
-                        appointmentTimeStart:[] ,
-                        appointmentTimeEnd:[] ,
-                        recycleStationId:[] ,
-                        staffsId:[] ,
-                        creatorUserId:[] ,
-                        creatorTime:[] ,
-                        consultTimeStart:[] ,
-                        consultTimeEnd:[] ,
-                        receiveTime:[] ,
-                        settleTime:[] ,
-                        starScore:[] ,
-                        comment:[] ,
-                        commentPics:[] ,
-                        responseStar:[] ,
-                        attitudeStar:[] ,
-                        priceStar:[] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        orderNumber: undefined,
+        orderTypeId: "521999177572425477",
+        orderAmount: undefined,
+        orderClientStatusId: undefined,
+        orderStafstatusId: undefined,
+        receivePeriod: undefined,
+        clientId: undefined,
+        clientName: undefined,
+        clientMobile: undefined,
+        recycleAddress: undefined,
+        appointmentTimeStart: undefined,
+        appointmentTimeEnd: undefined,
+        recycleStationId: undefined,
+        staffsId: undefined,
+        creatorUserId: undefined,
+        creatorTime: undefined,
+        consultTimeStart: undefined,
+        consultTimeEnd: undefined,
+        receiveTime: undefined,
+        settleTime: undefined,
+        starScore: 0,
+        comment: undefined,
+        commentPics: [],
+        responseStar: 0,
+        attitudeStar: 0,
+        priceStar: 0,
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+        orderTypeId: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ],
+        orderAmount: [
+          {
+            pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
+            message: '请输入正确的金额',
+            trigger: 'blur'
+          },
+        ],
+        recycleStationId: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+      },
+      orderTypeIdOptions: [],
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      orderClientStatusIdOptions: [],
+      orderClientStatusIdProps: { "label": "fullName", "value": "id" },
+      orderStafstatusIdOptions: [],
+      orderStafstatusIdProps: { "label": "fullName", "value": "id" },
+      recycleStationIdOptions: [],
+      recycleStationIdProps: { "label": "station_name", "value": "id" },
+      staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+      staffsIdProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        orderNumber: [],
+        orderTypeId: [],
+        orderAmount: [],
+        orderClientStatusId: [],
+        orderStafstatusId: [],
+        receivePeriod: [],
+        clientId: [],
+        clientName: [],
+        clientMobile: [],
+        recycleAddress: [],
+        appointmentTimeStart: [],
+        appointmentTimeEnd: [],
+        recycleStationId: [],
+        staffsId: [],
+        creatorUserId: [],
+        creatorTime: [],
+        consultTimeStart: [],
+        consultTimeEnd: [],
+        receiveTime: [],
+        settleTime: [],
+        starScore: [],
+        comment: [],
+        commentPics: [],
+        responseStar: [],
+        attitudeStar: [],
+        priceStar: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/RecycleOrder/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getorderTypeIdOptions();
-                        this.getorderClientStatusIdOptions();
-                        this.getorderStafstatusIdOptions();
-                        this.getrecycleStationIdOptions();
-            },
-                    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() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.recycleStationId))
-                    for (let i = 0; i < templateJsonList.length; i++) {
-                        let json = templateJsonList[i];
-                        if(json.relationField){
-                            let relationFieldAll = json.relationField.split("-");
-                            let val = json.defaultValue;
-                            if(relationFieldAll.length>1 && index>-1){
-                                val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
-                            }else {
-                                val = this.dataForm[relationFieldAll]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('520259300875047493',template).then(res => {
-                        let data = res.data
-                        this.recycleStationIdOptions = data
-                        this.changeDataFormData(1,'recycleStationId','recycleStationId',index,'')
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleOrder/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/RecycleOrder/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getorderTypeIdOptions();
+      this.getorderClientStatusIdOptions();
+      this.getorderStafstatusIdOptions();
+      this.getrecycleStationIdOptions();
+    },
+    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() {
+      const index = this.childIndex
+      let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.recycleStationId))
+      for (let i = 0; i < templateJsonList.length; i++) {
+        let json = templateJsonList[i];
+        if (json.relationField) {
+          let relationFieldAll = json.relationField.split("-");
+          let val = json.defaultValue;
+          if (relationFieldAll.length > 1 && index > -1) {
+            val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] + 'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[1]] : ''
+          } else {
+            val = this.dataForm[relationFieldAll]
+          }
+          json.defaultValue = val
+        }
+      }
+      let template = {
+        paramList: templateJsonList
+      }
+      getDataInterfaceRes('520259300875047493', template).then(res => {
+        let data = res.data
+        this.recycleStationIdOptions = data
+        this.changeDataFormData(1, 'recycleStationId', 'recycleStationId', index, '')
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/RecycleOrder/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/RecycleOrder',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/RecycleOrder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/RecycleOrder',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/RecycleOrder/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
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 b5be883..311708b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
@@ -6,653 +6,580 @@
 
 
 <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>
-                            <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-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <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>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <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>
+              <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-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+          </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>
+          </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" />
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <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>
+        </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" />
+    <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" />
+  </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,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                orderTypeIdOptions:[],
-                        orderTypeIdProps:{"label":"fullName","value":"id"  },
-                            orderClientStatusIdOptions:[],
-                        orderClientStatusIdProps:{"label":"fullName","value":"id"  },
-                            orderStafstatusIdOptions:[],
-                        orderStafstatusIdProps:{"label":"fullName","value":"id"  },
-                            recycleStationIdOptions:[],
-                        recycleStationIdProps:{"label":"station_name","value":"id"  },
-                            staffsIdOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-                        staffsIdProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
+      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'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      orderTypeIdOptions: [],
+      orderTypeIdProps: { "label": "fullName", "value": "id" },
+      orderClientStatusIdOptions: [],
+      orderClientStatusIdProps: { "label": "fullName", "value": "id" },
+      orderStafstatusIdOptions: [],
+      orderStafstatusIdProps: { "label": "fullName", "value": "id" },
+      recycleStationIdOptions: [],
+      recycleStationIdProps: { "label": "station_name", "value": "id" },
+      staffsIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+      staffsIdProps: { "label": "fullName", "value": "id" },
+      interfaceRes: {
+      },
+    }
+  },
+  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)
+        })
+      })
+    },
+    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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        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)
-                    })
-                })
-            },
-            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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.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()
-                            }
-                        });
-                    })
-                }).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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.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()
+            }
+          });
+        })
+      }).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/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/Detail.vue
index 63a9601..acab86d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/Detail.vue
@@ -1,159 +1,149 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
         <div class="options">
-            <el-button @click="goBack">取 消</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" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="回收站信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收站"  
- prop="stationId"  >
-                        <p>{{dataForm.stationId}}</p>
-                </jnpf-form-tip-item>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" size="small" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="回收站信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站" prop="stationId">
+                <p>{{dataForm.stationId}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-	    <el-col :span="24" >
-		<jnpf-form-tip-item  label-width="0">
-		<JnpfGroupTitle 
- contentPosition="left"  :closable= "false"  content ="回收员信息" >
-		</JnpfGroupTitle>
-	</jnpf-form-tip-item>
-	</el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="头像"  
- prop="headIcon"  >
-                    <JnpfUploadImg    v-model="dataForm.headIcon"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle contentPosition="left" :closable="false" content="回收员信息">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="头像" prop="headIcon">
+                <JnpfUploadImg v-model="dataForm.headIcon" disabled detailed :fileSize="10"
+                  sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImg>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收员姓名"  
- prop="staffsName"  >
-                        <p>{{dataForm.staffsName}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员姓名" prop="staffsName">
+                <p>{{dataForm.staffsName}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收员手机"  
- prop="mobilePhone"  >
-                        <p>{{dataForm.mobilePhone}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员手机" prop="mobilePhone">
+                <p>{{dataForm.mobilePhone}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="性别"  
- prop="gender"  >
-                         <p>{{ dataForm.gender }} </p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="性别" prop="gender">
+                <p>{{ dataForm.gender }} </p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="生日"  
- prop="birthday"  >
-                        <p>{{dataForm.birthday}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="生日" prop="birthday">
+                <p>{{dataForm.birthday}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="自动接单"  
- prop="autoEnabled"  >
-                        <p>{{dataForm.autoEnabled}}</p>
-                </jnpf-form-tip-item>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="自动接单" prop="autoEnabled">
+                <p>{{dataForm.autoEnabled}}</p>
+              </jnpf-form-tip-item>
             </el-col>
-    </template>
-</el-form>
-    </el-row>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            stationId : "",
-                            headIcon : [],
-                            staffsName : '',
-                            mobilePhone : '',
-                            gender : "1",
-                            birthday : '',
-                            autoEnabled : 1,
-            },
-                        stationIdProps:{"label":"station_name","value":"id"  },
-                            genderOptions:[{"fullName":"男","id":"1"},{"fullName":"女","id":"2"}],
-                        genderProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: '',
+        stationId: "",
+        headIcon: [],
+        staffsName: '',
+        mobilePhone: '',
+        gender: "1",
+        birthday: '',
+        autoEnabled: 1,
+      },
+      stationIdProps: { "label": "station_name", "value": "id" },
+      genderOptions: [{ "fullName": "男", "id": "1" }, { "fullName": "女", "id": "2" }],
+      genderProps: { "label": "fullName", "value": "id" },
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
 
-        },
-        mounted() {},
-        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.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
+  },
+  mounted() { },
+  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.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue)
+        })
+      })
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+    },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleStationStaff/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
+    goBack() {
+      this.$emit('refresh')
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/RecycleStationStaff/detail/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          })
+        }
 
-                })
-            },
-        },
-    }
+      })
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue
index b9b1ea0..4c15774 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue
@@ -2,528 +2,524 @@
 
 
     <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 ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <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" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="回收站信息"  contentPosition="left" >
+  <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 ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <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">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="回收站信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收站"   prop="stationId" >
-        <JnpfSelect   v-model="dataForm.stationId" @change="changeData('stationId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="stationIdOptions" :props="stationIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfGroupTitle 
- content="回收员信息"  contentPosition="left" >
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收站" prop="stationId">
+                <JnpfSelect v-model="dataForm.stationId" @change="changeData('stationId',-1)"
+                  placeholder="请选择" clearable :style='{"width":"100%"}' :options="stationIdOptions"
+                  :props="stationIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="回收员信息" contentPosition="left">
                 </JnpfGroupTitle>
-                </jnpf-form-tip-item>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="头像" prop="headIcon">
+                <JnpfUploadImg v-model="dataForm.headIcon" @change="changeData('headIcon',-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="staffsName">
+                <JnpfInput v-model="dataForm.staffsName" @change="changeData('staffsName',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="回收员手机" prop="mobilePhone">
+                <JnpfInput v-model="dataForm.mobilePhone" @change="changeData('mobilePhone',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="性别" prop="gender">
+                <JnpfRadio v-model="dataForm.gender" @change="changeData('gender',-1)"
+                  optionType="default" direction="horizontal" size="small" :options="genderOptions"
+                  :props="genderProps">
+                </JnpfRadio>
+              </jnpf-form-tip-item>
             </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="头像"   prop="headIcon" >
-        <JnpfUploadImg   v-model="dataForm.headIcon" @change="changeData('headIcon',-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="staffsName" >
-        <JnpfInput   v-model="dataForm.staffsName" @change="changeData('staffsName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收员手机"   prop="mobilePhone" >
-        <JnpfInput   v-model="dataForm.mobilePhone" @change="changeData('mobilePhone',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="性别"   prop="gender" >
-        <JnpfRadio   v-model="dataForm.gender" @change="changeData('gender',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="genderOptions" :props="genderProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="生日"   prop="birthday" >
-        <JnpfDatePicker   v-model="dataForm.birthday" @change="changeData('birthday',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="自动接单"   prop="autoEnabled" >
-        <JnpfSwitch   v-model="dataForm.autoEnabled" @change="changeData('autoEnabled',-1)" 
- :active-value="1"  :inactive-value="0" >
-    </JnpfSwitch>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="生日" prop="birthday">
+                <JnpfDatePicker v-model="dataForm.birthday" @change="changeData('birthday',-1)"
+                  :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                  placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                  format="yyyy-MM-dd">
+                </JnpfDatePicker>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="自动接单" prop="autoEnabled">
+                <JnpfSwitch v-model="dataForm.autoEnabled" @change="changeData('autoEnabled',-1)"
+                  :active-value="1" :inactive-value="0">
+                </JnpfSwitch>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                    stationId : undefined,
-                                    headIcon : [],
-                                staffsName : undefined,
-                                mobilePhone : undefined,
-                                    gender : "1",
-                                birthday : undefined,
-                                    autoEnabled : 1,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            stationId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            staffsName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            mobilePhone: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-                    stationIdOptions:[],
-                            stationIdProps:{"label":"station_name","value":"id"  },
-                            genderOptions:[{"fullName":"男","id":"1"},{"fullName":"女","id":"2"}],
-                            genderProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        stationId:[] ,
-                        headIcon:[] ,
-                        staffsName:[] ,
-                        mobilePhone:[] ,
-                        gender:[] ,
-                        birthday:[] ,
-                        autoEnabled:[] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        stationId: undefined,
+        headIcon: [],
+        staffsName: undefined,
+        mobilePhone: undefined,
+        gender: "1",
+        birthday: undefined,
+        autoEnabled: 1,
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+        stationId: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
+        staffsName: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+        mobilePhone: [
+          {
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          },
+        ],
+      },
+      stationIdOptions: [],
+      stationIdProps: { "label": "station_name", "value": "id" },
+      genderOptions: [{ "fullName": "男", "id": "1" }, { "fullName": "女", "id": "2" }],
+      genderProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        stationId: [],
+        headIcon: [],
+        staffsName: [],
+        mobilePhone: [],
+        gender: [],
+        birthday: [],
+        autoEnabled: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/RecycleStationStaff/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getstationIdOptions();
-            },
-                    getstationIdOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.stationId))
-                    for (let i = 0; i < templateJsonList.length; i++) {
-                        let json = templateJsonList[i];
-                        if(json.relationField){
-                            let relationFieldAll = json.relationField.split("-");
-                            let val = json.defaultValue;
-                            if(relationFieldAll.length>1 && index>-1){
-                                val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
-                            }else {
-                                val = this.dataForm[relationFieldAll]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('520259300875047493',template).then(res => {
-                        let data = res.data
-                        this.stationIdOptions = data
-                        this.changeDataFormData(1,'stationId','stationId',index,'')
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleStationStaff/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/RecycleStationStaff/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getstationIdOptions();
+    },
+    getstationIdOptions() {
+      const index = this.childIndex
+      let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.stationId))
+      for (let i = 0; i < templateJsonList.length; i++) {
+        let json = templateJsonList[i];
+        if (json.relationField) {
+          let relationFieldAll = json.relationField.split("-");
+          let val = json.defaultValue;
+          if (relationFieldAll.length > 1 && index > -1) {
+            val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] + 'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[1]] : ''
+          } else {
+            val = this.dataForm[relationFieldAll]
+          }
+          json.defaultValue = val
+        }
+      }
+      let template = {
+        paramList: templateJsonList
+      }
+      getDataInterfaceRes('520259300875047493', template).then(res => {
+        let data = res.data
+        this.stationIdOptions = data
+        this.changeDataFormData(1, 'stationId', 'stationId', index, '')
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/RecycleStationStaff/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/RecycleStationStaff',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/RecycleStationStaff/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/RecycleStationStaff',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/RecycleStationStaff/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </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 30f442e..435c76f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/index.vue
@@ -6,486 +6,463 @@
 
 
 <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="回收站">
-                                        <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>
-                                </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>
-                    <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-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                    </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>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="stationId"
- label="回收站"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="staffsName"
- label="回收员姓名"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="mobilePhone"
- label="回收员手机"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="性别"  prop="gender" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.gender}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="birthday"
- label="生日"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="autoEnabled"
- 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>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <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="回收站">
+              <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>
+            </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>
+          <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-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+          </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>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-
-
-
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod">
+          <el-table-column prop="stationId" label="回收站" align="left">
+          </el-table-column>
+          <el-table-column prop="staffsName" label="回收员姓名" align="left">
+          </el-table-column>
+          <el-table-column prop="mobilePhone" label="回收员手机" align="left">
+          </el-table-column>
+          <el-table-column label="性别" prop="gender" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.gender}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="birthday" label="生日" align="left">
+          </el-table-column>
+          <el-table-column prop="autoEnabled" label="自动接单" align="left">
+          </el-table-column>
 
-        <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" />
+          <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>
+        </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" />
+    <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" />
+  </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,
 
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        stationId:undefined,
-                        mobilePhone:undefined,
-                        staffsName:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                stationIdOptions:[],
-                        stationIdProps:{"label":"station_name","value":"id"  },
-                            genderOptions:[{"fullName":"男","id":"1"},{"fullName":"女","id":"2"}],
-                        genderProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        stationId: undefined,
+        mobilePhone: undefined,
+        staffsName: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      stationIdOptions: [],
+      stationIdProps: { "label": "station_name", "value": "id" },
+      genderOptions: [{ "fullName": "男", "id": "1" }, { "fullName": "女", "id": "2" }],
+      genderProps: { "label": "fullName", "value": "id" },
+      interfaceRes: {
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.getstationIdOptions();
+    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
+      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] || ''
+          }
+        }
+        //参数
+        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
             }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
+          }
+        }
+      }
+      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
+              })
             }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getstationIdOptions();
-            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
-                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] || ''
-                        }
-                    }
-                    //参数
-                    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
-                            }
-                        }
-                    }
-                }
-                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
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-                    getstationIdOptions() {
-                        getDataInterfaceRes('520259300875047493').then(res => {
-                            let data = res.data
-                            this.stationIdOptions = 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:'520258938264883781',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/RecycleStationStaff/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/RecycleStationStaff/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/RecycleStationStaff")
-                })
-            },
-                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/RecycleStationStaff/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()
-            },
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-    }
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
+        }
+      }
+      this.exportList = exportList
+    },
+    getstationIdOptions() {
+      getDataInterfaceRes('520259300875047493').then(res => {
+        let data = res.data
+        this.stationIdOptions = 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: '520258938264883781',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/RecycleStationStaff/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/RecycleStationStaff/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/RecycleStationStaff")
+      })
+    },
+    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/RecycleStationStaff/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>