diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java
index 3616b04..9bd37a7 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java
@@ -85,19 +85,7 @@ public class RecycleBucketController {
         Map<String, RecycleDeviceConfigEntity> configCollect = recycleDeviceConfigService.getConfigs(companyIds);
         List<Map<String, Object>> realList = new ArrayList<>();
         for (RecycleBucketEntity entity : list) {
-            if (configCollect.containsKey(entity.getCompanyId())) {
-                RecycleDeviceConfigEntity deviceConfig = configCollect.get(entity.getCompanyId());
-                //如果为空 则获取公共配置
-                if (Objects.isNull(entity.getPrice())) {
-                    entity.setPrice(CompareUtil.compareBigDecimal(entity.getDoorNum(), deviceConfig));
-                }
-                if (entity.getFullSet() == -1) {
-                    entity.setFullSet(Integer.valueOf(deviceConfig.getFullSet()));
-                }
-                if (entity.getSmogSet() == -1) {
-                    entity.setSmogSet(Integer.valueOf(deviceConfig.getSmogSet()));
-                }
-            }
+            buildEntity(entity, configCollect);
             Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(entity);
             recycleBucketMap.put("id", recycleBucketMap.get("id"));
             //副表数据
@@ -213,7 +201,9 @@ public class RecycleBucketController {
         if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(entity);
+        //查询统一配置
+        Map<String, RecycleDeviceConfigEntity> configCollect = recycleDeviceConfigService.getConfigs(Collections.singletonList(entity.getCompanyId()));
+        Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(buildEntity(entity, configCollect));
         recycleBucketMap.put("id", recycleBucketMap.get("id"));
         //副表数据
         //子表数据
@@ -240,7 +230,50 @@ public class RecycleBucketController {
         //副表数据
         //子表数据
         recycleBucketMap = generaterSwapUtil.swapDataForm(recycleBucketMap, RecycleBucketConstant.getFormData(), RecycleBucketConstant.TABLEFIELDKEY, RecycleBucketConstant.TABLERENAMES);
+        //查询统一配置
+        Map<String, RecycleDeviceConfigEntity> configCollect = recycleDeviceConfigService.getConfigs(Collections.singletonList(entity.getCompanyId()));
+        if (configCollect.containsKey(entity.getCompanyId())) {
+            RecycleDeviceConfigEntity deviceConfig = configCollect.get(entity.getCompanyId());
+            //如果为空 则获取公共配置
+            if (Objects.isNull(entity.getPrice())) {
+                recycleBucketMap.put("priceDesc", CompareUtil.compareBigDecimal(entity.getDoorNum(), deviceConfig));
+            }
+            if (Objects.nonNull(entity.getFullSet()) && entity.getFullSet() == -1) {
+                recycleBucketMap.put("fullSetDesc", Integer.valueOf(deviceConfig.getFullSet()));
+            }
+            if (Objects.nonNull(entity.getSmogSet()) && entity.getSmogSet() == -1) {
+                recycleBucketMap.put("smogSetDesc", Integer.valueOf(deviceConfig.getSmogSet()));
+            }
+            if (Objects.isNull(entity.getWarningWeight())) {
+                recycleBucketMap.put("warningWeightDesc", deviceConfig.getWarningWeight());
+            }
+            if (Objects.nonNull(entity.getCloseDelay()) && entity.getCloseDelay() == -1) {
+                recycleBucketMap.put("closeDelayDesc", deviceConfig.getCloseDelay());
+            }
+        }
         return ActionResult.success(recycleBucketMap);
     }
 
+    private RecycleBucketEntity buildEntity(RecycleBucketEntity entity, Map<String, RecycleDeviceConfigEntity> configCollect) {
+        if (configCollect.containsKey(entity.getCompanyId())) {
+            RecycleDeviceConfigEntity deviceConfig = configCollect.get(entity.getCompanyId());
+            //如果为空 则获取公共配置
+            if (Objects.isNull(entity.getPrice())) {
+                entity.setPrice(CompareUtil.compareBigDecimal(entity.getDoorNum(), deviceConfig));
+            }
+            if (Objects.nonNull(entity.getFullSet()) && entity.getFullSet() == -1) {
+                entity.setFullSet(Integer.valueOf(deviceConfig.getFullSet()));
+            }
+            if (Objects.nonNull(entity.getSmogSet()) && entity.getSmogSet() == -1) {
+                entity.setSmogSet(Integer.valueOf(deviceConfig.getSmogSet()));
+            }
+            if (Objects.isNull(entity.getWarningWeight())) {
+                entity.setWarningWeight(deviceConfig.getWarningWeight());
+            }
+            if (Objects.nonNull(entity.getCloseDelay()) && entity.getCloseDelay() == -1) {
+                entity.setCloseDelay(deviceConfig.getCloseDelay());
+            }
+        }
+        return entity;
+    }
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
index 6e7f885..5a005ed 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
@@ -1,240 +1,270 @@
-
-
-
-    <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>
+<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>
-            <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="showName" >
-        <JnpfInput   v-model="dataForm.showName" @change="changeData('showName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="门号"   prop="doorNum" >
-        <JnpfSelect   v-model="dataForm.doorNum" @change="changeData('doorNum',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="doorNumOptions" :props="doorNumProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="所属设备"   prop="deviceCode" >
-        <JnpfPopupSelect   v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.deviceCode"  placeholder="请选择"  propsValue="device_code"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='device_name'  field='deviceCode'  interfaceId="564713894723988869"  :pageSize="20"  :columnOptions="deviceCodecolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="是否显示"   prop="isShow" >
-        <JnpfRadio   v-model="dataForm.isShow" @change="changeData('isShow',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="isShowOptions" :props="isShowProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="显示顺序"   prop="showOrd" >
-        <JnpfInputNumber   v-model="dataForm.showOrd" @change="changeData('showOrd',-1)" 
- placeholder="数字文本"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="回收品大类"   prop="productCode" >
-        <JnpfRadio   v-model="dataForm.productCode" @change="changeData('productCode',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="productCodeOptions" :props="productCodeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="回收品子类"   prop="productSubCode" >
-        <JnpfRadio   v-model="dataForm.productSubCode" @change="changeData('productSubCode',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="productSubCodeOptions" :props="productSubCodeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="价格"   prop="price" >
-        <JnpfInputNumber   v-model="dataForm.price" @change="changeData('price',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="满溢状态"   prop="fullStatus" >
-        <JnpfRadio   v-model="dataForm.fullStatus" @change="changeData('fullStatus',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="fullStatusOptions" :props="fullStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="满溢设置"   prop="fullSet" >
-        <JnpfRadio   v-model="dataForm.fullSet" @change="changeData('fullSet',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="fullSetOptions" :props="fullSetProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="烟雾状态"   prop="smogStatus" >
-        <JnpfRadio   v-model="dataForm.smogStatus" @change="changeData('smogStatus',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="smogStatusOptions" :props="smogStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="烟雾设置"   prop="smogSet" >
-        <JnpfRadio   v-model="dataForm.smogSet" @change="changeData('smogSet',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="smogSetOptions" :props="smogSetProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="容器重量"   prop="containerWeight" >
-        <JnpfInputNumber   v-model="dataForm.containerWeight" @change="changeData('containerWeight',-1)" 
- placeholder="数字文本"  :precision="2"  addonAfter="KG"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="当前重量"   prop="currentWeight" >
-        <JnpfInputNumber   v-model="dataForm.currentWeight" @change="changeData('currentWeight',-1)" 
- placeholder="数字文本"  :precision="2"  addonAfter="KG"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="重量上限"   prop="warningWeight" >
-        <JnpfInputNumber   v-model="dataForm.warningWeight" @change="changeData('warningWeight',-1)" 
- placeholder="数字文本"  :precision="2"  addonAfter="KG"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="关闭延时"  tipLabel="投递门关闭延时"   prop="closeDelay" >
-        <JnpfInput   v-model="dataForm.closeDelay" @change="changeData('closeDelay',-1)" 
- placeholder="请输入"  addonAfter="秒"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="投递门"  tipLabel="投递门状态"   prop="deliveryDoorStatus" >
-        <JnpfRadio   v-model="dataForm.deliveryDoorStatus" @change="changeData('deliveryDoorStatus',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="deliveryDoorStatusOptions" :props="deliveryDoorStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运门"  tipLabel="清运门状态"   prop="cleanDoorStatus" >
-        <JnpfRadio   v-model="dataForm.cleanDoorStatus" @change="changeData('cleanDoorStatus',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="cleanDoorStatusOptions" :props="cleanDoorStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="垃圾袋编码"   prop="bagNo" >
-        <JnpfInput   v-model="dataForm.bagNo" @change="changeData('bagNo',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="桶身图片"   prop="bucketImg" >
-        <JnpfUploadImg   v-model="dataForm.bucketImg" @change="changeData('bucketImg',-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="status" >
-        <JnpfRadio   v-model="dataForm.status" @change="changeData('status',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="statusOptions" :props="statusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="租户"   prop="tenantId" >
-        <JnpfOrganizeSelect   v-model="dataForm.tenantId" @change="changeData('tenantId',-1)" 
- placeholder="请选择"  selectType="all"  :ableIds="ableAll.tenantIdableIds"  clearable  :style='{"width":"100%"}'>
-    </JnpfOrganizeSelect>
-    </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>
+            </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="showName">
+                                <JnpfInput v-model="dataForm.showName" @change="changeData('showName', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="门号" prop="doorNum">
+                                <JnpfSelect v-model="dataForm.doorNum" @change="changeData('doorNum', -1)"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' :options="doorNumOptions"
+                                    :props="doorNumProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属设备" prop="deviceCode">
+                                <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
+                                    placeholder="请选择" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
+                                    popupType="dialog" relationField='device_name' field='deviceCode'
+                                    interfaceId="564713894723988869" :pageSize="20"
+                                    :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="是否显示" prop="isShow">
+                                <JnpfRadio v-model="dataForm.isShow" @change="changeData('isShow', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="isShowOptions"
+                                    :props="isShowProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="显示顺序" prop="showOrd">
+                                <JnpfInputNumber v-model="dataForm.showOrd" @change="changeData('showOrd', -1)"
+                                    placeholder="数字文本" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="回收品大类" prop="productCode">
+                                <JnpfRadio v-model="dataForm.productCode" @change="changeData('productCode', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="productCodeOptions" :props="productCodeProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="回收品子类" prop="productSubCode">
+                                <JnpfRadio v-model="dataForm.productSubCode" @change="changeData('productSubCode', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="productSubCodeOptions" :props="productSubCodeProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="价格" prop="price">
+                                <div>
+                                    <el-checkbox v-model="useUnifiedConfig" :label="checkboxLabel"></el-checkbox>
+                                    <span>{{ priceDesc }}</span>
+                                </div>
+                                <JnpfInputNumber v-model="dataForm.price" @change="changeData('price', -1)"
+                                    placeholder="请输入价格" :precision="2" :step="1" :disabled="useUnifiedConfig">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="满溢状态" prop="fullStatus">
+                                <JnpfRadio v-model="dataForm.fullStatus" @change="changeData('fullStatus', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="fullStatusOptions" :props="fullStatusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="满溢设置" prop="fullSet">
+                                <div>
+                                    <el-checkbox v-model="usefullSetConfig" :label="checkboxLabel"></el-checkbox>
+                                    <span>{{ fullSetDesc }}</span>
+                                </div>
+                                <JnpfRadio v-model="dataForm.fullSet" @change="changeData('fullSet', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="fullSetOptions"
+                                    :props="fullSetProps" :disabled="usefullSetConfig">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="烟雾状态" prop="smogStatus">
+                                <JnpfRadio v-model="dataForm.smogStatus" @change="changeData('smogStatus', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="smogStatusOptions" :props="smogStatusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="烟雾设置" prop="smogSet">
+                                <div>
+                                    <el-checkbox v-model="useSmogSetConfig" :label="checkboxLabel"></el-checkbox>
+                                    <span>{{ smogSetDesc }}</span>
+                                </div>
+                                <JnpfRadio v-model="dataForm.smogSet" @change="changeData('smogSet', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="smogSetOptions"
+                                    :props="smogSetProps" :disabled="useSmogSetConfig">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="容器重量" prop="containerWeight">
+                                <JnpfInputNumber v-model="dataForm.containerWeight"
+                                    @change="changeData('containerWeight', -1)" placeholder="请输入容器重量" :precision="2"
+                                    addonAfter="KG" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="当前重量" prop="currentWeight">
+                                <JnpfInputNumber v-model="dataForm.currentWeight"
+                                    @change="changeData('currentWeight', -1)" placeholder="请输入当前重量" :precision="2"
+                                    addonAfter="KG" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="重量上限" prop="warningWeight">
+                                <div>
+                                    <el-checkbox v-model="warningWeightConfig" :label="checkboxLabel"></el-checkbox>
+                                    <span>{{ warningWeightDesc }}</span>
+                                </div>
+                                <JnpfInputNumber v-model="dataForm.warningWeight"
+                                    @change="changeData('warningWeight', -1)" placeholder="请输入重量上限" :precision="2"
+                                    addonAfter="KG" :step="1" :disabled="warningWeightConfig">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="关闭延时" tipLabel="投递门关闭延时" prop="closeDelay">
+                                <div>
+                                    <el-checkbox v-model="closeDelayConfig" :label="checkboxLabel"></el-checkbox>
+                                    <span>{{ closeDelayDesc }}</span>
+                                </div>
+                                <JnpfInput v-model="dataForm.closeDelay" @change="changeData('closeDelay', -1)"
+                                    placeholder="请输入" addonAfter="秒" clearable :style='{ "width": "100%" }'
+                                    :disabled="closeDelayConfig">
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="投递门" tipLabel="投递门状态" prop="deliveryDoorStatus">
+                                <JnpfRadio v-model="dataForm.deliveryDoorStatus"
+                                    @change="changeData('deliveryDoorStatus', -1)" optionType="default"
+                                    direction="horizontal" size="small" :options="deliveryDoorStatusOptions"
+                                    :props="deliveryDoorStatusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="清运门" tipLabel="清运门状态" prop="cleanDoorStatus">
+                                <JnpfRadio v-model="dataForm.cleanDoorStatus"
+                                    @change="changeData('cleanDoorStatus', -1)" optionType="default"
+                                    direction="horizontal" size="small" :options="cleanDoorStatusOptions"
+                                    :props="cleanDoorStatusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="垃圾袋编码" prop="bagNo">
+                                <JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo', -1)" placeholder="请输入"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="桶身图片" prop="bucketImg">
+                                <JnpfUploadImg v-model="dataForm.bucketImg" @change="changeData('bucketImg', -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="status">
+                                <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="statusOptions"
+                                    :props="statusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="租户" prop="tenantId">
+                                <JnpfOrganizeSelect v-model="dataForm.tenantId" @change="changeData('tenantId', -1)"
+                                    placeholder="请选择" selectType="all" :ableIds="ableAll.tenantIdableIds" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfOrganizeSelect>
+                            </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>
+</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() {
+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 {
+            checkboxLabel: '采用统一配置：',
+            priceDesc: '',
+            fullSetDesc: '',
+            smogSetDesc: '',
+            warningWeightDesc: '',
+            closeDelayDesc: '',
+            useUnifiedConfig: false,
+            usefullSetConfig: false,
+            useSmogSetConfig: false,
+            closeDelayConfig: false,
+            warningWeightConfig: false,
             dataFormSubmitType: 0,
             continueBtnLoading: false,
             index: 0,
@@ -245,453 +275,496 @@
             loading: false,
             btnLoading: false,
             formRef: 'formRef',
-            setting:{},
+            setting: {},
             eventType: '',
-            userBoxVisible:false,
+            userBoxVisible: false,
             selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
             },
             //可选范围默认值
-            ableAll:{
+            ableAll: {
             },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
             dataForm: {
-                                bucketCode : undefined,
-                                showName : undefined,
-                                    doorNum : undefined,
-                                    deviceCode : undefined,
-                                    isShow : "1",
-                                    showOrd : 0,
-                                    productCode : "542987705491919312",
-                                    productSubCode : undefined,
-                                price : undefined,
-                                fullStatus : undefined,
-                                fullSet : undefined,
-                                smogStatus : undefined,
-                                smogSet : undefined,
-                                containerWeight : undefined,
-                                currentWeight : undefined,
-                                warningWeight : undefined,
-                                closeDelay : undefined,
-                                deliveryDoorStatus : undefined,
-                                cleanDoorStatus : undefined,
-                                bagNo : undefined,
-                                    bucketImg : [],
-                                status : undefined,
-                                    tenantId : [],
+                bucketCode: undefined,
+                showName: undefined,
+                doorNum: undefined,
+                deviceCode: undefined,
+                isShow: "1",
+                showOrd: 0,
+                productCode: "542987705491919312",
+                productSubCode: undefined,
+                price: undefined,
+                fullStatus: undefined,
+                fullSet: undefined,
+                smogStatus: undefined,
+                smogSet: undefined,
+                containerWeight: undefined,
+                currentWeight: undefined,
+                warningWeight: undefined,
+                closeDelay: undefined,
+                deliveryDoorStatus: undefined,
+                cleanDoorStatus: undefined,
+                bagNo: undefined,
+                bucketImg: [],
+                status: undefined,
+                tenantId: [],
             },
             tableRequiredData: {},
             dataRule:
             {
-                            deviceCode: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
+                deviceCode: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
             },
-                            doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}],
-                            doorNumProps:{"label":"fullName","value":"id"  },
-                    deviceCodecolumnOptions:[ {"label":"设备编码","value":"device_code"}, {"label":"设备名称","value":"device_name"},],
-                            isShowOptions:[{"fullName":"关闭","id":"0"},{"fullName":"显示","id":"1"}],
-                            isShowProps:{"label":"fullName","value":"id"  },
-                    productCodeOptions:[],
-                            productCodeProps:{"label":"name","value":"id"  },
-                    productSubCodeOptions:[],
-                            productSubCodeProps:{"label":"name","value":"id"  },
-                            fullStatusOptions:[{"fullName":"未满","id":"0"},{"fullName":"满","id":"1"}],
-                            fullStatusProps:{"label":"fullName","value":"id"  },
-                            fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
-                            fullSetProps:{"label":"fullName","value":"id"  },
-                            smogStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"报警","id":"1"}],
-                            smogStatusProps:{"label":"fullName","value":"id"  },
-                            smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
-                            smogSetProps:{"label":"fullName","value":"id"  },
-                            deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
-                            deliveryDoorStatusProps:{"label":"fullName","value":"id"  },
-                            cleanDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
-                            cleanDoorStatusProps:{"label":"fullName","value":"id"  },
-                            statusOptions:[{"fullName":"停用","id":"0"},{"fullName":"启用","id":"1"}],
-                            statusProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        bucketCode:[] ,
-                        showName:[] ,
-                        doorNum:[] ,
-                        deviceCode:[] ,
-                        isShow:[] ,
-                        showOrd:[] ,
-                        productCode:[] ,
-                        productSubCode:[{"dataType":"varchar","defaultValue":"","field":"parent_id","fieldName":"","id":"ZBu5m72","jnpfKey":"radio","relationField":"productCode","required":"0"}] ,
-                        price:[] ,
-                        fullStatus:[] ,
-                        fullSet:[] ,
-                        smogStatus:[] ,
-                        smogSet:[] ,
-                        containerWeight:[] ,
-                        currentWeight:[] ,
-                        warningWeight:[] ,
-                        closeDelay:[] ,
-                        deliveryDoorStatus:[] ,
-                        cleanDoorStatus:[] ,
-                        bagNo:[] ,
-                        bucketImg:[] ,
-                        status:[] ,
-                        tenantId:[] ,
+            doorNumOptions: [{ "fullName": "1号", "id": "1" }, { "fullName": "2号", "id": "2" }, { "fullName": "3号", "id": "3" }, { "fullName": "4号", "id": "4" }, { "fullName": "5号", "id": "5" }, { "fullName": "6号", "id": "6" }, { "fullName": "7号", "id": "7" }, { "fullName": "8号", "id": "8" }, { "fullName": "9号", "id": "9" }, { "fullName": "10号", "id": "10" }, { "fullName": "11号", "id": "11" }, { "fullName": "12号", "id": "12" }],
+            doorNumProps: { "label": "fullName", "value": "id" },
+            deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" },],
+            isShowOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "显示", "id": "1" }],
+            isShowProps: { "label": "fullName", "value": "id" },
+            productCodeOptions: [],
+            productCodeProps: { "label": "name", "value": "id" },
+            productSubCodeOptions: [],
+            productSubCodeProps: { "label": "name", "value": "id" },
+            fullStatusOptions: [{ "fullName": "未满", "id": "0" }, { "fullName": "满", "id": "1" }],
+            fullStatusProps: { "label": "fullName", "value": "id" },
+            fullSetOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "开启", "id": "1" }],
+            fullSetProps: { "label": "fullName", "value": "id" },
+            smogStatusOptions: [{ "fullName": "正常", "id": "0" }, { "fullName": "报警", "id": "1" }],
+            smogStatusProps: { "label": "fullName", "value": "id" },
+            smogSetOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "开启", "id": "1" }],
+            smogSetProps: { "label": "fullName", "value": "id" },
+            deliveryDoorStatusOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "开启", "id": "1" }],
+            deliveryDoorStatusProps: { "label": "fullName", "value": "id" },
+            cleanDoorStatusOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "开启", "id": "1" }],
+            cleanDoorStatusProps: { "label": "fullName", "value": "id" },
+            statusOptions: [{ "fullName": "停用", "id": "0" }, { "fullName": "启用", "id": "1" }],
+            statusProps: { "label": "fullName", "value": "id" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                bucketCode: [],
+                showName: [],
+                doorNum: [],
+                deviceCode: [],
+                isShow: [],
+                showOrd: [],
+                productCode: [],
+                productSubCode: [{ "dataType": "varchar", "defaultValue": "", "field": "parent_id", "fieldName": "", "id": "ZBu5m72", "jnpfKey": "radio", "relationField": "productCode", "required": "0" }],
+                price: [],
+                fullStatus: [],
+                fullSet: [],
+                smogStatus: [],
+                smogSet: [],
+                containerWeight: [],
+                currentWeight: [],
+                warningWeight: [],
+                closeDelay: [],
+                deliveryDoorStatus: [],
+                cleanDoorStatus: [],
+                bagNo: [],
+                bucketImg: [],
+                status: [],
+                tenantId: [],
             },
         }
+    },
+    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'])
+        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)
+                }
+            }
         },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        getInfo(id) {
+            request({
+                url: '/api/scm/RecycleBucket/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
         },
-        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)
+        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)
+                        }
                     }
                 }
-            },
-            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)
+            }
+        },
+        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
                 }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/RecycleBucket/'+ 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)
-                            }
-                        }
+            }
+        },
+        dataAll() {
+            this.getproductCodeOptions();
+            this.getproductSubCodeOptions();
+        },
+        getproductCodeOptions() {
+            const index = this.childIndex
+            let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productCode))
+            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
                 }
-            },
-            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
-                            }
-                        }
+            }
+            let template = {
+                paramList: templateJsonList
+            }
+            getDataInterfaceRes('565507078836203205', template).then(res => {
+                let data = res.data
+                this.productCodeOptions = data
+                this.changeDataFormData(1, 'productCode', 'productCode', index, '542987705491919312')
+            })
+        },
+        getproductSubCodeOptions() {
+            const index = this.childIndex
+            let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productSubCode))
+            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 {
-                        this.dataForm[data] = defaultValue
+                        val = this.dataForm[relationFieldAll]
                     }
+                    json.defaultValue = val
                 }
-            },
-            dataAll(){
-                        this.getproductCodeOptions();
-                        this.getproductSubCodeOptions();
-            },
-                    getproductCodeOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productCode))
-                    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]
+            }
+            let template = {
+                paramList: templateJsonList
+            }
+            getDataInterfaceRes('565508644465028805', template).then(res => {
+                let data = res.data
+                this.productSubCodeOptions = data
+                this.changeDataFormData(1, 'productSubCode', 'productSubCode', 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/RecycleBucket/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        if (res.data.price == null) {
+                            this.priceDesc = res.data.priceDesc
+                            this.useUnifiedConfig = true
+                        }
+                        if (res.data.fullSet == '-1') {
+                            if (res.data.fullSetDesc == 0) {
+                                this.fullSetDesc = '关闭'
+                            } else {
+                                this.fullSetDesc = '开启'
                             }
-                            json.defaultValue = val
+                            this.usefullSetConfig = true
                         }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('565507078836203205',template).then(res => {
-                        let data = res.data
-                        this.productCodeOptions = data
-                        this.changeDataFormData(1,'productCode','productCode',index,'542987705491919312')
-                    })
-                },
-                    getproductSubCodeOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productSubCode))
-                    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]
+                        if (res.data.smogSet == '-1') {
+                            if (res.data.smogSetDesc == 0) {
+                                this.smogSetDesc = '关闭'
+                            } else {
+                                this.smogSetDesc = '开启'
                             }
-                            json.defaultValue = val
+                            this.useSmogSetConfig = true
                         }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('565508644465028805',template).then(res => {
-                        let data = res.data
-                        this.productSubCodeOptions = data
-                        this.changeDataFormData(1,'productSubCode','productSubCode',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
-                    }
+                        if (res.data.closeDelay == '-1') {
+                            this.closeDelayDesc = res.data.closeDelayDesc
+                            this.closeDelayConfig = true
+                            res.data.closeDelay = null
+                        }
+                        if (res.data.warningWeight == null) {
+                            this.warningWeightDesc = res.data.warningWeightDesc
+                            this.warningWeightConfig = true
+                        }
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
                 } else {
-                    this.prevDis = true
-                    this.nextDis = true
+                    this.clearData()
+                    this.initDefaultData()
                 }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleBucket/'+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
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+        },
+        //初始化默认数据
+        initDefaultData() {
+        },
+        // 表单提交
+        dataFormSubmit(type) {
+            if (this.useUnifiedConfig) {
+                this.dataForm.price = null;
+            }
+            if (this.usefullSetConfig) {
+                this.dataForm.fullSet = '-1';
+            }
+            if (this.useSmogSetConfig) {
+                this.dataForm.smogSet = '-1';
+            }
+            if (this.closeDelayConfig) {
+                this.dataForm.closeDelay = '-1';
+            }
+            if (this.warningWeightConfig) {
+                this.dataForm.warningWeight = null;
+            }
+            this.dataFormSubmitType = type ? type : 0
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    this.request()
                 }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/RecycleBucket',
-                        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)
+            })
+        },
+        request() {
+            let _data = this.dataList()
+            if (this.dataFormSubmitType == 2) {
+                this.continueBtnLoading = true
+            } else {
+                this.btnLoading = true
+            }
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/scm/RecycleBucket',
+                    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
                             }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }else{
-                    request({
-                        url: '/api/scm/RecycleBucket/'+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
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/scm/RecycleBucket/' + 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)
+                        }
                     })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
+            }
+        },
+        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()
-                        }
+            }
+        },
+        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;
+        },
+        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
-            },
+            }
+            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>