diff --git a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/recyclecleanorder/Detail.vue
deleted file mode 100644
index d481058..0000000
--- a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/Detail.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
-        <div class="options">
-            <el-button @click="goBack">取 消</el-button>
-        </div>
-    </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="formRef" :model="dataForm" size="small" label-width="120px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="设备编码"  
- prop="deviceCode"  >
-                        <p>{{dataForm.deviceCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="桶编码"  
- prop="bucketCode"  >
-                        <p>{{dataForm.bucketCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="门号"  
- prop="doorNum"  >
-                        <p>{{dataForm.doorNum}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="回收品大类"  
- prop="productCode"  >
-                        <p>{{dataForm.productCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="回收品子类"  
- prop="productSubCode"  >
-                        <p>{{dataForm.productSubCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="机柜清运单号"  
- prop="deviceOrderNo"  >
-                        <p>{{dataForm.deviceOrderNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="单价"  
- prop="price"  >
-                    <JnpfNumber    v-model="dataForm.price"
- placeholder="数字文本"  disabled
- :step="1"  :precision="2"  >
-                </JnpfNumber>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运重量"  
- prop="weight"  >
-                    <JnpfNumber    v-model="dataForm.weight"
- placeholder="数字文本"  disabled
- :step="1"  :precision="2"  >
-                </JnpfNumber>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="总价"  
- prop="totalPrice"  >
-                    <JnpfNumber    v-model="dataForm.totalPrice"
- placeholder="数字文本"  disabled
- :step="1"  :precision="2"  >
-                </JnpfNumber>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核后重量"  
- prop="adjustWeight"  >
-                    <JnpfNumber    v-model="dataForm.adjustWeight"
- placeholder="数字文本"  disabled
- :step="1"  :precision="2"  >
-                </JnpfNumber>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核后总价"  
- prop="adjustPrice"  >
-                    <JnpfNumber    v-model="dataForm.adjustPrice"
- placeholder="数字文本"  disabled
- :step="1"  :precision="2"  >
-                </JnpfNumber>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运员"  
- prop="cleanUserId"  >
-                        <p>{{dataForm.cleanUserId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运员手机号"  
- prop="phone"  >
-                        <p>{{dataForm.phone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="登录方式"  
- prop="loginType"  >
-                         <p>{{ dataForm.loginType }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="开始时间"  
- prop="startTime"  >
-                        <p>{{dataForm.startTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="完成时间"  
- prop="finishTime"  >
-                        <p>{{dataForm.finishTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="上报时间"  
- prop="reportTime"  >
-                        <p>{{dataForm.reportTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核状态"  
- prop="adjustStatus"  >
-                         <p>{{ dataForm.adjustStatus }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="入库状态"  
- prop="entryStatus"  >
-                         <p>{{ dataForm.entryStatus }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核说明"  
- prop="adjustComm"  >
-                        <p>{{dataForm.adjustComm}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="抓拍图片"  
- prop="photo"  >
-                    <JnpfUploadImg    v-model="dataForm.photo"
- disabled
- detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
-                </JnpfUploadImg>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="垃圾袋号"  
- prop="bagNo"  >
-                        <p>{{dataForm.bagNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="租户id"  
- prop="tenantId"  >
-                        <p>{{dataForm.tenantId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    </div>
-</transition>
-</template>
-<script>
-    import request from '@/utils/request'
-
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
-
-            dataForm: {
-                id :'',
-                            orderNo : '',
-                            deviceCode : "",
-                            bucketCode : '',
-                            doorNum : '',
-                            productCode : "",
-                            productSubCode : "",
-                            deviceOrderNo : '',
-                            price : '',
-                            weight : '',
-                            totalPrice : '',
-                            adjustWeight : '',
-                            adjustPrice : '',
-                            cleanUserId : "",
-                            phone : '',
-                            loginType : '',
-                            startTime : '',
-                            finishTime : '',
-                            reportTime : '',
-                            adjustStatus : '',
-                            entryStatus : '',
-                            adjustComm : '',
-                            photo : [],
-                            bagNo : '',
-                            tenantId : [],
-            },
-                        productCodeProps:{"label":"name","value":"id"  },
-                        productSubCodeProps:{"label":"name","value":"id"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                        loginTypeProps:{"label":"fullName","value":"id"  },
-                            adjustStatusOptions:[{"fullName":"未审核","id":"0"},{"fullName":"已审核","id":"1"}],
-                        adjustStatusProps:{"label":"fullName","value":"id"  },
-                            entryStatusOptions:[{"fullName":"未入库","id":"0"},{"fullName":"已入库","id":"1"}],
-                        entryStatusProps:{"label":"fullName","value":"id"  },
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-
-        },
-        mounted() {},
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleCleanOrder/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
-
-                })
-            },
-        },
-    }
-
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/columnList.js b/jnpf-java-boot/jnpf-web/src/recyclecleanorder/columnList.js
deleted file mode 100644
index fa067ec..0000000
--- a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/columnList.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const columnList = [{"jnpfKey":"billRule","fullName":"清运单号","label":"清运单号","sortable":false,"align":"left","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":true,"tipLabel":"","dragDisabled":false,"rule":"cleanOrderNo","className":[],"label":"清运单号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716774328238,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"清运单编号","tag":"JnpfInput","span":8},"readonly":true,"prop":"orderNo","width":0,"__vModel__":"orderNo","fixed":"none","style":{"width":"100%"},"id":"orderNo","placeholder":"系统自动生成"},{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[{"label":"设备编码","value":"device_code"},{"label":"设备名称","value":"device_name"}],"align":"left","templateJson":[],"__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"设备编码","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716774935877,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"prop":"deviceCode","__vModel__":"deviceCode","disabled":false,"id":"deviceCode","placeholder":"请选择","interfaceName":"清运清单-设备列表","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"设备编码","label":"设备编码","sortable":false,"relationField":"device_name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"564713894723988869","propsValue":"device_code"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"桶编码","label":"桶编码","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"桶编码","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972299260,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"bucketCode","showWordLimit":false,"width":0,"__vModel__":"bucketCode","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"bucketCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"门号","label":"门号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"门号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972304743,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"doorNum","showWordLimit":false,"width":0,"__vModel__":"doorNum","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"doorNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"回收品大类","label":"回收品大类","sortable":false,"align":"left","props":{"label":"name","value":"id"},"optionType":"default","__config__":{"formId":111,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品大类","trigger":"change","propsUrl":"565507078836203205","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972425337,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"回收品大类","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"productCode","width":0,"options":[{"code":"SPHS2024032800008","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废玻璃.png\",\"url\":\"/upload/image/8babd5719611f4d13cc2f93433f3c443.png\",\"fileId\":\"废玻璃.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:13","spec":"","unit":"","f_version":0,"name":"废玻璃类","id":"542987705491919312","f_last_modify_time":"2024-03-28 13:10:13","f_creator_time":"2024-03-28 13:10:13"},{"code":"SPHS2024032800007","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废金属.png\",\"url\":\"/upload/image/f6d87823b66392d60688d822479cfdc6.png\",\"fileId\":\"废金属.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:07","spec":"","unit":"","f_version":0,"name":"废金属类","id":"542988020232491471","f_last_modify_time":"2024-03-28 13:10:07","f_creator_time":"2024-03-28 13:10:07"},{"code":"SPHS2024032800006","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废塑料.png\",\"url\":\"/upload/image/20481ca1fc66ce54c83ef71f340049f1.png\",\"fileId\":\"废塑料.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:03","spec":"","unit":"","f_version":0,"name":"废塑料类","id":"542988185538400719","f_last_modify_time":"2024-03-28 13:10:03","f_creator_time":"2024-03-28 13:10:03"},{"code":"SPHS2024032800002","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废纸.png\",\"url\":\"/upload/image/4a1a4638bf587b81920dafa8acd9651f.png\",\"fileId\":\"废纸.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:57","spec":"","unit":"","f_version":0,"name":"废纸类","id":"542988391038322166","f_last_modify_time":"2024-03-28 13:09:57","f_creator_time":"2024-03-28 13:09:57"},{"code":"SPHS2024032800003","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"家用电器.png\",\"url\":\"/upload/image/182383619a96ba250756475266d630db.png\",\"fileId\":\"家用电器.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:36","spec":"","unit":"","f_version":0,"name":"家用电器类","id":"542988676150333899","f_last_modify_time":"2024-03-28 13:09:36","f_creator_time":"2024-03-28 13:09:36"},{"code":"SPHS2024040100001","company_id":"","department_id":"","f_creator_user_id":"543048783781434181","f_last_modify_user_id":"543048783781434181","photo":"[{\"name\":\"旧衣服.png\",\"url\":\"/upload/image/e81bc16028c208cc0f52b8a1a3160c4a.png\",\"fileId\":\"旧衣服.png\"}]","f_delete_user_id":"543048783781434181","f_delete_time":"2024-04-01 10:50:25","spec":"","unit":"","f_version":0,"name":"旧衣服类","id":"542988728520413647","f_last_modify_time":"2024-04-01 10:50:25","f_creator_time":"2024-04-01 10:50:25"},{"code":"SPHS2024032800004","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"有害垃圾.png\",\"url\":\"/upload/image/28029537c47967a6d5c85974515a5034.png\",\"fileId\":\"有害垃圾.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:22","spec":"","unit":"","f_version":0,"name":"有害垃圾类","id":"542988786368254415","f_last_modify_time":"2024-03-28 13:09:22","f_creator_time":"2024-03-28 13:09:22"},{"code":"SPHS2024032800009","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"其他.png\",\"url\":\"/upload/image/f0dbf15312230df9d1064955cef5b2f5.png\",\"fileId\":\"其他.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:12","spec":"","unit":"","f_version":0,"name":"其他类","id":"542988830311977413","f_last_modify_time":"2024-03-28 13:09:12","f_creator_time":"2024-03-28 13:09:12"}],"__vModel__":"productCode","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"productCode","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"border":false,"jnpfKey":"radio","fullName":"回收品子类","label":"回收品子类","sortable":false,"align":"left","props":{"label":"name","value":"id"},"optionType":"default","__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品子类","trigger":"change","propsUrl":"565508644465028805","templateJson":[{"fieldName":"","field":"parent_id","defaultValue":"","jnpfKey":"radio","dataType":"varchar","parameter":"parent_id","id":"ZBu5m72","required":0,"relationField":"productCode"}],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972447238,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"回收品大类含小类","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"productSubCode","width":0,"options":[],"__vModel__":"productSubCode","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"productSubCode","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"机柜清运单号","label":"机柜清运单号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"机柜清运单号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972498576,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"deviceOrderNo","showWordLimit":false,"width":0,"__vModel__":"deviceOrderNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"deviceOrderNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","precision":2,"fullName":"单价","label":"单价","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"单价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972702637,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"prop":"price","width":0,"__vModel__":"price","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"price","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","precision":2,"fullName":"清运重量","label":"清运重量","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运重量","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972739172,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"prop":"weight","width":0,"__vModel__":"weight","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"weight","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","precision":2,"fullName":"总价","label":"总价","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":116,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"总价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972764649,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"prop":"totalPrice","width":0,"__vModel__":"totalPrice","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"totalPrice","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","precision":2,"fullName":"审核后重量","label":"审核后重量","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":117,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核后重量","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972815065,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"prop":"adjustWeight","width":0,"__vModel__":"adjustWeight","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"adjustWeight","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","precision":2,"fullName":"审核后总价","label":"审核后总价","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":119,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核后总价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972834082,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"prop":"adjustPrice","width":0,"__vModel__":"adjustPrice","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"adjustPrice","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"userSelect","ableIds":[],"multiple":false,"fullName":"清运员","label":"清运员","sortable":false,"align":"left","relationField":"","__config__":{"formId":120,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运员","trigger":"change","showLabel":true,"required":false,"relationField":"","tableName":"nx_recycle_clean_order","renderKey":1716972965523,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":8},"prop":"cleanUserId","width":0,"__vModel__":"cleanUserId","fixed":"none","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"cleanUserId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"清运员手机号","label":"清运员手机号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":121,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运员手机号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973013904,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"phone","showWordLimit":false,"width":0,"__vModel__":"phone","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"phone","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"入库状态","label":"入库状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":122,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"入库状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973047304,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"entryStatus","width":0,"options":[{"fullName":"未入库","id":"0"},{"fullName":"已入库","id":"1"}],"__vModel__":"entryStatus","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"entryStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"垃圾袋号","label":"垃圾袋号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":123,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"垃圾袋号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973131543,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"bagNo","showWordLimit":false,"width":0,"__vModel__":"bagNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"bagNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"审核状态","label":"审核状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"审核状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973170332,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"adjustStatus","width":0,"options":[{"fullName":"未审核","id":"0"},{"fullName":"已审核","id":"1"}],"__vModel__":"adjustStatus","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"adjustStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"审核说明","label":"审核说明","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核说明","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973251999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"adjustComm","showWordLimit":false,"width":0,"__vModel__":"adjustComm","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"adjustComm","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"organizeSelect","ableIds":[],"multiple":false,"fullName":"租户id","label":"租户id","sortable":false,"align":"left","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"organizeSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"租户id","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973295105,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","defaultCurrent":false,"tag":"JnpfOrganizeSelect","regList":[],"span":8},"prop":"tenantId","width":0,"__vModel__":"tenantId","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"tenantId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"登录方式","label":"登录方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":133,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"登录方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711250383,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"loginType","width":0,"options":[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],"__vModel__":"loginType","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"loginType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":false,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"开始时间","label":"开始时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":132,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"开始时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711207239,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"startTime","showWordLimit":false,"width":0,"__vModel__":"startTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"startTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"完成时间","label":"完成时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":130,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"完成时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711183844,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"finishTime","showWordLimit":false,"width":0,"__vModel__":"finishTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"finishTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"上报时间","label":"上报时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"上报时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711183011,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"reportTime","showWordLimit":false,"width":0,"__vModel__":"reportTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"reportTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
-export default columnList
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/form.vue b/jnpf-java-boot/jnpf-web/src/recyclecleanorder/form.vue
deleted file mode 100644
index 2a10349..0000000
--- a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/form.vue
+++ /dev/null
@@ -1,688 +0,0 @@
-
-
-
-    <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
-                </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <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="bucketCode" >
-        <JnpfInput   v-model="dataForm.bucketCode" @change="changeData('bucketCode',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="门号"   prop="doorNum" >
-        <JnpfInput   v-model="dataForm.doorNum" @change="changeData('doorNum',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </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="deviceOrderNo" >
-        <JnpfInput   v-model="dataForm.deviceOrderNo" @change="changeData('deviceOrderNo',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </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="weight" >
-        <JnpfInputNumber   v-model="dataForm.weight" @change="changeData('weight',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="总价"   prop="totalPrice" >
-        <JnpfInputNumber   v-model="dataForm.totalPrice" @change="changeData('totalPrice',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核后重量"   prop="adjustWeight" >
-        <JnpfInputNumber   v-model="dataForm.adjustWeight" @change="changeData('adjustWeight',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核后总价"   prop="adjustPrice" >
-        <JnpfInputNumber   v-model="dataForm.adjustPrice" @change="changeData('adjustPrice',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运员"   prop="cleanUserId" >
-        <JnpfUserSelect   v-model="dataForm.cleanUserId" @change="changeData('cleanUserId',-1)" 
- placeholder="请选择"  selectType="all"  :ableIds="ableAll.cleanUserIdableIds"  clearable  :style='{"width":"100%"}'>
-    </JnpfUserSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运员手机号"   prop="phone" >
-        <JnpfInput   v-model="dataForm.phone" @change="changeData('phone',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="登录方式"   prop="loginType" >
-        <JnpfRadio   v-model="dataForm.loginType" @change="changeData('loginType',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="loginTypeOptions" :props="loginTypeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="开始时间"   prop="startTime" >
-        <JnpfInput   v-model="dataForm.startTime" @change="changeData('startTime',-1)" 
- placeholder="请输入"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="完成时间"   prop="finishTime" >
-        <JnpfInput   v-model="dataForm.finishTime" @change="changeData('finishTime',-1)" 
- placeholder="请输入"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="上报时间"   prop="reportTime" >
-        <JnpfInput   v-model="dataForm.reportTime" @change="changeData('reportTime',-1)" 
- placeholder="请输入"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核状态"   prop="adjustStatus" >
-        <JnpfRadio   v-model="dataForm.adjustStatus" @change="changeData('adjustStatus',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="adjustStatusOptions" :props="adjustStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="入库状态"   prop="entryStatus" >
-        <JnpfRadio   v-model="dataForm.entryStatus" @change="changeData('entryStatus',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="entryStatusOptions" :props="entryStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核说明"   prop="adjustComm" >
-        <JnpfInput   v-model="dataForm.adjustComm" @change="changeData('adjustComm',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="抓拍图片"   prop="photo" >
-        <JnpfUploadImg   v-model="dataForm.photo" @change="changeData('photo',-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="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="8" >
-        <jnpf-form-tip-item
- label="租户id"   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>
-
-
-<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: {
-                                orderNo : undefined,
-                                    deviceCode : undefined,
-                                bucketCode : undefined,
-                                doorNum : undefined,
-                                    productCode : undefined,
-                                    productSubCode : undefined,
-                                deviceOrderNo : undefined,
-                                price : undefined,
-                                weight : undefined,
-                                totalPrice : undefined,
-                                adjustWeight : undefined,
-                                adjustPrice : undefined,
-                                    cleanUserId : undefined,
-                                phone : undefined,
-                                loginType : undefined,
-                                startTime : undefined,
-                                finishTime : undefined,
-                                reportTime : undefined,
-                                adjustStatus : undefined,
-                                entryStatus : undefined,
-                                adjustComm : undefined,
-                                    photo : [],
-                                bagNo : undefined,
-                                    tenantId : [],
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-            },
-                    deviceCodecolumnOptions:[ {"label":"设备编码","value":"device_code"}, {"label":"设备名称","value":"device_name"},],
-                    productCodeOptions:[],
-                            productCodeProps:{"label":"name","value":"id"  },
-                    productSubCodeOptions:[],
-                            productSubCodeProps:{"label":"name","value":"id"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                            loginTypeProps:{"label":"fullName","value":"id"  },
-                            adjustStatusOptions:[{"fullName":"未审核","id":"0"},{"fullName":"已审核","id":"1"}],
-                            adjustStatusProps:{"label":"fullName","value":"id"  },
-                            entryStatusOptions:[{"fullName":"未入库","id":"0"},{"fullName":"已入库","id":"1"}],
-                            entryStatusProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        orderNo:[] ,
-                        deviceCode:[] ,
-                        bucketCode:[] ,
-                        doorNum:[] ,
-                        productCode:[] ,
-                        productSubCode:[{"dataType":"varchar","defaultValue":"","field":"parent_id","fieldName":"","id":"ZBu5m72","jnpfKey":"radio","relationField":"productCode","required":"0"}] ,
-                        deviceOrderNo:[] ,
-                        price:[] ,
-                        weight:[] ,
-                        totalPrice:[] ,
-                        adjustWeight:[] ,
-                        adjustPrice:[] ,
-                        cleanUserId:[] ,
-                        phone:[] ,
-                        loginType:[] ,
-                        startTime:[] ,
-                        finishTime:[] ,
-                        reportTime:[] ,
-                        adjustStatus:[] ,
-                        entryStatus:[] ,
-                        adjustComm:[] ,
-                        photo:[] ,
-                        bagNo:[] ,
-                        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)
-                    }
-                }
-            },
-            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/RecycleCleanOrder/'+ 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.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
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('565507078836203205',template).then(res => {
-                        let data = res.data
-                        this.productCodeOptions = data
-                        this.changeDataFormData(1,'productCode','productCode',index,'')
-                    })
-                },
-                    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]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    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/RecycleCleanOrder/'+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/RecycleCleanOrder',
-                        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/RecycleCleanOrder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
-                })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
-
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/index.vue b/jnpf-java-boot/jnpf-web/src/recyclecleanorder/index.vue
deleted file mode 100644
index fdaa249..0000000
--- a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/index.vue
+++ /dev/null
@@ -1,583 +0,0 @@
-
-
-
-
-
-
-
-<template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="清运单号">
-                                        <el-input v-model="query.orderNo" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="桶编码">
-                                        <el-input v-model="query.bucketCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="orderNo"
- label="清运单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceCode"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="bucketCode"
- label="桶编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="doorNum"
- label="门号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productCode"
- label="回收品大类"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productSubCode"
- label="回收品子类"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceOrderNo"
- label="机柜清运单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="price"
- label="单价"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.price" >
-                                                            <JnpfNumber v-model="scope.row.price" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="weight"
- label="清运重量"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.weight" >
-                                                            <JnpfNumber v-model="scope.row.weight" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="totalPrice"
- label="总价"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.totalPrice" >
-                                                            <JnpfNumber v-model="scope.row.totalPrice" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustWeight"
- label="审核后重量"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.adjustWeight" >
-                                                            <JnpfNumber v-model="scope.row.adjustWeight" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustPrice"
- label="审核后总价"  align="left"
- >
-                                                        <template slot-scope="scope"   v-if="scope.row.adjustPrice" >
-                                                            <JnpfNumber v-model="scope.row.adjustPrice" :thousands="false"/>
-                                                        </template>
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="cleanUserId"
- label="清运员"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="phone"
- label="清运员手机号"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="入库状态"  prop="entryStatus" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.entryStatus}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="bagNo"
- label="垃圾袋号"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="审核状态"  prop="adjustStatus" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.adjustStatus}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustComm"
- label="审核说明"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="tenantId"
- label="租户id"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="登录方式"  prop="loginType" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.loginType}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="startTime"
- label="开始时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="finishTime"
- label="完成时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="reportTime"
- label="上报时间"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)"  v-has="'btn_edit'" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"   v-has="'btn_detail'" 
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-
-
-
-
-        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
-    </div>
-</template>
-
-<script>
-
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
-
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
-
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
-
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        orderNo:undefined,
-                        bucketCode:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                productCodeOptions:[],
-                        productCodeProps:{"label":"name","value":"id"  },
-                            productSubCodeOptions:[],
-                        productSubCodeProps:{"label":"name","value":"id"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                        loginTypeProps:{"label":"fullName","value":"id"  },
-                            adjustStatusOptions:[{"fullName":"未审核","id":"0"},{"fullName":"已审核","id":"1"}],
-                        adjustStatusProps:{"label":"fullName","value":"id"  },
-                            entryStatusOptions:[{"fullName":"未入库","id":"0"},{"fullName":"已入库","id":"1"}],
-                        entryStatusProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                        deviceCode:[] ,
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-            this.queryData = JSON.parse(JSON.stringify(this.query))
-        },
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.toFormDetailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            toggleTreeExpand(expands) {
-                this.refreshTree = false
-                this.expandsTree = expands
-                this.$nextTick(() => {
-                    this.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
-                })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } else {
-                            resolve([]);
-                        }
-                    })
-                }
-            },
-                        getColumnList() {
-                    // 没有开启权限
-                    this.columnOptions = this.transformColumnList(this.columnList)
-            },
-            transformColumnList(columnList) {
-                let list = []
-                for (let i = 0; i < columnList.length; i++) {
-                    const e = columnList[i];
-                    if (!e.prop.includes('-')) {
-                        list.push(e)
-                    } else {
-                        let prop = e.prop.split('-')[0]
-                        let label = e.label.split('-')[0]
-                        let vModel = e.prop.split('-')[1]
-                        let newItem = {
-                            align: "center",
-                            jnpfKey: "table",
-                            prop,
-                            label,
-                            children: []
-                        }
-                        e.vModel = vModel
-                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-                        if (!list.some(o => o.prop === prop)) list.push(newItem)
-                        for (let i = 0; i < list.length; i++) {
-                            if (list[i].prop === prop) {
-                                list[i].children.push(e)
-                                break
-                            }
-                        }
-                    }
-                }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            arraySpanMethod({ column }) {
-                for (let i = 0; i < this.mergeList.length; i++) {
-                    if (column.property == this.mergeList[i].prop) {
-                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-                    }
-                }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        let child = {
-                            prop: item.prop + '-child-first'
-                        }
-                        item.children.unshift(child)
-                    }
-                })
-                newList.forEach(item => {
-                    if (item.children && item.children.length ) {
-                        item.children.forEach((child, index) => {
-                            if (index == 0) {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 1,
-                                    colspan: item.children.length
-                                })
-                            } else {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 0,
-                                    colspan: 0
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            async initSearchDataAndListData() {
-                await this.initSearchData()
-                this.initData()
-            },
-            //初始化查询的默认数据
-            async initSearchData() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'564710229816651141',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/RecycleCleanOrder/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =res.data.list;
-                                            this.list = _list.map(o => ({
-                            ...o,
-                            ...this.expandObj,
-                        }))
-                            this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/scm/RecycleCleanOrder/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/RecycleCleanOrder")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
-                    })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.exportList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/scm/RecycleCleanOrder/Actions/Export`,
-                    method: 'post',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx=""
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                this.query = JSON.parse(JSON.stringify(this.queryData))
-                this.search()
-            },
-            colseFlow(isrRefresh) {
-                this.flowVisible = false
-                if (isrRefresh) this.reset()
-            },
-        }
-    }
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/recyclecleanorder/superQueryJson.js
deleted file mode 100644
index 3e9e55d..0000000
--- a/jnpf-java-boot/jnpf-web/src/recyclecleanorder/superQueryJson.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const superQueryJson = [{"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":true,"tipLabel":"","dragDisabled":false,"rule":"cleanOrderNo","className":[],"label":"清运单号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716774328238,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"清运单编号","tag":"JnpfInput","span":8},"readonly":true,"__vModel__":"orderNo","fullName":"清运单号","style":{"width":"100%"},"id":"orderNo","placeholder":"系统自动生成"},{"popupType":"dialog","hasPage":false,"clearable":true,"fullName":"设备编码","pageSize":20,"columnOptions":[{"label":"设备编码","value":"device_code"},{"label":"设备名称","value":"device_name"}],"templateJson":[],"relationField":"device_name","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"设备编码","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716774935877,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"popupTitle":"选择数据","__vModel__":"deviceCode","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"deviceCode","placeholder":"请选择","interfaceId":"564713894723988869","interfaceName":"清运清单-设备列表","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"propsValue":"device_code"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"桶编码","addonAfter":"","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"桶编码","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972299260,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"bucketCode","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"bucketCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"门号","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"门号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972304743,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"doorNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"doorNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"fullName":"回收品大类","props":{"label":"name","value":"id"},"optionType":"default","__config__":{"formId":111,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品大类","trigger":"change","propsUrl":"565507078836203205","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972425337,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"回收品大类","tag":"JnpfRadio","regList":[],"span":24},"size":"small","options":[{"code":"SPHS2024032800008","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废玻璃.png\",\"url\":\"/upload/image/8babd5719611f4d13cc2f93433f3c443.png\",\"fileId\":\"废玻璃.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:13","spec":"","unit":"","f_version":0,"name":"废玻璃类","id":"542987705491919312","f_last_modify_time":"2024-03-28 13:10:13","f_creator_time":"2024-03-28 13:10:13"},{"code":"SPHS2024032800007","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废金属.png\",\"url\":\"/upload/image/f6d87823b66392d60688d822479cfdc6.png\",\"fileId\":\"废金属.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:07","spec":"","unit":"","f_version":0,"name":"废金属类","id":"542988020232491471","f_last_modify_time":"2024-03-28 13:10:07","f_creator_time":"2024-03-28 13:10:07"},{"code":"SPHS2024032800006","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废塑料.png\",\"url\":\"/upload/image/20481ca1fc66ce54c83ef71f340049f1.png\",\"fileId\":\"废塑料.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:03","spec":"","unit":"","f_version":0,"name":"废塑料类","id":"542988185538400719","f_last_modify_time":"2024-03-28 13:10:03","f_creator_time":"2024-03-28 13:10:03"},{"code":"SPHS2024032800002","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废纸.png\",\"url\":\"/upload/image/4a1a4638bf587b81920dafa8acd9651f.png\",\"fileId\":\"废纸.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:57","spec":"","unit":"","f_version":0,"name":"废纸类","id":"542988391038322166","f_last_modify_time":"2024-03-28 13:09:57","f_creator_time":"2024-03-28 13:09:57"},{"code":"SPHS2024032800003","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"家用电器.png\",\"url\":\"/upload/image/182383619a96ba250756475266d630db.png\",\"fileId\":\"家用电器.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:36","spec":"","unit":"","f_version":0,"name":"家用电器类","id":"542988676150333899","f_last_modify_time":"2024-03-28 13:09:36","f_creator_time":"2024-03-28 13:09:36"},{"code":"SPHS2024040100001","company_id":"","department_id":"","f_creator_user_id":"543048783781434181","f_last_modify_user_id":"543048783781434181","photo":"[{\"name\":\"旧衣服.png\",\"url\":\"/upload/image/e81bc16028c208cc0f52b8a1a3160c4a.png\",\"fileId\":\"旧衣服.png\"}]","f_delete_user_id":"543048783781434181","f_delete_time":"2024-04-01 10:50:25","spec":"","unit":"","f_version":0,"name":"旧衣服类","id":"542988728520413647","f_last_modify_time":"2024-04-01 10:50:25","f_creator_time":"2024-04-01 10:50:25"},{"code":"SPHS2024032800004","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"有害垃圾.png\",\"url\":\"/upload/image/28029537c47967a6d5c85974515a5034.png\",\"fileId\":\"有害垃圾.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:22","spec":"","unit":"","f_version":0,"name":"有害垃圾类","id":"542988786368254415","f_last_modify_time":"2024-03-28 13:09:22","f_creator_time":"2024-03-28 13:09:22"},{"code":"SPHS2024032800009","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"其他.png\",\"url\":\"/upload/image/f0dbf15312230df9d1064955cef5b2f5.png\",\"fileId\":\"其他.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:12","spec":"","unit":"","f_version":0,"name":"其他类","id":"542988830311977413","f_last_modify_time":"2024-03-28 13:09:12","f_creator_time":"2024-03-28 13:09:12"}],"__vModel__":"productCode","style":{},"disabled":false,"interfaceHasPage":false,"id":"productCode","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"border":false,"fullName":"回收品子类","props":{"label":"name","value":"id"},"optionType":"default","__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品子类","trigger":"change","propsUrl":"565508644465028805","templateJson":[{"fieldName":"","field":"parent_id","defaultValue":"","jnpfKey":"radio","dataType":"varchar","parameter":"parent_id","id":"ZBu5m72","required":0,"relationField":"productCode"}],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972447238,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"回收品大类含小类","tag":"JnpfRadio","regList":[],"span":24},"size":"small","options":[],"__vModel__":"productSubCode","style":{},"disabled":false,"interfaceHasPage":false,"id":"productSubCode","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"机柜清运单号","addonAfter":"","__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"机柜清运单号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972498576,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"deviceOrderNo","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"deviceOrderNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"precision":2,"fullName":"单价","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":114,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"单价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972702637,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"price","style":{"width":null},"step":1,"disabled":false,"id":"price","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"precision":2,"fullName":"清运重量","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运重量","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972739172,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"weight","style":{"width":null},"step":1,"disabled":false,"id":"weight","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"precision":2,"fullName":"总价","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":116,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"总价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972764649,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"totalPrice","style":{"width":null},"step":1,"disabled":false,"id":"totalPrice","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"precision":2,"fullName":"审核后重量","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":117,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核后重量","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972815065,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"adjustWeight","style":{"width":null},"step":1,"disabled":false,"id":"adjustWeight","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"precision":2,"fullName":"审核后总价","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":119,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核后总价","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716972834082,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":8},"__vModel__":"adjustPrice","style":{"width":null},"step":1,"disabled":false,"id":"adjustPrice","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"清运员","relationField":"","__config__":{"formId":120,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运员","trigger":"change","showLabel":true,"required":false,"relationField":"","tableName":"nx_recycle_clean_order","renderKey":1716972965523,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":8},"__vModel__":"cleanUserId","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"cleanUserId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"清运员手机号","addonAfter":"","__config__":{"formId":121,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运员手机号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973013904,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"phone","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"phone","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"fullName":"登录方式","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":133,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"登录方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711250383,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","options":[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],"__vModel__":"loginType","style":{},"disabled":false,"interfaceHasPage":false,"id":"loginType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":false,"maxlength":null,"suffixIcon":"","fullName":"开始时间","addonAfter":"","__config__":{"formId":132,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"开始时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711207239,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"showWordLimit":false,"__vModel__":"startTime","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"startTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"suffixIcon":"","fullName":"完成时间","addonAfter":"","__config__":{"formId":130,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"完成时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711183844,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"showWordLimit":false,"__vModel__":"finishTime","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"finishTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"suffixIcon":"","fullName":"上报时间","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"上报时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1718711183011,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"showWordLimit":false,"__vModel__":"reportTime","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"reportTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"fullName":"审核状态","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"审核状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973170332,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","options":[{"fullName":"未审核","id":"0"},{"fullName":"已审核","id":"1"}],"__vModel__":"adjustStatus","style":{},"disabled":false,"interfaceHasPage":false,"id":"adjustStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"border":false,"fullName":"入库状态","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":122,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"入库状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973047304,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","options":[{"fullName":"未入库","id":"0"},{"fullName":"已入库","id":"1"}],"__vModel__":"entryStatus","style":{},"disabled":false,"interfaceHasPage":false,"id":"entryStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"审核说明","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核说明","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973251999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"adjustComm","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"adjustComm","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"垃圾袋号","addonAfter":"","__config__":{"formId":123,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"垃圾袋号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973131543,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"bagNo","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"bagNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"ableIds":[],"multiple":false,"fullName":"租户id","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"organizeSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"租户id","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_clean_order","renderKey":1716973295105,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","defaultCurrent":false,"tag":"JnpfOrganizeSelect","regList":[],"span":8},"__vModel__":"tenantId","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"tenantId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
-export default superQueryJson
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/Detail.vue
deleted file mode 100644
index da7f11c..0000000
--- a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/Detail.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        content="详情"/>
-        <div class="options">
-            <el-button @click="goBack">取 消</el-button>
-        </div>
-    </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24">
-                <el-collapse :accordion="false" v-model="activeigptod" class="mb-20">
-                <el-collapse-item title="投递情况" name="1">
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="投递单号"  
- prop="orderNo"  >
-                        <p>{{dataForm.orderNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="投递机柜"  
- prop="deviceCode"  >
-                        <p>{{dataForm.deviceCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="投递人手机"  
- prop="phone"  >
-                        <p>{{dataForm.phone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="桶编号"  
- prop="doorNum"  >
-                         <p>{{ dataForm.doorNum }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收品大类"  
- prop="productCode"  >
-                        <p>{{dataForm.productCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="回收品子类"  
- prop="productSubCode"  >
-                        <p>{{dataForm.productSubCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="上报重量"  
- prop="reportWeight"  >
-                        <p>{{dataForm.reportWeight}}KG</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="单价"  
- prop="price"  >
-                        <p>{{dataForm.price}}元</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="总价"  
- prop="totalPrice"  >
-                        <p>{{dataForm.totalPrice}}元</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="桶内原重"  
- prop="originalWeight"  >
-                        <p>{{dataForm.originalWeight}}KG</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核重量"  
- prop="adjustWeight"  >
-                        <p>{{dataForm.adjustWeight}}KG</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核总价"  
- prop="adjustPrice"  >
-                        <p>{{dataForm.adjustPrice}}元</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核状态 "  
- prop="adjustStatus"  >
-                        <p>{{dataForm.adjustStatus}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="审核设置"  
- prop="adjustSet"  >
-                        <p>{{dataForm.adjustSet}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="审核说明"  
- prop="adjustComm"  >
-                        <p>{{dataForm.adjustComm}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="投递照片"  
- prop="photo"  >
-                    <JnpfUploadImg    v-model="dataForm.photo"
- disabled
- detailed  :fileSize="2"  sizeUnit="MB"  :limit="4"  pathType="defaultPath"  :isAccount="0"  >
-                </JnpfUploadImg>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="开始时间"  
- prop="startTime"  >
-                        <p>{{dataForm.startTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="完成时间"  
- prop="finishTime"  >
-                        <p>{{dataForm.finishTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="登录方式"  
- prop="loginType"  >
-                         <p>{{ dataForm.loginType }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="机柜单号"  
- prop="deviceOrderNo"  >
-                        <p>{{dataForm.deviceOrderNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="桶编号"  
- prop="bucketCode"  >
-                        <p>{{dataForm.bucketCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="垃圾袋编号"  
- prop="bagNo"  >
-                        <p>{{dataForm.bagNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="上报时间"  
- prop="reportTime"  >
-                        <p>{{dataForm.reportTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            </el-collapse-item>
-                <el-collapse-item title="清运情况" name="2">
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运单号"  
- prop="cleanNo"  >
-                        <p>{{dataForm.cleanNo}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运员手机号"  
- prop="cleanerPhone"  >
-                        <p>{{dataForm.cleanerPhone}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="清运状态"  
- prop="cleanStatus"  >
-                         <p>{{ dataForm.cleanStatus }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="公司id"  
- prop="companyId"  >
-                        <p>{{dataForm.companyId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="修改时间"  
- prop="lastModifyTime"  >
-                        <p>{{dataForm.lastModifyTime}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="修改用户"  
- prop="lastModifyUserId"  >
-                        <p>{{dataForm.lastModifyUserId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8"  >
-                <jnpf-form-tip-item  label="组织JSONID"  
- prop="organizeJsonId"  >
-                        <p>{{dataForm.organizeJsonId}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            </el-collapse-item>
-            </el-collapse>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
-    </div>
-</transition>
-</template>
-<script>
-    import request from '@/utils/request'
-
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
-
-            dataForm: {
-                id :'',
-                            orderNo : '',
-                            deviceCode : "",
-                            phone : '',
-                            doorNum : "",
-                            productCode : "542988676150333899",
-                            productSubCode : [],
-                            reportWeight : '',
-                            price : '',
-                            totalPrice : '',
-                            originalWeight : '',
-                            adjustWeight : "",
-                            adjustPrice : '',
-                            adjustStatus : "",
-                            adjustSet : "",
-                            deliverId : '',
-                            adjustComm : '',
-                            photo : [],
-                            startTime : '',
-                            finishTime : '',
-                            loginType : "",
-                            deviceOrderNo : '',
-                            bucketCode : [],
-                            bagNo : '',
-                            reportTime : '',
-                            cleanNo : '',
-                            cleanerPhone : '',
-                            cleanStatus : "",
-                            companyId : "",
-                            lastModifyTime : "",
-                            lastModifyUserId : "",
-                            organizeJsonId : "",
-                            creatorTime : "",
-                            creatorUserId : "",
-            },
-                            activeigptod:["1","2"],
-                        deviceCodeProps:{"label":"device_name","value":"device_code"  },
-                            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"  },
-                        productCodeProps:{"label":"name","value":"id"  },
-                        productSubCodeProps:{"label":"name","value":"id"  ,"children":"children" },
-                        adjustStatusProps:{"label":"fullName","value":"enCode"  },
-                        adjustSetProps:{"label":"fullName","value":"enCode"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                        loginTypeProps:{"label":"fullName","value":"id"  },
-                        bucketCodeProps:{"label":"show_name","value":"bucket_code"  ,"children":"children" },
-                            cleanStatusOptions:[{"fullName":"未清运","id":"0"},{"fullName":"已清运","id":"1"}],
-                        cleanStatusProps:{"label":"fullName","value":"id"  },
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-
-        },
-        mounted() {},
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-
-                goBack() {
-                    this.$emit('refresh')
-                },
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/RecycleDeliveryOrder/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
-
-                })
-            },
-        },
-    }
-
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/columnList.js b/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/columnList.js
deleted file mode 100644
index b901fd0..0000000
--- a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/columnList.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const columnList = [{"jnpfKey":"currOrganize","fullName":"公司id","label":"公司id","sortable":false,"align":"left","type":"currOrganize","__config__":{"formId":190,"visibility":["pc","app"],"jnpfKey":"currOrganize","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"公司id","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1717062080676,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","tag":"JnpfOpenData","span":8},"readonly":true,"prop":"companyId","width":0,"__vModel__":"companyId","fixed":"none","style":{"width":"100%"},"id":"companyId","placeholder":"","showLevel":"all"},{"jnpfKey":"billRule","fullName":"投递单号","label":"投递单号","sortable":false,"align":"left","__config__":{"formId":202,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"deliveryOrderCode","className":[],"label":"投递单号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1717124632726,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"投递单编号","tag":"JnpfInput","span":8},"readonly":true,"prop":"orderNo","width":0,"__vModel__":"orderNo","fixed":"none","style":{"width":"100%"},"id":"orderNo","placeholder":"系统自动生成"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"投递人手机","label":"投递人手机","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":123,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"投递人手机","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1716969274124,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"phone","showWordLimit":false,"width":0,"__vModel__":"phone","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"phone","placeholder":"投递员手机","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"投递机柜","label":"投递机柜","sortable":false,"align":"left","props":{"label":"device_name","value":"device_code"},"__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"投递机柜","trigger":"change","propsUrl":"564713894723988869","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716968734954,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"回收柜设备列表","tag":"JnpfSelect","regList":[],"span":8},"prop":"deviceCode","width":0,"options":[{"device_name":"0","be_long_station_code":"0","address":"0","city":"0","latitude":"2","device_code":"5810fccc55b6371c","id":"1778605492026826754","box_weight":10.95,"f_last_modify_time":"2024-04-23 15:40:53","longitude":"22"},{"device_name":"测试设备","address":"和哈上次","city":"[\"354094476021830\",\"354094476021831\",\"354094476025929\"]","device_code":"DE202405290001","use_status":1,"id":"565504819574345797","box_weight":111,"status":1,"organize_json_id":"[\"96240625-934F-490B-8AA6-0BC775B18468\"]"}],"__vModel__":"deviceCode","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"deviceCode","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"桶编号","label":"桶编号","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":194,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"桶编号","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717120918834,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"doorNum","width":0,"options":[{"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"}],"__vModel__":"doorNum","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"doorNum","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"桶内原重","label":"桶内原重","sortable":false,"align":"left","addonAfter":"KG","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"桶内原重","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1716968708628,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"originalWeight","showWordLimit":false,"width":0,"__vModel__":"originalWeight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"originalWeight","placeholder":"投递前桶内重量","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":false,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"上报重量","label":"上报重量","sortable":false,"align":"left","addonAfter":"KG","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"上报重量","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1716968715384,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"reportWeight","showWordLimit":false,"width":0,"__vModel__":"reportWeight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"reportWeight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"单价","label":"单价","sortable":false,"align":"left","addonAfter":"元","__config__":{"formId":192,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"单价","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717120313932,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^([1-9][\\d]*|0)(\\.[\\d]+)?$/","message":"请输入正确的金额"}],"span":8},"readonly":false,"prop":"price","showWordLimit":false,"width":0,"__vModel__":"price","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"price","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"总价","label":"总价","sortable":false,"align":"left","addonAfter":"元","__config__":{"formId":208,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"总价","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717132429197,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^([1-9][\\d]*|0)(\\.[\\d]+)?$/","message":"请输入正确的重量"}],"span":8},"readonly":false,"prop":"totalPrice","showWordLimit":false,"width":0,"__vModel__":"totalPrice","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"totalPrice","placeholder":"审核后本单总价","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"审核状态 ","label":"审核状态 ","sortable":false,"align":"left","props":{"label":"fullName","value":"enCode"},"optionType":"button","__config__":{"formId":120,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"565908107083911685","tipLabel":"","dragDisabled":false,"className":[],"label":"审核状态 ","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1716969104792,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"adjustStatus","width":0,"options":[{"enCode":"0","children":null,"hasChildren":false,"fullName":"待审核","id":"565908540162576901","parentId":"0"},{"enCode":"1","children":null,"hasChildren":false,"fullName":"通过","id":"565908582134977029","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"调整通过","id":"565908640389665285","parentId":"0"},{"enCode":"3","children":null,"hasChildren":false,"fullName":"拒绝","id":"565908803141243397","parentId":"0"}],"__vModel__":"adjustStatus","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"adjustStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"审核重量","label":"审核重量","sortable":false,"align":"left","addonAfter":"KG","__config__":{"formId":206,"visibility":["pc","app"],"jnpfKey":"input","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核重量","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1717132200670,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^([1-9][\\d]*|0)(\\.[\\d]+)?$/","message":"请输入正确的重量"}],"span":8},"readonly":false,"prop":"adjustWeight","showWordLimit":false,"width":0,"__vModel__":"adjustWeight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"adjustWeight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"审核总价","label":"审核总价","sortable":false,"align":"left","addonAfter":"元","__config__":{"formId":207,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核总价","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717132285751,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^([1-9][\\d]*|0)(\\.[\\d]+)?$/","message":"请输入正确的重量"}],"span":8},"readonly":false,"prop":"adjustPrice","showWordLimit":false,"width":0,"__vModel__":"adjustPrice","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"adjustPrice","placeholder":"审核后本单总价","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"审核说明","label":"审核说明","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":1,"maxRows":4},"__config__":{"formId":121,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"审核说明","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969227589,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"adjustComm","showWordLimit":true,"width":0,"__vModel__":"adjustComm","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"adjustComm","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"cascader","multiple":false,"fullName":"桶编号","label":"桶编号","sortable":false,"align":"left","separator":"/","props":{"children":"children","label":"show_name","value":"bucket_code"},"__config__":{"formId":198,"visibility":["pc","app"],"jnpfKey":"cascader","defaultValue":[],"noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"桶编号","trigger":"change","propsUrl":"565524506681020549","templateJson":[{"fieldName":"","field":"device_code","defaultValue":"","jnpfKey":"select","dataType":"varchar","parameter":"device_code","id":"ow3vw72","required":0,"relationField":"deviceCode"}],"showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717124152154,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-cascader","propsName":"回收桶清单","tag":"JnpfCascader","regList":[],"span":8},"prop":"bucketCode","width":0,"options":[],"showAllLevels":true,"__vModel__":"bucketCode","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"bucketCode","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"垃圾袋编号","label":"垃圾袋编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":211,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"垃圾袋编号","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1718710860895,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"bagNo","showWordLimit":false,"width":0,"__vModel__":"bagNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"bagNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"回收品大类","label":"回收品大类","sortable":false,"align":"left","props":{"label":"name","value":"id"},"__config__":{"formId":200,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"542988676150333899","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品大类","trigger":"change","propsUrl":"565507078836203205","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1717124277847,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"回收品大类","tag":"JnpfSelect","regList":[],"span":8},"prop":"productCode","width":0,"options":[{"code":"SPHS2024032800008","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废玻璃.png\",\"url\":\"/upload/image/8babd5719611f4d13cc2f93433f3c443.png\",\"fileId\":\"废玻璃.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:13","spec":"","unit":"","f_version":0,"name":"废玻璃类","id":"542987705491919312","f_last_modify_time":"2024-03-28 13:10:13","f_creator_time":"2024-03-28 13:10:13"},{"code":"SPHS2024032800007","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废金属.png\",\"url\":\"/upload/image/f6d87823b66392d60688d822479cfdc6.png\",\"fileId\":\"废金属.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:07","spec":"","unit":"","f_version":0,"name":"废金属类","id":"542988020232491471","f_last_modify_time":"2024-03-28 13:10:07","f_creator_time":"2024-03-28 13:10:07"},{"code":"SPHS2024032800006","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废塑料.png\",\"url\":\"/upload/image/20481ca1fc66ce54c83ef71f340049f1.png\",\"fileId\":\"废塑料.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:10:03","spec":"","unit":"","f_version":0,"name":"废塑料类","id":"542988185538400719","f_last_modify_time":"2024-03-28 13:10:03","f_creator_time":"2024-03-28 13:10:03"},{"code":"SPHS2024032800002","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"废纸.png\",\"url\":\"/upload/image/4a1a4638bf587b81920dafa8acd9651f.png\",\"fileId\":\"废纸.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:57","spec":"","unit":"","f_version":0,"name":"废纸类","id":"542988391038322166","f_last_modify_time":"2024-03-28 13:09:57","f_creator_time":"2024-03-28 13:09:57"},{"code":"SPHS2024032800003","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"家用电器.png\",\"url\":\"/upload/image/182383619a96ba250756475266d630db.png\",\"fileId\":\"家用电器.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:36","spec":"","unit":"","f_version":0,"name":"家用电器类","id":"542988676150333899","f_last_modify_time":"2024-03-28 13:09:36","f_creator_time":"2024-03-28 13:09:36"},{"code":"SPHS2024040100001","company_id":"","department_id":"","f_creator_user_id":"543048783781434181","f_last_modify_user_id":"543048783781434181","photo":"[{\"name\":\"旧衣服.png\",\"url\":\"/upload/image/e81bc16028c208cc0f52b8a1a3160c4a.png\",\"fileId\":\"旧衣服.png\"}]","f_delete_user_id":"543048783781434181","f_delete_time":"2024-04-01 10:50:25","spec":"","unit":"","f_version":0,"name":"旧衣服类","id":"542988728520413647","f_last_modify_time":"2024-04-01 10:50:25","f_creator_time":"2024-04-01 10:50:25"},{"code":"SPHS2024032800004","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"有害垃圾.png\",\"url\":\"/upload/image/28029537c47967a6d5c85974515a5034.png\",\"fileId\":\"有害垃圾.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:22","spec":"","unit":"","f_version":0,"name":"有害垃圾类","id":"542988786368254415","f_last_modify_time":"2024-03-28 13:09:22","f_creator_time":"2024-03-28 13:09:22"},{"code":"SPHS2024032800009","company_id":"","department_id":"","f_creator_user_id":"349057407209541","f_last_modify_user_id":"349057407209541","photo":"[{\"name\":\"其他.png\",\"url\":\"/upload/image/f0dbf15312230df9d1064955cef5b2f5.png\",\"fileId\":\"其他.png\"}]","f_delete_user_id":"349057407209541","f_delete_time":"2024-03-28 13:09:12","spec":"","unit":"","f_version":0,"name":"其他类","id":"542988830311977413","f_last_modify_time":"2024-03-28 13:09:12","f_creator_time":"2024-03-28 13:09:12"}],"__vModel__":"productCode","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"productCode","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"cascader","multiple":false,"fullName":"回收品子类","label":"回收品子类","sortable":false,"align":"left","separator":"/","props":{"children":"children","label":"name","value":"id"},"__config__":{"formId":201,"visibility":["pc","app"],"jnpfKey":"cascader","defaultValue":[],"noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"回收品子类","trigger":"change","propsUrl":"565508644465028805","templateJson":[{"fieldName":"","field":"parent_id","defaultValue":"","jnpfKey":"select","dataType":"varchar","parameter":"parent_id","id":"ZBu5m72","required":0,"relationField":"productCode"}],"showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1717124420190,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-cascader","propsName":"回收品大类含小类","tag":"JnpfCascader","regList":[],"span":8},"prop":"productSubCode","width":0,"options":[],"showAllLevels":true,"__vModel__":"productSubCode","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"productSubCode","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"登录方式","label":"登录方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":128,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"登录方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969456069,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"loginType","width":0,"options":[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],"__vModel__":"loginType","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"loginType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"开始时间","label":"开始时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":214,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"开始时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1718710902736,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"startTime","showWordLimit":false,"width":0,"__vModel__":"startTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"startTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"完成时间","label":"完成时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":199,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"完成时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1717124229112,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"finishTime","showWordLimit":false,"width":0,"__vModel__":"finishTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"finishTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"上报时间","label":"上报时间","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":212,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"上报时间","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1718710861548,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"reportTime","showWordLimit":false,"width":0,"__vModel__":"reportTime","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"reportTime","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"清运状态","label":"清运状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":125,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"清运状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_recycle_delivery_order","renderKey":1716969295981,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":8},"size":"small","prop":"cleanStatus","width":0,"options":[{"fullName":"未清运","id":"0"},{"fullName":"已清运","id":"1"}],"__vModel__":"cleanStatus","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"cleanStatus","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"清运单号","label":"清运单号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运单号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969353525,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":true,"prop":"cleanNo","showWordLimit":false,"width":0,"__vModel__":"cleanNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"cleanNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"清运员手机号","label":"清运员手机号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"清运员手机号","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969419129,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^1[3456789]\\d{9}$/","message":"请输入正确的手机号码"}],"span":8},"readonly":true,"prop":"cleanerPhone","showWordLimit":false,"width":0,"__vModel__":"cleanerPhone","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"cleanerPhone","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"jnpfKey":"modifyUser","fullName":"修改用户","label":"修改用户","sortable":false,"align":"left","__config__":{"formId":131,"visibility":["pc","app"],"jnpfKey":"modifyUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改用户","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969531394,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifier","tag":"JnpfInput","span":8},"readonly":true,"prop":"lastModifyUserId","width":0,"__vModel__":"lastModifyUserId","fixed":"none","style":{"width":"100%"},"id":"lastModifyUserId","placeholder":"系统自动生成"},{"jnpfKey":"modifyTime","fullName":"修改时间","label":"修改时间","sortable":false,"align":"left","__config__":{"formId":132,"visibility":["pc","app"],"jnpfKey":"modifyTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改时间","showLabel":true,"required":false,"tableName":"nx_recycle_delivery_order","renderKey":1716969531819,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifytime","tag":"JnpfInput","span":8},"readonly":true,"prop":"lastModifyTime","width":0,"__vModel__":"lastModifyTime","fixed":"none","style":{"width":"100%"},"id":"lastModifyTime","placeholder":"系统自动生成"}]
-export default columnList
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/form.vue b/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/form.vue
deleted file mode 100644
index dae3729..0000000
--- a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/form.vue
+++ /dev/null
@@ -1,962 +0,0 @@
-
-
-
-    <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
-                </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-                    <el-col :span="24">
-                        <el-collapse :accordion="false" v-model="activeigptod" class="mb-20">
-                        <el-collapse-item title="投递情况" name="1">
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="投递单号"   prop="orderNo" >
-        <JnpfInput   v-model="dataForm.orderNo" @change="changeData('orderNo',-1)" 
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="投递机柜"   prop="deviceCode" >
-        <JnpfSelect   v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="deviceCodeOptions" :props="deviceCodeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="投递人手机"   prop="phone" >
-        <JnpfInput   v-model="dataForm.phone" @change="changeData('phone',-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="productCode" >
-        <JnpfSelect   v-model="dataForm.productCode" @change="changeData('productCode',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="productCodeOptions" :props="productCodeProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="回收品子类"   prop="productSubCode" >
-        <JnpfCascader   v-model="dataForm.productSubCode" @change="changeData('productSubCode',-1)" 
- placeholder="请选择"  show-all-levels  clearable  :style='{"width":"100%"}' separator="/"  :options="productSubCodeOptions" :props="productSubCodeProps" >
-    </JnpfCascader>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="上报重量"   prop="reportWeight" >
-        <JnpfInput   v-model="dataForm.reportWeight" @change="changeData('reportWeight',-1)" 
- placeholder="请输入"  addonAfter="KG"  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="单价"   prop="price" >
-        <JnpfInput   v-model="dataForm.price" @change="changeData('price',-1)" 
- placeholder="请输入"  addonAfter="元"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="总价"   prop="totalPrice" >
-        <JnpfInput   v-model="dataForm.totalPrice" @change="changeData('totalPrice',-1)" 
- placeholder="审核后本单总价"  addonAfter="元"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="桶内原重"   prop="originalWeight" >
-        <JnpfInput   v-model="dataForm.originalWeight" @change="changeData('originalWeight',-1)" 
- placeholder="投递前桶内重量"  addonAfter="KG"  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核重量"   prop="adjustWeight" >
-        <JnpfInput   v-model="dataForm.adjustWeight" @change="changeData('adjustWeight',-1)" 
- placeholder="请输入"  addonAfter="KG"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核总价"   prop="adjustPrice" >
-        <JnpfInput   v-model="dataForm.adjustPrice" @change="changeData('adjustPrice',-1)" 
- placeholder="审核后本单总价"  addonAfter="元"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核状态 "   prop="adjustStatus" >
-        <JnpfRadio   v-model="dataForm.adjustStatus" @change="changeData('adjustStatus',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="adjustStatusOptions" :props="adjustStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="审核设置"   prop="adjustSet" >
-        <JnpfRadio   v-model="dataForm.adjustSet" @change="changeData('adjustSet',-1)" 
- disabled  optionType="button"  direction="horizontal"  size="small"  :options="adjustSetOptions" :props="adjustSetProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="审核说明"   prop="adjustComm" >
-        <JnpfTextarea   v-model="dataForm.adjustComm" @change="changeData('adjustComm',-1)" 
- placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":1,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="投递照片"   prop="photo" >
-        <JnpfUploadImg   v-model="dataForm.photo" @change="changeData('photo',-1)" 
- disabled  :fileSize="2" sizeUnit="MB"  :limit="4"  pathType="defaultPath"  :isAccount="0" >
-    </JnpfUploadImg>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="开始时间"   prop="startTime" >
-        <JnpfInput   v-model="dataForm.startTime" @change="changeData('startTime',-1)" 
- placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="完成时间"   prop="finishTime" >
-        <JnpfInput   v-model="dataForm.finishTime" @change="changeData('finishTime',-1)" 
- placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="登录方式"   prop="loginType" >
-        <JnpfRadio   v-model="dataForm.loginType" @change="changeData('loginType',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="loginTypeOptions" :props="loginTypeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="机柜单号"   prop="deviceOrderNo" >
-        <JnpfInput   v-model="dataForm.deviceOrderNo" @change="changeData('deviceOrderNo',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="桶编号"   prop="bucketCode" >
-        <JnpfCascader   v-model="dataForm.bucketCode" @change="changeData('bucketCode',-1)" 
- placeholder="请选择"  show-all-levels  clearable  :style='{"width":"100%"}' separator="/"  :options="bucketCodeOptions" :props="bucketCodeProps" >
-    </JnpfCascader>
-    </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="8" >
-        <jnpf-form-tip-item
- label="上报时间"   prop="reportTime" >
-        <JnpfInput   v-model="dataForm.reportTime" @change="changeData('reportTime',-1)" 
- placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-                    </el-collapse-item>
-                        <el-collapse-item title="清运情况" name="2">
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运单号"   prop="cleanNo" >
-        <JnpfInput   v-model="dataForm.cleanNo" @change="changeData('cleanNo',-1)" 
- placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运员手机号"   prop="cleanerPhone" >
-        <JnpfInput   v-model="dataForm.cleanerPhone" @change="changeData('cleanerPhone',-1)" 
- placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="清运状态"   prop="cleanStatus" >
-        <JnpfRadio   v-model="dataForm.cleanStatus" @change="changeData('cleanStatus',-1)" 
- optionType="button"  direction="horizontal"  size="small"  :options="cleanStatusOptions" :props="cleanStatusProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="公司id"   prop="companyId" >
-        <JnpfOpenData   v-model="dataForm.companyId" @change="changeData('companyId',-1)" 
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}' type="currOrganize"  showLevel="all" >
-    </JnpfOpenData>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <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>
-        <el-col :span="8" >
-        <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="8" >
-        <jnpf-form-tip-item
- label="组织JSONID"   prop="organizeJsonId" >
-        <JnpfOpenData   v-model="dataForm.organizeJsonId" @change="changeData('organizeJsonId',-1)" 
- placeholder="系统自动生成"  readonly  :style='{"width":"100%"}' type="currOrganize"  showLevel="all" >
-    </JnpfOpenData>
-    </jnpf-form-tip-item>
-        </el-col>
-                    </el-collapse-item>
-                    </el-collapse>
-                    </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>
-
-
-<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: {
-                                orderNo : undefined,
-                                    deviceCode : undefined,
-                                phone : undefined,
-                                    doorNum : undefined,
-                                    productCode : "542988676150333899",
-                                    productSubCode : [],
-                                reportWeight : undefined,
-                                price : undefined,
-                                totalPrice : undefined,
-                                originalWeight : undefined,
-                                    adjustWeight : undefined,
-                                adjustPrice : undefined,
-                                    adjustStatus : undefined,
-                                    adjustSet : undefined,
-                                deliverId : undefined,
-                                adjustComm : undefined,
-                                    photo : [],
-                                startTime : undefined,
-                                finishTime : undefined,
-                                    loginType : undefined,
-                                deviceOrderNo : undefined,
-                                    bucketCode : [],
-                                bagNo : undefined,
-                                reportTime : undefined,
-                                cleanNo : undefined,
-                                cleanerPhone : undefined,
-                                    cleanStatus : undefined,
-                                    companyId : undefined,
-                                    lastModifyTime : undefined,
-                                    lastModifyUserId : undefined,
-                                    organizeJsonId : undefined,
-                                    creatorTime : undefined,
-                                    creatorUserId : undefined,
-            },
-            tableRequiredData: {},
-                                activeigptod:["1","2"],
-            dataRule:
-            {
-                            phone: [
-                                {
-                                    required: true,
-                                    message: '投递员手机',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            doorNum: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            productCode: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            reportWeight: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            price: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                                        message: '请输入正确的金额',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            totalPrice: [
-                                {
-                                    required: true,
-                                    message: '审核后本单总价',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                                        message: '请输入正确的重量',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            originalWeight: [
-                                {
-                                    required: true,
-                                    message: '投递前桶内重量',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            adjustWeight: [
-                                    {
-                                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                                        message: '请输入正确的重量',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            adjustPrice: [
-                                {
-                                    required: true,
-                                    message: '审核后本单总价',
-                                    trigger: 'blur'
-                                },
-                                    {
-                                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                                        message: '请输入正确的重量',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            adjustStatus: [
-                                {
-                                    required: true,
-                                    message: '不能为空',
-                                    trigger: 'change'
-                                },
-                        ],
-                            deviceOrderNo: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            bucketCode: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-                            bagNo: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            cleanerPhone: [
-                                    {
-                                        pattern: /^1[3456789]\d{9}$/,
-                                        message: '请输入正确的手机号码',
-                                        trigger: 'blur'
-                                    },
-                        ],
-                            cleanStatus: [
-                                {
-                                    required: true,
-                                    message: '不能为空',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                    deviceCodeOptions:[],
-                            deviceCodeProps:{"label":"device_name","value":"device_code"  },
-                            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"  },
-                    productCodeOptions:[],
-                            productCodeProps:{"label":"name","value":"id"  },
-                    productSubCodeOptions:[],
-                            productSubCodeProps:{"label":"name","value":"id"  ,"children":"children" },
-                    adjustStatusOptions:[],
-                            adjustStatusProps:{"label":"fullName","value":"enCode"  },
-                    adjustSetOptions:[],
-                            adjustSetProps:{"label":"fullName","value":"enCode"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                            loginTypeProps:{"label":"fullName","value":"id"  },
-                    bucketCodeOptions:[],
-                            bucketCodeProps:{"label":"show_name","value":"bucket_code"  ,"children":"children" },
-                            cleanStatusOptions:[{"fullName":"未清运","id":"0"},{"fullName":"已清运","id":"1"}],
-                            cleanStatusProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        orderNo:[] ,
-                        deviceCode:[] ,
-                        phone:[] ,
-                        doorNum:[] ,
-                        productCode:[] ,
-                        productSubCode:[{"dataType":"varchar","defaultValue":"","field":"parent_id","fieldName":"","id":"ZBu5m72","jnpfKey":"select","relationField":"productCode","required":"0"}] ,
-                        reportWeight:[] ,
-                        price:[] ,
-                        totalPrice:[] ,
-                        originalWeight:[] ,
-                        adjustWeight:[] ,
-                        adjustPrice:[] ,
-                        adjustStatus:[] ,
-                        adjustSet:[] ,
-                        deliverId:[] ,
-                        adjustComm:[] ,
-                        photo:[] ,
-                        startTime:[] ,
-                        finishTime:[] ,
-                        loginType:[] ,
-                        deviceOrderNo:[] ,
-                        bucketCode:[{"dataType":"varchar","defaultValue":"","field":"device_code","fieldName":"","id":"ow3vw72","jnpfKey":"select","relationField":"deviceCode","required":"0"}] ,
-                        bagNo:[] ,
-                        reportTime:[] ,
-                        cleanNo:[] ,
-                        cleanerPhone:[] ,
-                        cleanStatus:[] ,
-                        companyId:[] ,
-                        lastModifyTime:[] ,
-                        lastModifyUserId:[] ,
-                        organizeJsonId:[] ,
-                        creatorTime:[] ,
-                        creatorUserId:[] ,
-            },
-        }
-        },
-        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/RecycleDeliveryOrder/'+ 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.getdeviceCodeOptions();
-                        this.getproductCodeOptions();
-                        this.getproductSubCodeOptions();
-                        this.getadjustStatusOptions();
-                        this.getadjustSetOptions();
-                        this.getbucketCodeOptions();
-            },
-                    getdeviceCodeOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.deviceCode))
-                    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('564713894723988869',template).then(res => {
-                        let data = res.data
-                        this.deviceCodeOptions = data
-                        this.changeDataFormData(1,'deviceCode','deviceCode',index,'')
-                    })
-                },
-                    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
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('565507078836203205',template).then(res => {
-                        let data = res.data
-                        this.productCodeOptions = data
-                        this.changeDataFormData(1,'productCode','productCode',index,'542988676150333899')
-                    })
-                },
-                    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]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('565508644465028805',template).then(res => {
-                        let data = res.data
-                        this.productSubCodeOptions = data
-                        this.changeDataFormData(1,'productSubCode','productSubCode',index,[])
-                    })
-                },
-                    getadjustStatusOptions() {
-                    getDictionaryDataSelector('565908107083911685').then(res => {
-                        this.adjustStatusOptions = res.data.list
-                    })
-                },
-                    getadjustSetOptions() {
-                    getDictionaryDataSelector('565907359503749637').then(res => {
-                        this.adjustSetOptions = res.data.list
-                    })
-                },
-                    getbucketCodeOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.bucketCode))
-                    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('565524506681020549',template).then(res => {
-                        let data = res.data
-                        this.bucketCodeOptions = data
-                        this.changeDataFormData(1,'bucketCode','bucketCode',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/RecycleDeliveryOrder/'+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/RecycleDeliveryOrder',
-                        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/RecycleDeliveryOrder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
-                })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
-
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/index.vue b/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/index.vue
deleted file mode 100644
index 9a81c17..0000000
--- a/jnpf-java-boot/jnpf-web/src/recycledeliveryorder/index.vue
+++ /dev/null
@@ -1,686 +0,0 @@
-
-
-
-
-
-
-
-<template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="投递单号">
-                                        <el-input v-model="query.orderNo" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="审核状态 ">
-                                        <JnpfSelect v-model="query.adjustStatus" placeholder="请选择" clearable
-                                                    :options="adjustStatusOptions"
-                                                    :props="adjustStatusProps" >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="投递员手机">
-                                        <el-input v-model="query.phone" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="机柜编码">
-                                                <JnpfSelect v-model="query.deviceCode" placeholder="请选择" clearable
-                                                            :options="deviceCodeOptions"
-                                                            :props="deviceCodeProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="桶编号">
-                                                <JnpfSelect v-model="query.doorNum" placeholder="请选择" clearable
-                                                            :options="doorNumOptions"
-                                                            :props="doorNumProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="桶编码">
-                                                <JnpfCascader  v-model="query.bucketCode" placeholder="请选择" :options ="bucketCodeOptions" :props="bucketCodeProps"
-                                                clearable/>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="垃圾袋编号">
-                                                <el-input v-model="query.bagNo" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="所属商户">
-                                                <JnpfOrganizeSelect v-model="query.companyId" placeholder="请选择"  :lastLevel="false" />
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="清运员手机">
-                                                <el-input v-model="query.cleanerPhone" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="清运状态">
-                                                <JnpfSelect v-model="query.cleanStatus" placeholder="请选择" clearable
-                                                            :options="cleanStatusOptions"
-                                                            :props="cleanStatusProps" >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="清运单号">
-                                                <el-input v-model="query.cleanNo" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="companyId"
- label="公司id"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="orderNo"
- label="投递单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="phone"
- label="投递人手机"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="deviceCode"
- label="投递机柜"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="桶编号"  prop="doorNum" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.doorNum}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="originalWeight"
- label="桶内原重"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="reportWeight"
- label="上报重量"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="price"
- label="单价"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="totalPrice"
- label="总价"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustStatus"
- label="审核状态 "  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustWeight"
- label="审核重量"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustPrice"
- label="审核总价"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="adjustComm"
- label="审核说明"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="bucketCode"
- label="桶编号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="bagNo"
- label="垃圾袋编号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productCode"
- label="回收品大类"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="productSubCode"
- label="回收品子类"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="登录方式"  prop="loginType" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.loginType}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="startTime"
- label="开始时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="finishTime"
- label="完成时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="reportTime"
- label="上报时间"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="清运状态"  prop="cleanStatus" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.cleanStatus}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="cleanNo"
- label="清运单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="cleanerPhone"
- label="清运员手机号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyUserId"
- label="修改用户"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="lastModifyTime"
- label="修改时间"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-
-
-
-
-        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
-    </div>
-</template>
-
-<script>
-
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
-
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
-
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
-
-                    showAll: false,
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        orderNo:undefined,
-                        adjustStatus:undefined,
-                        phone:undefined,
-                        deviceCode:undefined,
-                        doorNum:undefined,
-                        bucketCode:undefined,
-                        bagNo:undefined,
-                        companyId:undefined,
-                        cleanerPhone:undefined,
-                        cleanStatus:undefined,
-                        cleanNo:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                deviceCodeOptions:[],
-                        deviceCodeProps:{"label":"device_name","value":"device_code"  },
-                            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"  },
-                            productCodeOptions:[],
-                        productCodeProps:{"label":"name","value":"id"  },
-                            productSubCodeOptions:[],
-                        productSubCodeProps:{"label":"name","value":"id"  ,"children":"children" },
-                            adjustStatusOptions:[],
-                        adjustStatusProps:{"label":"fullName","value":"enCode"  },
-                            adjustSetOptions:[],
-                        adjustSetProps:{"label":"fullName","value":"enCode"  },
-                            loginTypeOptions:[{"fullName":"扫码","id":"1"},{"fullName":"手机号","id":"2"}],
-                        loginTypeProps:{"label":"fullName","value":"id"  },
-                            bucketCodeOptions:[],
-                        bucketCodeProps:{"label":"show_name","value":"bucket_code"  ,"children":"children" },
-                            cleanStatusOptions:[{"fullName":"未清运","id":"0"},{"fullName":"已清运","id":"1"}],
-                        cleanStatusProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getadjustStatusOptions();
-                    this.getdeviceCodeOptions();
-                    this.getbucketCodeOptions();
-            this.queryData = JSON.parse(JSON.stringify(this.query))
-        },
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.toFormDetailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            toggleTreeExpand(expands) {
-                this.refreshTree = false
-                this.expandsTree = expands
-                this.$nextTick(() => {
-                    this.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
-                })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } else {
-                            resolve([]);
-                        }
-                    })
-                }
-            },
-                        getColumnList() {
-                    // 没有开启权限
-                    this.columnOptions = this.transformColumnList(this.columnList)
-            },
-            transformColumnList(columnList) {
-                let list = []
-                for (let i = 0; i < columnList.length; i++) {
-                    const e = columnList[i];
-                    if (!e.prop.includes('-')) {
-                        list.push(e)
-                    } else {
-                        let prop = e.prop.split('-')[0]
-                        let label = e.label.split('-')[0]
-                        let vModel = e.prop.split('-')[1]
-                        let newItem = {
-                            align: "center",
-                            jnpfKey: "table",
-                            prop,
-                            label,
-                            children: []
-                        }
-                        e.vModel = vModel
-                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-                        if (!list.some(o => o.prop === prop)) list.push(newItem)
-                        for (let i = 0; i < list.length; i++) {
-                            if (list[i].prop === prop) {
-                                list[i].children.push(e)
-                                break
-                            }
-                        }
-                    }
-                }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            arraySpanMethod({ column }) {
-                for (let i = 0; i < this.mergeList.length; i++) {
-                    if (column.property == this.mergeList[i].prop) {
-                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-                    }
-                }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        let child = {
-                            prop: item.prop + '-child-first'
-                        }
-                        item.children.unshift(child)
-                    }
-                })
-                newList.forEach(item => {
-                    if (item.children && item.children.length ) {
-                        item.children.forEach((child, index) => {
-                            if (index == 0) {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 1,
-                                    colspan: item.children.length
-                                })
-                            } else {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 0,
-                                    colspan: 0
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
-                })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-                    getadjustStatusOptions() {
-                        getDictionaryDataSelector('565908107083911685').then(res => {
-                            this.adjustStatusOptions = res.data.list
-                        })
-                    },
-                    getdeviceCodeOptions() {
-                        getDataInterfaceRes('564713894723988869').then(res => {
-                            let data = res.data
-                            this.deviceCodeOptions = data
-                        })
-                    },
-                    getbucketCodeOptions() {
-                        getDataInterfaceRes('565524506681020549').then(res => {
-                            let data = res.data
-                            this.bucketCodeOptions = data
-                        })
-                    },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            async initSearchDataAndListData() {
-                await this.initSearchData()
-                this.initData()
-            },
-            //初始化查询的默认数据
-            async initSearchData() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'565540808741097605',
-                    type:1,
-                };
-                request({
-                    url: `/api/scm/RecycleDeliveryOrder/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =res.data.list;
-                                            this.list = _list.map(o => ({
-                            ...o,
-                            ...this.expandObj,
-                        }))
-                            this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/scm/RecycleDeliveryOrder/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","scm/RecycleDeliveryOrder")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
-                    })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.exportList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/scm/RecycleDeliveryOrder/Actions/Export`,
-                    method: 'post',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx=""
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                this.query = JSON.parse(JSON.stringify(this.queryData))
-                this.search()
-            },
-            colseFlow(isrRefresh) {
-                this.flowVisible = false
-                if (isrRefresh) this.reset()
-            },
-        }
-    }
-</script>