代码重新生成

4 months ago · ac4f2f90cd
parent 3e1eeae101
commit ac4f2f90cd
7 changed files with 11 additions and 11 deletions
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDeviceConstant.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDeviceConstant.java
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDeviceForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDeviceForm.java
@ -6,7 +6,7 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonProperty;

 /**
- * 投递柜清单
+ * 回收柜清单
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDevicePagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/RecycleDevicePagination.java
@ -7,7 +7,7 @@ import java.util.List;

 /**
 *
- * 设备柜清单
+ * 回收柜清单
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/Detail.vue
@ -50,7 +50,7 @@
          </el-col>
          <el-col :span="24">
            <jnpf-form-tip-item label="分配回收站"
-                                prop="beLongStationId" tip-label="分配回收站">
+                                prop="beLongStationId" tip-label="所属回收站">
              <p>{{ dataForm.beLongStationId }}</p>
            </jnpf-form-tip-item>
          </el-col>
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/columnList.js
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/columnList.js
@ -237,7 +237,7 @@ const columnList = [{
    "noShow": false,
    "dataType": "dynamic",
    "dictionaryType": "",
-    "tipLabel": "分配回收站",
+    "tipLabel": "所属回收站",
    "dragDisabled": false,
    "className": [],
    "label": "分配回收站",
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/form.vue
@ -69,9 +69,9 @@
          </el-col>
          <el-col :span="24">
            <jnpf-form-tip-item
-              label="分配回收站" tipLabel="分配回收站" prop="beLongStationId">
+              label="分配回收站" tipLabel="所属回收站" prop="beLongStationId">
              <JnpfCascader v-model="dataForm.beLongStationId" @change="changeData('beLongStationId',-1)"
-                            placeholder="请选择" clearable :style='{"width":"100%"}' separator="/"
+                            placeholder="请选择" show-all-levels clearable :style='{"width":"100%"}' separator="/"
                            :options="beLongStationIdOptions" :props="beLongStationIdProps">
              </JnpfCascader>
            </jnpf-form-tip-item>
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/superQueryJson.js
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/superQueryJson.js
@ -274,7 +274,7 @@ const superQueryJson = [{
    "noShow": false,
    "dataType": "dynamic",
    "dictionaryType": "",
-    "tipLabel": "分配回收站",
+    "tipLabel": "所属回收站",
    "dragDisabled": false,
    "className": [],
    "label": "分配回收站",