Merge branch 'sit'

src/views/goodStore/active/index.vue

@@ -385,6 +385,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+        if (
+        (this.parmValue.starttime !== "" && this.parmValue.endtime === "") ||
+        (this.parmValue.starttime === "" && this.parmValue.endtime !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.activity_name = this.select === "1" ? this.sinput : "";

src/views/goodStore/brand/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/brand";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -247,7 +247,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
-        brand_name:"",
+        brand_name: "",
         status: "",
         creater: "",
       },
@@ -321,7 +321,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
-        brand_name:"",
+        brand_name: "",
         status: "",
         creater: "",
       };
@@ -329,8 +329,8 @@ export default {
     },
     // 新建/编辑/详情
     openModal(row, type) {
-      const {status}=row
-       if (type === "005" && status === "1") {
+      const { status } = row;
+      if (type === "005" && status === "1") {
         this.$message.warning("禁用后，才可以修改！");
         return;
       }
@@ -416,6 +416,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/goodStore/dealGoodsPool/detail.vue

@@ -487,6 +487,13 @@ export default {
       }
     },
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       let obj = JSON.parse(JSON.stringify(this.parmValue));
 
       if (obj.catid === "") {

src/views/goodStore/dealGoodsPool/index.vue

@@ -421,6 +421,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/goodStore/goldPrice/components/priceRecord.vue

@@ -104,7 +104,6 @@ export default {
         type: "",
         action_name: "",
       },
-    
 
       // 表格 - 数据
       tableData: [],
@@ -194,10 +193,16 @@ export default {
       this.parmValue.page = 1;
       await this.searchList();
     },
- 
- 
+
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.ecordList(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/goodStore/goodsCost/index.vue

@@ -639,6 +639,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       this.parmValue.spucode = this.select === "1" ? this.sinput : "";
       this.parmValue.good_name = this.select === "2" ? this.sinput : "";

src/views/goodStore/goodsOnline/index.vue

@@ -533,6 +533,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称

src/views/goodStore/goodsRepertory/index.vue

@@ -216,10 +216,7 @@
           content="详情"
           placement="top"
         >
-          <i
-            class="el-icon-view tb-icon"
-            @click="openDilog(scope.row)"
-          ></i>
+          <i class="el-icon-view tb-icon" @click="openDilog(scope.row)"></i>
         </el-tooltip>
         <el-tooltip
           v-if="
@@ -247,17 +244,16 @@
       @cancel="showModel = false"
     />
 
-
     <el-dialog title="详细信息" :visible.sync="visible">
-        <show-goods-data-table
-          :newTime="row.newTime"
-          v-if="row.newTime !== ''"
-          type="1"
-          :skucode="row.skuCode"
-          :spucode="row.spuCode"
-          :iscgd="false"
-        >
-        </show-goods-data-table>
+      <show-goods-data-table
+        :newTime="row.newTime"
+        v-if="row.newTime !== ''"
+        type="1"
+        :skucode="row.skuCode"
+        :spucode="row.spuCode"
+        :iscgd="false"
+      >
+      </show-goods-data-table>
     </el-dialog>
   </div>
 </template>
@@ -287,8 +283,8 @@ export default {
   },
   data() {
     return {
-        row:{},
-        visible:false,
+      row: {},
+      visible: false,
       options1: options1,
       options8: options8,
       loading: false,
@@ -340,11 +336,11 @@ export default {
   },
   methods: {
     //打开弹窗
-      openDilog(row){
-          this.visible = true;
-          this.row = row
-          console.log(this.row)
-      },
+    openDilog(row) {
+      this.visible = true;
+      this.row = row;
+      console.log(this.row);
+    },
 
     restSearch() {
       this.cat_id = [];
@@ -537,6 +533,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称
@@ -580,7 +583,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-dialog{
+/deep/ .el-dialog {
   width: 1024px;
 }
 </style>

src/views/goodStore/searchSort/index.vue

@@ -150,7 +150,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/goodStore/searchSort";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -319,11 +319,18 @@ export default {
 
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-           this.tableData.forEach((e) => {
+        this.tableData.forEach((e) => {
           if (e.im && e.im.length > 0) {
             e.specs = "";
             e.im.forEach((a, i) => {

src/views/goodStore/specs/index.vue

@@ -113,7 +113,7 @@
                 :size="searchSize"
                 type="success"
                 style="float: right"
-                @click="openModal({}, '003','0')"
+                @click="openModal({}, '003', '0')"
               >
                 添加
               </el-button>
@@ -141,7 +141,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="openModal(scope.row, '007',scope.row.status)"
+            @click="openModal(scope.row, '007', scope.row.status)"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -152,7 +152,7 @@
         >
           <i
             class="el-icon-edit tb-icon"
-            @click="openModal(scope.row, '005',scope.row.status)"
+            @click="openModal(scope.row, '005', scope.row.status)"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/specs";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -249,7 +249,7 @@ export default {
         end: "",
         status: "",
         creater: "",
-        spec_name:""
+        spec_name: "",
       },
       // 状态
       statusOptions: [
@@ -323,14 +323,14 @@ export default {
         end: "",
         status: "",
         creater: "",
-        spec_name:""
+        spec_name: "",
       };
 
       this.searchList();
     },
     // 新建/编辑/详情
-    openModal(row, type,status) {
-       if (type === "005" && status === "1") {
+    openModal(row, type, status) {
+      if (type === "005" && status === "1") {
         this.$message.warning("禁用后，才可以修改！");
         return;
       }
@@ -416,6 +416,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/goodStore/unit/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/unit";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -414,6 +414,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -297,6 +297,13 @@ export default {
         });
     },
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
@@ -304,7 +311,7 @@ export default {
         this.tableData.forEach((v) => {
           v.class_cat = "";
           if (v.can && v.can.length > 0) {
-            v.class_cat=""
+            v.class_cat = "";
             v.can.forEach((x, i) => {
               v.class_cat += i === 0 ? x.name : "/" + x.name;
             });

src/views/purchaseIn/purchaseOrder/index.vue

@@ -116,7 +116,7 @@
                   clearable
                   placeholder="编号"
                   v-model="input"
-                   maxlength="40"
+                  maxlength="40"
                   :size="searchSize"
                   class="input-with-select"
                   @blur="
@@ -382,6 +382,14 @@ export default {
       await this.searchList();
     },
     async searchList() {
+      if (
+        (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+        (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+
       this.loading = true;
       this.parmValue.cgdNo = this.select === "1" ? this.input : ""; // 采购单编码
       this.parmValue.wsm_in_code = this.select === "2" ? this.input : ""; // 入库单号

src/views/purchaseIn/wsmInOrder/index.vue

@@ -440,6 +440,13 @@ export default {
       await this.searchList();
     },
     async searchList() {
+      if (
+        (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+        (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
 
       this.parmValue.cgdNo = this.select === "1" ? this.input : ""; // 采购单编码

src/views/sellOut/bargainList/index.vue

@@ -332,14 +332,14 @@ export default {
     },
     // 列表搜索
     async searchList() {
-      if (this.parmValue.start !== "" && this.parmValue.end === "") {
-        this.$message.warning("结束时间不能为空!");
-        return;
-      }
-      if (this.parmValue.start == "" && this.parmValue.end != "") {
-        this.$message.warning("开始时间不能为空!");
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
         return;
       }
+
       this.loading = true;
       this.parmValue.returnCode = this.select === "1" ? this.s_input : "";
       this.parmValue.orderCode = this.select === "2" ? this.s_input : "";

src/views/sellOut/project/index.vue

@@ -352,6 +352,13 @@ export default {
         });
     },
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/sellOut/returnOrder/index.vue

@@ -314,6 +314,13 @@ export default {
       await this.searchList();
     },
     async searchList() {
+       if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       this.parmValue.post_code =
         this.select === "expressNo" ? this.s_input : "";

src/views/sellOut/salesOrder/index.vue

@@ -433,6 +433,13 @@ export default {
       await this.searchList();
     },
     async searchList() {
+       if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       this.parmValue.orderCode = this.select === "orderCode" ? this.input : "";
       this.parmValue.good_name = this.select === "good_name" ? this.input : "";

src/views/sellOut/sellAfterApply/index.vue

@@ -422,6 +422,13 @@ export default {
     },
     // 列表搜索
     async searchList() {
+       if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       this.parmValue.apply_name = this.select === "applyer" ? this.s_input : ""; // 产品属性编号
       this.parmValue.good_name =

src/views/sellOut/sellOutOrder/index.vue

@@ -337,6 +337,13 @@ export default {
     },
     // 列表搜索
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
 

src/views/sellOut/sellReturn/index.vue

@@ -292,6 +292,13 @@ export default {
         });
     },
     async searchList() {
+       if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       this.parmValue.returnCode =
         this.select === "returnCode" ? this.s_input : "";

src/views/sellOut/stockApply/index.vue

@@ -87,7 +87,7 @@
                 <el-input
                   placeholder="关键字"
                   v-model="input"
-                   maxlength="40"
+                  maxlength="40"
                   :size="searchSize"
                 >
                   <el-select
@@ -183,7 +183,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/stockApply";
 import { mapGetters } from "vuex";
-import {columns} from "./columns";
+import { columns } from "./columns";
 export default {
   name: "stockApply",
   mixins: [mixinPage, resToken],
@@ -291,7 +291,6 @@ export default {
 
     // 列表搜索
     async searchList() {
-      this.loading = true;
       if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||
         (this.parmValue.start == "" && this.parmValue.end != "")
@@ -299,6 +298,7 @@ export default {
         this.$message.warning("开始时间和结束时间不能为空");
         return;
       }
+      this.loading = true;
       this.parmValue.bk_code = this.select === "1" ? this.input : "";
       this.parmValue.good_code = this.select === "2" ? this.input : "";
       this.parmValue.good_name = this.select === "3" ? this.input : "";

src/views/sellOut/zixunOrder/index.vue

@@ -327,12 +327,11 @@ export default {
 
     // 列表搜索
     async searchList() {
-      if (this.parmValue.start !== "" && this.parmValue.end === "") {
-        this.$message.warning("结束时间不能为空!");
-        return;
-      }
-      if (this.parmValue.start == "" && this.parmValue.end != "") {
-        this.$message.warning("开始时间不能为空!");
+       if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
         return;
       }
       this.loading = true;

src/views/sellOut/zxDiffOrder/index.vue

@@ -333,6 +333,13 @@ export default {
         });
     },
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       this.parmValue.zxNo = this.select === "1" ? this.input : ""; //咨询类型
       this.parmValue.salesman = this.select === "2" ? this.input : ""; //申请人

src/views/serviceParam/Invoicing/index.vue

@@ -437,6 +437,13 @@ export default {
         });
     },
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       this.parmValue.invoice_code = "";
       this.parmValue.invoice_mobile = "";

src/views/serviceParam/business/index.vue

@@ -426,6 +426,13 @@ export default {
         });
     },
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       this.parmValue.name = this.select === "1" ? this.sinput : "";
       this.parmValue.companyNo = this.select === "2" ? this.sinput : "";

src/views/serviceParam/orderuse/index.vue

@@ -417,6 +417,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/serviceParam/parameter/index.vue

@@ -409,6 +409,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/serviceParam/storeSet/index.vue

@@ -387,6 +387,13 @@ export default {
       this.isDetail = isDetail;
     },
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       this.parmValue.wsm_code = this.select === "1" ? this.input : "";
       this.parmValue.contactor = this.select === "2" ? this.input : "";

src/views/serviceParam/supplier/index.vue

@@ -272,7 +272,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/serviceParam/supplier";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -316,7 +316,7 @@ export default {
         status: "",
         creater: "",
         name: "",
-        ocr_status:""
+        ocr_status: "",
       },
       // 状态
       statusOptions: [
@@ -418,7 +418,7 @@ export default {
         creater: "",
         name: "",
         person: "",
-        ocr_status:""
+        ocr_status: "",
       };
       this.searchList();
     },
@@ -516,6 +516,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       const { code, data, message } = await asyncRequest.list(this.parmValue);
       let scode = parseInt(code + "");

src/views/serviceParam/terrace/index.vue

@@ -419,6 +419,13 @@ export default {
     },
     // 刷新表格
     async searchList() {
+         if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/serviceParam/workCompany/index.vue

@@ -378,6 +378,13 @@ export default {
       this.isDetail = type;
     },
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/stock/allot/index.vue

@@ -53,6 +53,8 @@
                     :type="1"
                     :width="'135px'"
                     :size="searchSize"
+                    :start="parmValue.start"
+                    :end="parmValue.end"
                     @timeReturned="handleTime"
                   />
                 </el-col>
@@ -202,7 +204,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/allot";
 import columns from "./columns"; //表格列参数
 import addEdit from "./addEdit";
@@ -341,6 +343,13 @@ export default {
     },
     // 获取调拨列表
     async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       let supplierNo = model.supplierNo.length == 1 ? model.supplierNo[0] : "",

src/views/system/oplog/index.vue

@@ -266,6 +266,13 @@ export default {
 
     // 刷新表格
     async searchList() {
+       if (
+        (this.parmValue.startTime !== "" && this.parmValue.endTime === "") ||
+        (this.parmValue.startTime === "" && this.parmValue.endTime !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       this.loading = true;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {