bug修改

7 months ago · 67188be695
parent 6ca355024e
commit 67188be695
8 changed files with 58 additions and 30 deletions
--- a/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/OrganizeController.java
+++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/OrganizeController.java
@ -406,9 +406,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
        if (organizeService.isExistByFullName(entity, false, false)) {
            return ActionResult.fail("公司名称不能重复");
        }
-        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
-            return ActionResult.fail("公司编码不能重复");
-        }
+//        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
+//            return ActionResult.fail("公司编码不能重复");
+//        }

        // 通过组织id获取父级组织
        String organizeIdTree = getOrganizeIdTree(entity);
@ -446,9 +446,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
        if (organizeService.isExistByFullName(entity, false, false)) {
            return ActionResult.fail("公司名称不能重复");
        }
-        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
-            return ActionResult.fail("公司编码不能重复");
-        }
+//        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
+//            return ActionResult.fail("公司编码不能重复");
+//        }

        // 通过组织id获取父级组织
        String organizeIdTree = getOrganizeIdTree(entity);
@ -646,9 +646,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
        if (organizeService.isExistByFullName(entity, false, true)) {
            return ActionResult.fail("公司名称不能重复");
        }
-        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
-            return ActionResult.fail("公司编码不能重复");
-        }
+//        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
+//            return ActionResult.fail("公司编码不能重复");
+//        }
        // 通过组织id获取父级组织
        String organizeIdTree = getOrganizeIdTree(entity);
        entity.setOrganizeIdTree(organizeIdTree);
--- a/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrForm.java
+++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrForm.java
@ -23,7 +23,7 @@ public class OrganizeCrForm {
    private String parentId;
    @NotBlank(message = "公司名称不能为空")
    private String fullName;
-    @NotBlank(message = "公司编码不能为空")
+//    @NotBlank(message = "公司编码不能为空")
    private String enCode;
    private String description;
    @NotNull(message = "公司状态不能为空")
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxPriceServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxPriceServiceImpl.java
@ -495,10 +495,13 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
        }
        //主表字段验证
        //子表字段验证
-            if (form.getNxPriceProductList()!=null){
-            }
-            if (form.getNxPriceRecycleList()!=null){
-            }
+        if (form.getNxPriceProductList()!=null||form.getNxPriceProductList().size()>0){
+            return "商品名称不能为空";
+
+        }
+        if (form.getNxPriceRecycleList()!=null||form.getNxPriceProductList().size()>0){
+            return "回收站不能为空";
+        }
        return countRecover;
    }
    /**
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxPriceController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxPriceController.java
@ -103,7 +103,7 @@ public class NxPriceController {
            realList.add(nxPriceMap);
        }
        //数据转换
-//        realList = generaterSwapUtil.swapDataList(realList, NxPriceConstant.getFormData(), NxPriceConstant.getColumnData(), nxPricePagination.getModuleId(),false);
+        realList = generaterSwapUtil.swapDataList(realList, NxPriceConstant.getFormData(), NxPriceConstant.getColumnData(), nxPricePagination.getModuleId(),false);

        //返回对象
        PageListVO vo = new PageListVO();
--- a/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
+++ b/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
@ -10,5 +10,5 @@ module.exports = {
  // 开发环境接口配置
  APIURl: 'http://127.0.0.1:30000'
  // 测试环境接口配置
-  // APIURl: 'http://222.71.165.187:3333'
-}
+  // APIURl: 'http://222.71.165.187:50000'
+}
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
@ -76,7 +76,7 @@
                </JnpfInput>
              </jnpf-form-tip-item>
            </el-col>
-            <!-- <el-col :span="8">
+            <el-col :span="8">
              <jnpf-form-tip-item label="回收站名称" prop="stationName">
                <JnpfInput
                  v-model="dataForm.stationName"
@ -87,7 +87,7 @@
                >
                </JnpfInput>
              </jnpf-form-tip-item>
-            </el-col> -->
+            </el-col>

            <el-col :span="8">
              <!-- {{ this.$store.getters.userInfo.organizeId }} -->
@ -126,13 +126,13 @@
              <jnpf-form-tip-item
                class="site-item"
                label="详细地址"
-                prop="stationName"
+                prop="address"
              >
                <JnpfInput
                  class="input"
                  disabled
                  v-model="dataForm.address"
-                  @change="changeData('stationName', -1)"
+                  @change="changeData('address', -1)"
                  placeholder="请选择详细地址"
                  clearable
                  :style="{ width: '100%' }"
@ -608,7 +608,7 @@ export default {
        firstContactPersonTel: undefined,
        stationStatus: 1,
        stationImg: [],
-        address: undefined,
+        // address: undefined,
        recycleTel: undefined,
        stationDescription: undefined,
        businessDays: [],
@ -630,7 +630,7 @@ export default {
        address: [
          {
            required: true,
-            message: "请输入",
+            message: "请输入详细地址",
            trigger: "blur",
          },
        ],
@ -686,7 +686,7 @@ export default {
        address: [
          {
            required: true,
-            message: "请输入",
+            message: "请输入详细地址",
            trigger: "blur",
          },
        ],
@ -770,8 +770,8 @@ export default {
      businessDaysProps: { label: "fullName", value: "id" },
      acceptRangeOptions: [
        { fullName: "5KM以内", id: 5000 },
-        { fullName: "10KM以内", id: 100000 },
-        { fullName: "20KM以内", id: 200000 },
+        { fullName: "10KM以内", id: 10000 },
+        { fullName: "20KM以内", id: 20000 },
      ],
      acceptRangeProps: { label: "fullName", value: "id" },
      recyclestationpricerecycleTypeIdOptions: [],
--- a/jnpf-java-boot/jnpf-web/src/views/login/regsiter.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/login/regsiter.vue
@ -207,9 +207,9 @@
              <el-input v-model="dataForm.fullName"></el-input>
            </el-form-item>

-            <el-form-item label="商户编码" prop="enCode">
+            <!-- <el-form-item label="商户编码" prop="enCode">
              <el-input v-model="dataForm.enCode"></el-input>
-            </el-form-item>
+            </el-form-item> -->

            <el-form-item label="商户位置" prop="location">
              <el-input v-model="dataForm.propertyJson.address"></el-input>
--- a/jnpf-java-boot/jnpf-web/src/views/nxprice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/nxprice/form.vue
@ -143,7 +143,7 @@
                    align="center"
                  />
                  <el-table-column label="商品名称" prop="productId">
-                    <template slot="header" v-if="false">
+                    <template slot="header" v-if="true">
                      <span class="required-sign">*</span>商品名称
                    </template>
                    <template slot-scope="scope">
@ -270,7 +270,7 @@
                    align="center"
                  />
                  <el-table-column label="回收站" prop="recycleId">
-                    <template slot="header" v-if="false">
+                    <template slot="header" v-if="true">
                      <span class="required-sign">*</span>回收站
                    </template>
                    <template slot-scope="scope">
@ -466,6 +466,13 @@ export default {
            trigger: "change",
          },
        ],
+        recycleId: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
      },
      priceTypeOptions: [{ fullName: "回收价", id: "1" }],
      priceTypeProps: { label: "fullName", value: "id" },
@ -600,6 +607,15 @@ export default {
      let isOk = true;
      for (let i = 0; i < this.dataForm.nxPriceProductList.length; i++) {
        const e = this.dataForm.nxPriceProductList[i];
+        if (!e.productId) {
+          this.$message({
+            message: "商品名称不能为空",
+            type: "error",
+            duration: 1000,
+          });
+          isOk = false;
+          break;
+        }
      }
      return isOk;
    },
@ -607,6 +623,15 @@ export default {
      let isOk = true;
      for (let i = 0; i < this.dataForm.nxPriceRecycleList.length; i++) {
        const e = this.dataForm.nxPriceRecycleList[i];
+        if (!e.recycleId) {
+          this.$message({
+            message: "回收站不能为空",
+            type: "error",
+            duration: 1000,
+          });
+          isOk = false;
+          break;
+        }
      }
      return isOk;
    },