代码重新生成

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceMapper.java

@@ -5,11 +5,11 @@ import jnpf.entity.RecycleDeviceEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * 设备柜清单
+ * 投递柜清单
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-06-21
+ * 日期： 2024-06-22
  */
 public interface RecycleDeviceMapper extends BaseMapper<RecycleDeviceEntity> {
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleCameraService.java

@@ -32,4 +32,5 @@ public interface RecycleCameraService extends IService<RecycleCameraEntity> {
 
     void saveOrUpdate(RecycleCameraForm recycleCameraForm,String id, boolean isSave) throws Exception;
 
+    List<RecycleCameraEntity> getByDeviceCode(String deviceCode);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceService.java

@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-06-21
+ * 日期： 2024-06-22
  */
 public interface RecycleDeviceService extends IService<RecycleDeviceEntity> {
     List<RecycleDeviceEntity> getList(RecycleDevicePagination recycleDevicePagination);

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SimCardService.java

@@ -32,4 +32,6 @@ public interface SimCardService extends IService<SimCardEntity> {
 
     void saveOrUpdate(SimCardForm simCardForm,String id, boolean isSave) throws Exception;
 
+    SimCardEntity getByDeviceCode(String deviceCode);
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java

@@ -5,18 +5,26 @@ import jnpf.mapper.RecycleCameraMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.recyclecamera.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * RecycleCamera
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -50,7 +62,10 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
     public List<RecycleCameraEntity> getList(RecycleCameraPagination recycleCameraPagination) {
         return getTypeList(recycleCameraPagination, recycleCameraPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<RecycleCameraEntity> getTypeList(RecycleCameraPagination recycleCameraPagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -248,27 +263,34 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
             return this.list(recycleCameraQueryWrapper);
         }
     }
+
     @Override
     public RecycleCameraEntity getInfo(String id) {
         QueryWrapper<RecycleCameraEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(RecycleCameraEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(RecycleCameraEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, RecycleCameraEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
     public void delete(RecycleCameraEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(RecycleCameraForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -280,8 +302,10 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
         //主表字段验证
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param recycleCameraForm
      * @return
@@ -305,4 +329,11 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public List<RecycleCameraEntity> getByDeviceCode(String deviceCode) {
+        QueryWrapper<RecycleCameraEntity> query = new QueryWrapper<>();
+        query.lambda().eq(RecycleCameraEntity::getDeviceCode, deviceCode);
+        return this.list(query);
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java

@@ -1,38 +1,42 @@
 package jnpf.service.impl;
 
+import jnpf.entity.*;
+import jnpf.mapper.RecycleDeviceMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.recycledevice.*;
+import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.regex.Pattern;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.model.QueryModel;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.base.UserInfo;
 import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
-import jnpf.entity.RecycleDeviceEntity;
-import jnpf.mapper.RecycleDeviceMapper;
-import jnpf.model.QueryModel;
-import jnpf.model.recycledevice.RecycleDeviceConstant;
-import jnpf.model.recycledevice.RecycleDeviceForm;
-import jnpf.model.recycledevice.RecycleDevicePagination;
-import jnpf.permission.entity.UserEntity;
-import jnpf.service.RecycleDeviceService;
-import jnpf.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.List;
+import jnpf.util.*;
-import java.util.stream.Collectors;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
 /**
  *
  * 设备柜清单
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-06-21
+ * 日期： 2024-06-22
  */
 @Service
 public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, RecycleDeviceEntity> implements RecycleDeviceService{
@@ -140,6 +144,64 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
     }
     }
         if(isPc){
+            if(ObjectUtil.isNotEmpty(recycleDevicePagination.getBeLongCompanyId())){
+            recycleDeviceNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] beLongCompanyId = JsonUtil.getJsonToBean(recycleDevicePagination.getBeLongCompanyId(),String[][].class);
+        for(int i=0;i<beLongCompanyId.length;i++){
+        if(beLongCompanyId[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(beLongCompanyId[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> beLongCompanyId = JsonUtil.getJsonToList(recycleDevicePagination.getBeLongCompanyId(),String.class);
+        if(beLongCompanyId.size()>0){
+            idList.add(JsonUtil.getObjectToString(beLongCompanyId));
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(recycleDevicePagination.getBeLongCompanyId()));
+        }
+        }
+        recycleDeviceQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(RecycleDeviceEntity::getBeLongCompanyId, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(recycleDevicePagination.getBeLongStationId())){
+            recycleDeviceNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] beLongStationId = JsonUtil.getJsonToBean(recycleDevicePagination.getBeLongStationId(),String[][].class);
+        for(int i=0;i<beLongStationId.length;i++){
+        if(beLongStationId[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(beLongStationId[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> beLongStationId = JsonUtil.getJsonToList(recycleDevicePagination.getBeLongStationId(),String.class);
+        if(beLongStationId.size()>0){
+            idList.add(JsonUtil.getObjectToString(beLongStationId));
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(recycleDevicePagination.getBeLongStationId()));
+        }
+        }
+        recycleDeviceQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(RecycleDeviceEntity::getBeLongStationId, tt).or();
+        });
+        });
+
+            }
+
             if(ObjectUtil.isNotEmpty(recycleDevicePagination.getDeviceCode())){
             recycleDeviceNum++;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java

@@ -365,4 +365,12 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public SimCardEntity getByDeviceCode(String deviceCode) {
+        QueryWrapper<SimCardEntity> query = new QueryWrapper<>();
+        query.lambda().eq(SimCardEntity::getDeviceCode,deviceCode);
+        SimCardEntity simCard = this.getOne(query);
+        return simCard;
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java

@@ -1,38 +1,34 @@
 package jnpf.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
-import jnpf.base.UserInfo;
+import jnpf.base.vo.PageListVO;
-import jnpf.exception.DataException;
+import jnpf.base.vo.PaginationVO;
-import jnpf.permission.entity.UserEntity;
+import jnpf.entity.RecycleBucketEntity;
-import jnpf.service.*;
+import jnpf.entity.RecycleDeviceEntity;
-import jnpf.entity.*;
+import jnpf.model.recycledevice.RecycleDeviceConstant;
-import jnpf.util.*;
+import jnpf.model.recycledevice.RecycleDeviceForm;
-import jnpf.model.recycledevice.*;
+import jnpf.model.recycledevice.RecycleDevicePagination;
+import jnpf.service.RecycleBucketService;
+import jnpf.service.RecycleCameraService;
+import jnpf.service.RecycleDeviceService;
+import jnpf.service.SimCardService;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.util.JsonUtil;
+import jnpf.util.StringUtil;
+import jnpf.util.UserProvider;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.*;
-
-import jnpf.annotation.JnpfField;
-import jnpf.base.vo.PageListVO;
-import jnpf.base.vo.PaginationVO;
-import jnpf.base.vo.DownloadVO;
-import jnpf.config.ConfigValueUtil;
-import jnpf.base.entity.ProvinceEntity;
-
 import java.io.IOException;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
-
+import java.util.List;
-import jnpf.engine.entity.FlowTaskEntity;
+import java.util.Map;
-import jnpf.exception.WorkFlowException;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 设备柜清单
@@ -40,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-21
+ * @日期： 2024-06-22
  */
 @Slf4j
 @RestController
@@ -149,10 +145,8 @@ public class RecycleDeviceController {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
-
     /**
     * 删除
-     *
     * @param id
     * @return
     */
@@ -163,16 +157,14 @@ public class RecycleDeviceController {
         RecycleDeviceEntity entity= recycleDeviceService.getInfo(id);
         if(entity!=null){
             //假删除
-            entity.setDeleteMark(1);
+//            entity.setDeleteMark(1);
             recycleDeviceService.update(id,entity);
         }
         return ActionResult.success("删除成功");
     }
-
     /**
     * 表单信息(详情页)
     * 详情页面使用-转换数据
-     *
     * @param id
     * @return
     */
@@ -190,11 +182,9 @@ public class RecycleDeviceController {
         recycleDeviceMap = generaterSwapUtil.swapDataDetail(recycleDeviceMap,RecycleDeviceConstant.getFormData(),"563701730794023749",false);
         return ActionResult.success(recycleDeviceMap);
     }
-
     /**
     * 获取详情(编辑页)
     * 编辑页面使用-不转换数据
-     *
     * @param id
     * @return
     */

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-21
+ * @日期： 2024-06-22
  */
 @Data
 @TableName("nx_recycle_device")

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDeviceForm.java

@@ -6,11 +6,11 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * 设备柜清单
+ * 投递柜清单
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-21
+ * @日期： 2024-06-22
  */
 @Data
 public class RecycleDeviceForm  {

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDevicePagination.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-21
+ * @日期： 2024-06-22
  */
 @Data
 public class RecycleDevicePagination extends Pagination {
@@ -27,6 +27,12 @@ public class RecycleDevicePagination extends Pagination {
     private String moduleId;
     /** 菜单id */
     private String menuId;
+    /** 所属商户 */
+    @JsonProperty("beLongCompanyId")
+    private Object beLongCompanyId;
+    /** 分配回收站 */
+    @JsonProperty("beLongStationId")
+    private Object beLongStationId;
     /** 设备编码 */
     @JsonProperty("deviceCode")
     private Object deviceCode;

jnpf-java-boot/jnpf-web/src/views/recycledevice/Detail.vue

@@ -1,66 +1,60 @@
 <template>
-<transition name="el-zoom-in-center">
+  <el-dialog title="详情"
-<div class="JNPF-preview-main">
+             :close-on-click-modal="false" append-to-body
-    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+             :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-    <div class="JNPF-common-page-header">
+             width="600px">
-        <el-page-header @back="goBack"
+    <el-row :gutter="15" class="">
-                        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="100px" label-position="right">
         <template v-if="!loading">
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="设备编码"
                                 prop="deviceCode">
               <p>{{ dataForm.deviceCode }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="设备名称"
                                 prop="deviceName" tip-label="设备名称">
               <p>{{ dataForm.deviceName }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="所在城市"
                                 prop="city">
               <p>{{ dataForm.city }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="地址"
                                 prop="address">
               <p>{{ dataForm.address }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="投用状态"
                                 prop="useStatus">
               <p>{{ dataForm.useStatus }} </p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="设备状态"
                                 prop="status">
               <p>{{ dataForm.status }} </p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="所属商户"
                                 prop="beLongCompanyId">
               <p>{{ dataForm.beLongCompanyId }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="分配回收站"
                                 prop="beLongStationId" tip-label="分配回收站">
               <p>{{ dataForm.beLongStationId }}</p>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="所属清运员"
                                 prop="beLongRecyclerPhone">
               <p>{{ dataForm.beLongRecyclerPhone }}</p>
@@ -75,7 +69,7 @@
               </JnpfUploadImg>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8"  >
+          <el-col :span="24">
             <jnpf-form-tip-item label="设备总重"
                                 prop="boxWeight">
               <p>{{ dataForm.boxWeight }}</p>
@@ -96,8 +90,11 @@
         </template>
       </el-form>
     </el-row>
-    </div>
+    <span slot="footer" class="dialog-footer">
-</transition>
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false"/>
+  </el-dialog>
 </template>
 <script>
 import request from '@/utils/request'
@@ -106,6 +103,7 @@
 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: [],
@@ -137,7 +135,10 @@
         lastModifyTime: "",
         organizeJsonId: "",
       },
-                            useStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"暂停服务","id":"2"},{"fullName":"关闭","id":"0"}],
+      useStatusOptions: [{"fullName": "启用", "id": "1"}, {"fullName": "暂停服务", "id": "2"}, {
+        "fullName": "关闭",
+        "id": "0"
+      }],
       useStatusProps: {"label": "fullName", "value": "id"},
       statusOptions: [{"fullName": "离线", "id": "0"}, {"fullName": "在线", "id": "1"}],
       statusProps: {"label": "fullName", "value": "id"},
@@ -151,7 +152,8 @@
   created() {
 
   },
-        mounted() {},
+  mounted() {
+  },
   methods: {
     toDetail(defaultValue, modelId) {
       if (!defaultValue) return
@@ -170,9 +172,6 @@
       this.dataForm = _dataAll
     },
 
-                goBack() {
-                    this.$emit('refresh')
-                },
     init(id) {
       this.dataForm.id = id || 0;
       this.visible = true;

jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue

@@ -1,41 +1,14 @@
 <template>
-  <transition name="el-zoom-in-center">
+  <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
-    <div class="JNPF-preview-main">
+             :close-on-click-modal="false" append-to-body
-      <div class="JNPF-common-page-header">
+             :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-        <el-page-header @back="goBack"
+             width="600px">
-                        :content="!dataForm.id ? '新建':'编辑'"/>
+    <el-row :gutter="15" class="">
-        <div class="options">
-          <el-dropdown class="dropdown" placement="bottom">
-            <el-button style="width:70px">
-              更 多<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <template v-if="dataForm.id">
-                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                  {{ '上一条' }}
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                  {{ '下一条' }}
-                </el-dropdown-item>
-              </template>
-              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                :loading="continueBtnLoading" :disabled='btnLoading'>
-                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保
-            存
-          </el-button>
-          <el-button @click="goBack"> 取 消</el-button>
-        </div>
-      </div>
-      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
                label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="设备编码" prop="deviceCode">
               <JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
@@ -43,7 +16,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="设备名称" tipLabel="设备名称" prop="deviceName">
               <JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
@@ -51,7 +24,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="所在城市" prop="city">
               <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
@@ -59,7 +32,7 @@
               </JnpfAreaSelect>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="地址" prop="address">
               <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
@@ -67,7 +40,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="投用状态" prop="useStatus">
               <JnpfRadio v-model="dataForm.useStatus" @change="changeData('useStatus',-1)"
@@ -76,7 +49,7 @@
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="设备状态" prop="status">
               <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
@@ -85,7 +58,7 @@
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="所属商户" prop="beLongCompanyId">
               <JnpfOrganizeSelect v-model="dataForm.beLongCompanyId" @change="changeData('beLongCompanyId',-1)"
@@ -94,21 +67,21 @@
               </JnpfOrganizeSelect>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="分配回收站" tipLabel="分配回收站" prop="beLongStationId">
               <JnpfCascader v-model="dataForm.beLongStationId" @change="changeData('beLongStationId',-1)"
-                              placeholder="请选择" show-all-levels clearable :style='{"width":"100%"}' separator="/"
+                            placeholder="请选择" clearable :style='{"width":"100%"}' separator="/"
                             :options="beLongStationIdOptions" :props="beLongStationIdProps">
               </JnpfCascader>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="所属清运员" prop="beLongRecyclerPhone">
               <JnpfSelect v-model="dataForm.beLongRecyclerPhone" @change="changeData('beLongRecyclerPhone',-1)"
-                            placeholder="请选择" clearable :style='{"width":"100%"}'
+                          placeholder="请选择" clearable :style='{"width":"100%"}' :options="beLongRecyclerPhoneOptions"
-                            :options="beLongRecyclerPhoneOptions" :props="beLongRecyclerPhoneProps">
+                          :props="beLongRecyclerPhoneProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -116,11 +89,11 @@
             <jnpf-form-tip-item
               label="设备码二维码" prop="deviceCodeQr">
               <JnpfUploadImg v-model="dataForm.deviceCodeQr" @change="changeData('deviceCodeQr',-1)"
-                               :fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                             disabled :fileSize="100" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
               </JnpfUploadImg>
             </jnpf-form-tip-item>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item
               label="设备总重" prop="boxWeight">
               <JnpfInput v-model="dataForm.boxWeight" @change="changeData('boxWeight',-1)"
@@ -150,8 +123,21 @@
       <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
                     ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
     </el-row>
+    <span slot="footer" class="dialog-footer">
+                    <div class="upAndDown-button" v-if="dataForm.id">
+                <el-button @click="prev" :disabled='prevDis'>
+                  {{ '上一条' }}
+                </el-button>
+                <el-button @click="next" :disabled='nextDis'>
+                  {{ '下一条' }}
+                </el-button>
               </div>
-  </transition>
+                <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
+            {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
+              <el-button @click="visible = false"> 取 消</el-button>
+              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
+        </span>
+  </el-dialog>
 </template>
 
 
@@ -438,9 +424,6 @@ export default {
         this.changeDataFormData(1, 'beLongRecyclerPhone', 'beLongRecyclerPhone', index, '')
       })
     },
-    goBack() {
-      this.$emit('refresh')
-    },
     clearData() {
       this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
     },

jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue

@@ -1,20 +1,28 @@
-
-
-
-
-
-
-
 <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="所属商户">
+              <JnpfOrganizeSelect
+                selectType="all" v-model="query.beLongCompanyId" placeholder="请选择
+                                        " clearable multiple/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="分配回收站">
+              <JnpfCascader v-model="query.beLongStationId" placeholder="请选择" :options="beLongStationIdOptions"
+                            :props="beLongStationIdProps"
+                            clearable/>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="设备编码">
               <el-input v-model="query.deviceCode" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
+          <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="设备名称">
                 <el-input v-model="query.deviceName" placeholder="请输入" clearable></el-input>
@@ -28,7 +36,6 @@
                 </JnpfSelect>
               </el-form-item>
             </el-col>
-                        <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="设备状态">
                 <JnpfSelect v-model="query.status" placeholder="请选择" clearable
@@ -100,6 +107,11 @@
             label="所属商户" align="left"
           >
           </el-table-column>
+          <el-table-column
+            prop="beLongStationId"
+            label="分配回收站" align="left"
+          >
+          </el-table-column>
           <el-table-column
             prop="city"
             label="所在城市" align="left"
@@ -128,11 +140,6 @@
           <el-table-column
             prop="lastModifyTime"
             label="修改时间" align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="beLongStationId"
- label="分配回收站"  align="left"
           >
           </el-table-column>
           <el-table-column
@@ -154,15 +161,14 @@
             </template>
           </el-table-column>
         </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
 
 
-
-
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData"/>
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
     <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false"/>
@@ -214,6 +220,8 @@
       uploadBoxVisible: false,
       detailVisible: false,
       query: {
+        beLongCompanyId: undefined,
+        beLongStationId: undefined,
         deviceCode: undefined,
         deviceName: undefined,
         useStatus: undefined,
@@ -241,7 +249,10 @@
       flowListVisible: false,
       flowList: [],
       exportBoxVisible: false,
-                                                                                                                                                                useStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"暂停服务","id":"2"},{"fullName":"关闭","id":"0"}],
+      useStatusOptions: [{"fullName": "启用", "id": "1"}, {"fullName": "暂停服务", "id": "2"}, {
+        "fullName": "关闭",
+        "id": "0"
+      }],
       useStatusProps: {"label": "fullName", "value": "id"},
       statusOptions: [{"fullName": "离线", "id": "0"}, {"fullName": "在线", "id": "1"}],
       statusProps: {"label": "fullName", "value": "id"},
@@ -249,8 +260,7 @@
       beLongStationIdProps: {"label": "station_name", "value": "id", "children": "children"},
       beLongRecyclerPhoneOptions: [],
       beLongRecyclerPhoneProps: {"label": "staffs_name", "value": "mobile_phone"},
-            interfaceRes: {
+      interfaceRes: {},
-                },
     }
   },
   computed: {
@@ -262,6 +272,7 @@
   created() {
     this.getColumnList(),
       this.initSearchDataAndListData()
+    this.getbeLongStationIdOptions();
     this.queryData = JSON.parse(JSON.stringify(this.query))
   },
   methods: {
@@ -412,6 +423,12 @@
       }
       this.exportList = exportList
     },
+    getbeLongStationIdOptions() {
+      getDataInterfaceRes('566226368535205061').then(res => {
+        let data = res.data
+        this.beLongStationIdOptions = data
+      })
+    },
     goDetail(id) {
       this.detailVisible = true
       this.$nextTick(() => {