Merge remote-tracking branch 'origin/master'

src/views/inout/DialogSelectReceiveOrder.vue

@@ -167,6 +167,7 @@ export default {
     return {
       listQuery: {
         billNo: "",
+        corpName: null,
         billAction: null,
         originType: null,
         page: 1,

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -51,6 +51,7 @@
                 style="width: 90%"
                 :clearable="false"
                 value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled-date="disabledArrivalDate"
               >
               </el-date-picker>
             </el-form-item>
@@ -220,6 +221,7 @@ export default {
         id: null,
         billNo: null,
         createTime: "",
+        arrivalTime: '',
         remark: "",
         deptCode: null,
         invCode: null,
@@ -294,7 +296,9 @@ export default {
             if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
-
+            if (this.formData.arrivalTime<this.formData.createTime) {
+              return this.$message.error("到货时间不能比单据日期早！！！");
+            }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                 return this.$message.error('单据数量不能为0');
@@ -318,6 +322,9 @@ export default {
         }
       });
     },
+    disabledArrivalDate(time) {
+      return time.getTime() < new Date(this.formData.createTime).getTime()
+    },
     submitFunction(status) {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;

src/views/system/param/busTypePre.vue

@@ -234,6 +234,14 @@ export default {
         this.$message.error("补单方式不能为空！")
         return;
       }
+      if (this.inputQuery.beforeTime < 0){
+        this.$message.error("时间间隔不能为负数！")
+        return;
+      }
+      if (this.inputQuery.busBeforeTime < 0){
+        this.$message.error("时间间隔不能为负数！")
+        return;
+      }
       // if (isBlank(this.inputQuery.invCode)) {
       //   this.$message.error("目标所在仓库不能为空！")
       //   return;