前端gjy

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -321,6 +321,7 @@
               type="year"
               align="right"
               unlink-panels
+              value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
             ></el-date-picker>

src/views/salesManagement/salesPlanEdit.vue

@@ -270,6 +270,7 @@
               type="year"
               align="right"
               unlink-panels
+              value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
             ></el-date-picker>
@@ -790,10 +791,10 @@ export default {
         return
       }
       if (
-        this.dataList.protein!=''&&this.dataList.protein!=undefined&&String(this.dataList.protein).indexOf('.') != -1 &&
+        this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein>80||this.dataList.protein<1){
+            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<1){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -801,10 +802,10 @@ export default {
         return
       }
       if (
-        this.dataList.impurity!=''&&this.dataList.impurity!=undefined&&String(this.dataList.impurity).indexOf('.') != -1 &&
+        this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
             (String(this.dataList.impurity).indexOf('.') + 1) >2
-            ||this.dataList.impurity>40||this.dataList.impurity<1) {
+            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<1) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -812,10 +813,10 @@ export default {
         return
       }
       if (
-        this.dataList.mildewGrain!=''&&this.dataList.mildewGrain!=undefined&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
+        this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2||this.dataList.mildewGrain>40||this.dataList.mildewGrain<1) {
+            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<1) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -823,10 +824,10 @@ export default {
         return
       }
       if (
-        this.dataList.jiaorenli!=''&&this.dataList.jiaorenli!=undefined&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
+        this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2||this.dataList.jiaorenli>40||this.dataList.jiaorenli<1) {
+            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<1) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -834,10 +835,10 @@ export default {
         return
       }
       if (
-        this.dataList.imperfectGrain!=''&&this.dataList.imperfectGrain!=undefined&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
+        this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
+            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<1) {
         this.$message({
           message: '不完善粒输入错误',
           type: 'warning'