回收价加校验

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

@@ -30,6 +30,9 @@ import jnpf.util.*;
 import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
  *
  * nxPrice
@@ -50,8 +53,10 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
     private NxPriceProductService nxPriceProductService;
     @Autowired
     private NxPriceRecycleService nxPriceRecycleService;
-    @Autowired
+    @Resource
     private NxPriceMapper nxPriceMapper;
+
+
     @Override
     public List<NxPriceEntity> getList(NxPricePagination nxPricePagination){
         return getTypeList(nxPricePagination,nxPricePagination.getDataType());
@@ -496,14 +501,28 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
         //主表字段验证
         //子表字段验证
         if (form.getNxPriceProductList()==null||form.getNxPriceProductList().size()==0){
-
             return "商品名称不能为空";
 
         }
         if (form.getNxPriceRecycleList()==null||form.getNxPriceProductList().size()==0){
-
             return "回收站不能为空";
         }
+        try {
+            NxPriceProductModel nxPriceProductModel =new NxPriceProductModel();
+            String recoveryPrice;
+            for (NxPriceProductModel model:form.getNxPriceProductList()){
+                nxPriceProductModel.setRecoveryPrice(model.getRecoveryPrice());
+                recoveryPrice =model.getRecoveryPrice();
+                if (recoveryPrice==null){
+                    return "回收价是必填项";
+                }else if (recoveryPrice.equals("0")){
+                    return "回收价不能等于0";
+                }
+            }
+        }catch (Exception e){
+            return "回收价不能等于0且要必填";
+        }
+
         return countRecover;
     }
     /**

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

@@ -120,6 +120,7 @@
               >{{ $t("login.logIn") }}</el-button
             >
             <div class="foot">
+              <!-- <div class="register" @click="handleRegsiter">申请入驻</div> -->
               <div class="register" @click="handleRegsiter">申请入驻</div>
               <div class="line"></div>
               <div class="forget" @click="handleForget">忘记密码</div>

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

@@ -191,7 +191,7 @@
                   </el-table-column>
 
                   <el-table-column label="回收价" prop="recoveryPrice">
-                    <template slot="header" v-if="false">
+                    <template slot="header" v-if="true">
                       <span class="required-sign">*</span>回收价
                     </template>
                     <template slot-scope="scope">
@@ -439,7 +439,7 @@ export default {
       currVmodel: "",
       dataForm: {
         priceCode: undefined,
-        buinessId: [],
+        buinessId: undefined,
         priceType: "1",
         creatorUserId: undefined,
         creatorTime: undefined,
@@ -473,6 +473,13 @@ export default {
             trigger: "change",
           },
         ],
+        productId: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
       },
       priceTypeOptions: [{ fullName: "回收价", id: "1" }],
       priceTypeProps: { label: "fullName", value: "id" },