diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
index 6cfa26c..1f0cf6d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java
@@ -55,6 +55,8 @@ public class RecycleDeviceController {
 
     @Autowired
     private RecycleDeviceService recycleDeviceService;
+    @Autowired
+    private CompanyService companyService;
     @Resource
     private RecycleBucketService recycleBucketService;
     @Resource
@@ -312,6 +314,21 @@ public class RecycleDeviceController {
         List<RecycleDeviceEntity> list = recycleDeviceService.list(lambda);
         return ActionResult.success(list);
     }
+    //获取商户列表
+    @PostMapping("/getCompanyList")
+    @Operation(summary = "获取商户列表下拉")
+    public ActionResult getCompanyList() {
+        UserInfo userInfo = userProvider.get();
+        Boolean isAdministrator = userInfo.getIsAdministrator();
+        String organizeId = userInfo.getOrganizeId();
+        QueryWrapper<CompanyEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CompanyEntity> lambda = wrapper.lambda();
+        if(!isAdministrator){
+            lambda.eq(CompanyEntity::getId,organizeId);
+        }
+        List<CompanyEntity> list = companyService.list(lambda);
+        return ActionResult.success(list);
+    }
 
 
 }
diff --git a/jnpf-java-boot/jnpf-web/src/api/device.js b/jnpf-java-boot/jnpf-web/src/api/device.js
index 7e3ee99..6c595fb 100644
--- a/jnpf-java-boot/jnpf-web/src/api/device.js
+++ b/jnpf-java-boot/jnpf-web/src/api/device.js
@@ -212,3 +212,10 @@ export function getDeviceListInfo(query) {
     data: query
   });
 }
+// 获取商户列表
+export function getCompanyList() {
+  return request({
+    url: `/api/scm/RecycleDevice/getCompanyList`,
+    method: "POST"
+  });
+}
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue
index 9351f3a..8139fd1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue
@@ -1,637 +1,821 @@
-
-
-
-    <template>
-        <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
-                   :close-on-click-modal="false" append-to-body
-                   :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-                   width="600px">
-        <el-row :gutter="15" class="">
-    <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
- label="设备编码"   prop="deviceCode" >
-        <JnpfInput   v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)" 
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="设备名称"  tipLabel="设备名称"   prop="deviceName" >
-        <JnpfInput   v-model="dataForm.deviceName" @change="changeData('deviceName',-1)" 
- placeholder="设备名称"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="所在城市"   prop="city" >
-        <JnpfAreaSelect   v-model="dataForm.city" @change="changeData('city',-1)" 
- placeholder="请选择"  selectType="all"  clearable  :style='{"width":"100%"}' :level="2" >
-    </JnpfAreaSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <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="24" >
-        <jnpf-form-tip-item
- label="投用状态"   prop="useStatus" >
-        <JnpfRadio   v-model="dataForm.useStatus" @change="changeData('useStatus',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="useStatusOptions" :props="useStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="设备状态"   prop="status" >
-        <JnpfRadio   v-model="dataForm.status" @change="changeData('status',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="statusOptions" :props="statusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="所属商户"  tipLabel="绑定回收站"   prop="beLongCompanyId" >
-        <JnpfSelect   v-model="dataForm.beLongCompanyId" @change="changeData('beLongCompanyId',-1)" 
- placeholder="请选择要绑定的商户"  clearable  :style='{"width":"100%"}' :options="beLongCompanyIdOptions" :props="beLongCompanyIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="所属回收站"  tipLabel="绑定回收站"   prop="beLongStationId" >
-        <JnpfSelect   v-model="dataForm.beLongStationId" @change="changeData('beLongStationId',-1)" 
- placeholder="请选择要绑定的商户"  clearable  :style='{"width":"100%"}' :options="beLongStationIdOptions" :props="beLongStationIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="所属清运员"   prop="beLongRecyclerPhone" >
-        <JnpfSelect   v-model="dataForm.beLongRecyclerPhone" @change="changeData('beLongRecyclerPhone',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="beLongRecyclerPhoneOptions" :props="beLongRecyclerPhoneProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="设备码二维码"   prop="deviceCodeQr" >
-        <JnpfUploadImg   v-model="dataForm.deviceCodeQr" @change="changeData('deviceCodeQr',-1)" 
- disabled  :fileSize="100" sizeUnit="MB"  :limit="1"  pathType="defaultPath"  :isAccount="0" >
-    </JnpfUploadImg>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="设备总重"   prop="boxWeight" >
-        <JnpfInput   v-model="dataForm.boxWeight" @change="changeData('boxWeight',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="修改用户"   prop="lastModifyUserId" >
-        <JnpfInput   v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)" 
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="修改时间"   prop="lastModifyTime" >
-        <JnpfInput   v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)" 
- placeholder="系统自动生成"  readonly  :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"/>
+<template>
+  <el-dialog
+    :title="!dataForm.id ? '新建' : '编辑'"
+    :close-on-click-modal="false"
+    append-to-body
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    width="600px"
+  >
+    <el-row :gutter="15" class="">
+      <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 label="设备编码" prop="deviceCode">
+              <JnpfInput
+                v-model="dataForm.deviceCode"
+                @change="changeData('deviceCode', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item
+              label="设备名称"
+              tipLabel="设备名称"
+              prop="deviceName"
+            >
+              <JnpfInput
+                v-model="dataForm.deviceName"
+                @change="changeData('deviceName', -1)"
+                placeholder="设备名称"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="所在城市" prop="city">
+              <JnpfAreaSelect
+                v-model="dataForm.city"
+                @change="changeData('city', -1)"
+                placeholder="请选择"
+                selectType="all"
+                clearable
+                :style="{ width: '100%' }"
+                :level="2"
+              >
+              </JnpfAreaSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <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="24">
+            <jnpf-form-tip-item label="投用状态" prop="useStatus">
+              <JnpfRadio
+                v-model="dataForm.useStatus"
+                @change="changeData('useStatus', -1)"
+                optionType="button"
+                direction="horizontal"
+                size="small"
+                :options="useStatusOptions"
+                :props="useStatusProps"
+              >
+              </JnpfRadio>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备状态" prop="status">
+              <JnpfRadio
+                v-model="dataForm.status"
+                @change="changeData('status', -1)"
+                optionType="button"
+                direction="horizontal"
+                size="small"
+                :options="statusOptions"
+                :props="statusProps"
+              >
+              </JnpfRadio>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item
+              label="所属商户"
+              tipLabel="绑定回收站"
+              prop="beLongCompanyId"
+            >
+              <JnpfSelect
+                v-model="dataForm.beLongCompanyId"
+                @change="changeData('beLongCompanyId', -1)"
+                placeholder="请选择要绑定的商户"
+                clearable
+                :style="{ width: '100%' }"
+                :options="beLongCompanyIdOptions"
+                :props="beLongCompanyIdProps"
+              >
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item
+              label="所属回收站"
+              tipLabel="绑定回收站"
+              prop="beLongStationId"
+            >
+              <JnpfSelect
+                v-model="dataForm.beLongStationId"
+                @change="changeData('beLongStationId', -1)"
+                placeholder="请选择要绑定的商户"
+                clearable
+                :style="{ width: '100%' }"
+                :options="beLongStationIdOptions"
+                :props="beLongStationIdProps"
+              >
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="所属清运员" prop="beLongRecyclerPhone">
+              <JnpfSelect
+                v-model="dataForm.beLongRecyclerPhone"
+                @change="changeData('beLongRecyclerPhone', -1)"
+                placeholder="请选择"
+                clearable
+                :style="{ width: '100%' }"
+                :options="beLongRecyclerPhoneOptions"
+                :props="beLongRecyclerPhoneProps"
+              >
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备码二维码" prop="deviceCodeQr">
+              <JnpfUploadImg
+                v-model="dataForm.deviceCodeQr"
+                @change="changeData('deviceCodeQr', -1)"
+                disabled
+                :fileSize="100"
+                sizeUnit="MB"
+                :limit="1"
+                pathType="defaultPath"
+                :isAccount="0"
+              >
+              </JnpfUploadImg>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备总重" prop="boxWeight">
+              <JnpfInput
+                v-model="dataForm.boxWeight"
+                @change="changeData('boxWeight', -1)"
+                placeholder="请选择"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
+              <JnpfInput
+                v-model="dataForm.lastModifyUserId"
+                @change="changeData('lastModifyUserId', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
+              <JnpfInput
+                v-model="dataForm.lastModifyTime"
+                @change="changeData('lastModifyTime', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :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>
     <span slot="footer" class="dialog-footer">
-                    <div class="upAndDown-button" v-if="dataForm.id">
-                <el-button @click="prev" :disabled='prevDis'>
-                  {{'上一条'}}
-                </el-button>
-                <el-button @click="next" :disabled='nextDis'>
-                  {{'下一条'}}
-                </el-button>
-              </div>
-                <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
-            {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
-              <el-button @click="visible = false"> 取 消</el-button>
-              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
-        </span>
-    </el-dialog>
-    </template>
-
+      <div class="upAndDown-button" v-if="dataForm.id">
+        <el-button @click="prev" :disabled="prevDis">
+          {{ "上一条" }}
+        </el-button>
+        <el-button @click="next" :disabled="nextDis">
+          {{ "下一条" }}
+        </el-button>
+      </div>
+      <el-button
+        type="primary"
+        @click="dataFormSubmit(2)"
+        :loading="continueBtnLoading"
+      >
+        {{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
+      >
+      <el-button @click="visible = false"> 取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+        确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</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: {
-                                deviceCode : undefined,
-                                deviceName : undefined,
-                                    city : [],
-                                address : undefined,
-                                    useStatus : "0",
-                                    status : "0",
-                                    beLongCompanyId : undefined,
-                                    beLongStationId : undefined,
-                                    beLongRecyclerPhone : undefined,
-                                    deviceCodeQr : [],
-                                ipAddress : undefined,
-                                boxWeight : undefined,
-                                latitude : undefined,
-                                longitude : undefined,
-                                    creatorTime : undefined,
-                                    creatorUserId : undefined,
-                                    lastModifyUserId : undefined,
-                                    lastModifyTime : undefined,
-                                    organizeJsonId : undefined,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-                            deviceName: [
-                                {
-                                    required: true,
-                                    message: '设备名称',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            city: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            address: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            useStatus: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                            useStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"暂停服务","id":"2"},{"fullName":"关闭","id":"0"}],
-                            useStatusProps:{"label":"fullName","value":"id"  },
-                            statusOptions:[{"fullName":"离线","id":"0"},{"fullName":"在线","id":"1"}],
-                            statusProps:{"label":"fullName","value":"id"  },
-                    beLongCompanyIdOptions:[],
-                            beLongCompanyIdProps:{"label":"f_full_name","value":"f_id"  },
-                    beLongStationIdOptions:[],
-                            beLongStationIdProps:{"label":"station_name","value":"id"  },
-                    beLongRecyclerPhoneOptions:[],
-                            beLongRecyclerPhoneProps:{"label":"staffs_name","value":"mobile_phone"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        deviceCode:[] ,
-                        deviceName:[] ,
-                        city:[] ,
-                        address:[] ,
-                        useStatus:[] ,
-                        status:[] ,
-                        beLongCompanyId:[] ,
-                        beLongStationId:[{"dataType":"varchar","defaultValue":"@organization","field":"company_id","fieldName":"公司id","id":"Oe3gDA2","jnpfKey":"select","relationField":"beLongCompanyId","required":"0"}] ,
-                        beLongRecyclerPhone:[] ,
-                        deviceCodeQr:[] ,
-                        ipAddress:[] ,
-                        boxWeight:[] ,
-                        latitude:[] ,
-                        longitude:[] ,
-                        creatorTime:[] ,
-                        creatorUserId:[] ,
-                        lastModifyUserId:[] ,
-                        lastModifyTime:[] ,
-                        organizeJsonId:[] ,
-            },
+import request from "@/utils/request";
+import { mapGetters } from "vuex";
+import { getCompanyList, getDeviceListOption } from "@/api/device";
+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: {
+        deviceCode: undefined,
+        deviceName: undefined,
+        city: [],
+        address: undefined,
+        useStatus: "0",
+        status: "0",
+        beLongCompanyId: undefined,
+        beLongStationId: undefined,
+        beLongRecyclerPhone: undefined,
+        deviceCodeQr: [],
+        ipAddress: undefined,
+        boxWeight: undefined,
+        latitude: undefined,
+        longitude: undefined,
+        creatorTime: undefined,
+        creatorUserId: undefined,
+        lastModifyUserId: undefined,
+        lastModifyTime: undefined,
+        organizeJsonId: undefined
+      },
+      tableRequiredData: {},
+      dataRule: {
+        deviceName: [
+          {
+            required: true,
+            message: "设备名称",
+            trigger: "blur"
+          }
+        ],
+        city: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change"
+          }
+        ],
+        address: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur"
+          }
+        ],
+        useStatus: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change"
+          }
+        ]
+      },
+      useStatusOptions: [
+        { fullName: "启用", id: "1" },
+        { fullName: "暂停服务", id: "2" },
+        { fullName: "关闭", id: "0" }
+      ],
+      useStatusProps: { label: "fullName", value: "id" },
+      statusOptions: [
+        { fullName: "离线", id: "0" },
+        { fullName: "在线", id: "1" }
+      ],
+      statusProps: { label: "fullName", value: "id" },
+      beLongCompanyIdOptions: [],
+      beLongCompanyIdProps: { label: "enterpriseName", value: "id" },
+      beLongStationIdOptions: [],
+      beLongStationIdProps: { label: "station_name", value: "id" },
+      beLongRecyclerPhoneOptions: [],
+      beLongRecyclerPhoneProps: { label: "staffs_name", value: "mobile_phone" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        deviceCode: [],
+        deviceName: [],
+        city: [],
+        address: [],
+        useStatus: [],
+        status: [],
+        beLongCompanyId: [],
+        beLongStationId: [
+          {
+            dataType: "varchar",
+            defaultValue: "@organization",
+            field: "company_id",
+            fieldName: "公司id",
+            id: "Oe3gDA2",
+            jnpfKey: "select",
+            relationField: "beLongCompanyId",
+            required: "0"
+          }
+        ],
+        beLongRecyclerPhone: [],
+        deviceCodeQr: [],
+        ipAddress: [],
+        boxWeight: [],
+        latitude: [],
+        longitude: [],
+        creatorTime: [],
+        creatorUserId: [],
+        lastModifyUserId: [],
+        lastModifyTime: [],
+        organizeJsonId: []
+      }
+    };
+  },
+  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/RecycleDevice/'+ 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.getbeLongCompanyIdOptions();
-                        this.getbeLongStationIdOptions();
-                        this.getbeLongRecyclerPhoneOptions();
-            },
-                    getbeLongCompanyIdOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.beLongCompanyId))
-                    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('563706688754953029',template).then(res => {
-                        let data = res.data
-                        this.beLongCompanyIdOptions = data
-                        this.changeDataFormData(1,'beLongCompanyId','beLongCompanyId',index,'')
-                    })
-                },
-                    getbeLongStationIdOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.beLongStationId))
-                    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('563705984451619653',template).then(res => {
-                        let data = res.data
-                        this.beLongStationIdOptions = data
-                        this.changeDataFormData(1,'beLongStationId','beLongStationId',index,'')
-                    })
-                },
-                    getbeLongRecyclerPhoneOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.beLongRecyclerPhone))
-                    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('573108606942052421',template).then(res => {
-                        let data = res.data
-                        this.beLongRecyclerPhoneOptions = data
-                        this.changeDataFormData(1,'beLongRecyclerPhone','beLongRecyclerPhone',index,'')
-                    })
-                },
-            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/RecycleDevice/'+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()
+      }
+    },
+    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/RecycleDevice/" + 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.getbeLongCompanyIdOptions();
+      this.getbeLongStationIdOptions();
+      this.getbeLongRecyclerPhoneOptions();
+    },
+    getbeLongCompanyIdOptions() {
+      const index = this.childIndex;
+      let templateJsonList = JSON.parse(
+        JSON.stringify(this.interfaceRes.beLongCompanyId)
+      );
+      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
+      };
+      //   getDeviceListOption().then(res=>{
+      //     console.log(res)
+      //     let data = res.data;
+      //   })
+      //   console.log(template)
+      getCompanyList().then(res => {
+        console.log(res)
+        let data = res.data;
+        this.beLongCompanyIdOptions = data;
+        // console.log(this.beLongCompanyIdOptions)
+        this.changeDataFormData(
+          1,
+          "beLongCompanyId",
+          "beLongCompanyId",
+          index,
+          ""
+        );
+      });
+      // getDataInterfaceRes("563706688754953029", template).then(res => {
+      //   let data = res.data;
+      //   this.beLongCompanyIdOptions = data;
+      //   // console.log(this.beLongCompanyIdOptions)
+      //   this.changeDataFormData(
+      //     1,
+      //     "beLongCompanyId",
+      //     "beLongCompanyId",
+      //     index,
+      //     ""
+      //   );
+      // });
+    },
+    getbeLongStationIdOptions() {
+      const index = this.childIndex;
+      let templateJsonList = JSON.parse(
+        JSON.stringify(this.interfaceRes.beLongStationId)
+      );
+      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("563705984451619653", template).then(res => {
+        let data = res.data;
+        this.beLongStationIdOptions = data;
+        this.changeDataFormData(
+          1,
+          "beLongStationId",
+          "beLongStationId",
+          index,
+          ""
+        );
+      });
+    },
+    getbeLongRecyclerPhoneOptions() {
+      const index = this.childIndex;
+      let templateJsonList = JSON.parse(
+        JSON.stringify(this.interfaceRes.beLongRecyclerPhone)
+      );
+      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("573108606942052421", template).then(res => {
+        let data = res.data;
+        this.beLongRecyclerPhoneOptions = data;
+        this.changeDataFormData(
+          1,
+          "beLongRecyclerPhone",
+          "beLongRecyclerPhone",
+          index,
+          ""
+        );
+      });
+    },
+    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/RecycleDevice/" + 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/RecycleDevice",
+          method: "post",
+          data: _data
+        })
+          .then(res => {
+            this.$message({
+              message: res.msg,
+              type: "success",
+              duration: 1000,
+              onClose: () => {
                 if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/RecycleDevice',
-                        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/RecycleDevice/'+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
-                    })
+                  this.$nextTick(() => {
+                    this.clearData();
+                    this.initDefaultData();
+                  });
+                  this.continueBtnLoading = false;
+                  return;
                 }
-            },
-            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
-            },
-        },
+                this.visible = false;
+                this.btnLoading = false;
+                this.$emit("refresh", true);
+              }
+            });
+          })
+          .catch(() => {
+            this.btnLoading = false;
+            this.continueBtnLoading = false;
+          });
+      } else {
+        request({
+          url: "/api/scm/RecycleDevice/" + 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>