diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
index 1870d33a..35374ec0 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
@@ -33,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -413,9 +413,9 @@
             <el-form-item label="CP7时间：" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="startTime">
               <el-date-picker
-                v-model="startTime"
+                v-model="formCount.startTime"
                 type="datetime"
                 size="small"
                 :picker-options="pickerOptions0"
@@ -427,9 +427,9 @@
             </el-form-item>
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
+            <el-form-item prop="endTime">
               <el-date-picker
-                v-model="endTime"
+                v-model="formCount.endTime"
                 type="datetime"
                 :picker-options="pickerOptions1"
                 size="small"
@@ -447,7 +447,7 @@
             <el-form-item label="KEEN号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="kennCode">
               <el-input v-model="formCount.kennCode" />
             </el-form-item>
           </el-col>
@@ -455,7 +455,7 @@
             <el-form-item label="底盘号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="chassisNumber">
               <el-input v-model="formCount.chassisNumber" />
             </el-form-item>
           </el-col>
@@ -465,19 +465,19 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialCode">
+              <el-input v-model="formCount.materialCode" style="width:450px"/>
             </el-form-item>
           </el-col>
-          <el-col :md="4" :xs="24">
+          <!-- <el-col :md="4" :xs="24">
             <el-form-item label="厂内零件号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="sapMaterialCode">
               <el-input v-model="formCount.sapMaterialCode" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -546,8 +546,8 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
-      startTime: "",
-      endTime: "",
+      // startTime: "",
+      // endTime: "",
       pickerOptionsCp7: {
         disabledDate: (time) => {
           let now = new Date();
@@ -562,7 +562,6 @@ export default {
         },
       },
       datetime5: [],
-      datetime7: [],
       checkedCities: [0],
       cities: cityOptions,
       selectValue: "",
@@ -599,15 +598,15 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        settledate: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
+        startTime: "",
+        endTime: "",
+        // name: "未结算对比",
+        // settledate: "",
+        // materialCode: "",
+        // sapMaterialCode: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        // version: "",
       },
       list: null,
       totalCount: 0,
@@ -662,7 +661,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -792,7 +791,6 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -802,28 +800,29 @@ export default {
           if (this.formCount.materialCode != "") {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
+          // if (this.formCount.sapMaterialCode != "") {
+          //   this.listExportQuery.sapMaterialCode =
+          //     this.formCount.sapMaterialCode; //厂内物料号
+          // }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
           var getdate5 = JSON.stringify(this.datetime5);
           if (getdate5 != "[]") {
-            alert(this.datetime5[0]);
             this.listExportQuery.begin = this.datetime5
               ? this.datetime5[0] || undefined
               : undefined;
             this.listExportQuery.end = this.datetime5
               ? this.datetime5[1] || undefined
               : undefined;
+          } else {
+            this.listExportQuery.begin = undefined;
+            this.listExportQuery.end = undefined;
           }
-          if (this.startTime != "") {
-            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          }
-          if (this.endTime != "") {
-            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          }
+          this.listExportQuery.cp7begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
@@ -868,8 +867,12 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
       this.dialogFormVisible = true;
     },
+
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;
diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
index 3c1e7667..8406a006 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
@@ -33,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -333,7 +333,13 @@
       append-to-body
       width="680px"
     >
-      <el-form ref="formCount" :inline="true" :rules="rules" :model="formCount" size="mini">
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -357,18 +363,16 @@
             </el-form-item>
           </el-col>
         </el-row>
-       
 
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" style="width:300px"/>
+            <el-form-item prop="materialCode">
+              <el-input v-model="formCount.materialCode" style="width: 300px" />
             </el-form-item>
           </el-col>
-    
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -553,7 +557,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -680,19 +684,19 @@ export default {
     /* 重置 */
     resetForm(formName) {
       this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      // this.datetime7 = [];
+      //this.formCount.materialCode = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
           this.formLoading = true;
           this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
+          this.listExportQuery.matialCode = this.formCount.materialCode
+            ? this.formCount.materialCode
+            : undefined;
+          // if (this.formCount.materialCode != "") {
+          //   this.listExportQuery.matialCode = this.formCount.materialCode; //物料号
+          // }
           // if (this.formCount.kennCode != "") {
           //   this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           // }
@@ -719,7 +723,10 @@ export default {
           //   this.listExportQuery.materialGroup =
           //     this.formCount.materialGroupValue; //物料组车型
           // }
-          console.log("发票与结算核对汇总-导出条件：" + JSON.stringify(this.listExportQuery));
+          console.log(
+            "发票与结算核对汇总-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
               "/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make",
diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
index 1ee0e3a9..2b9f4a4f 100644
--- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
+++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
@@ -33,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -408,14 +408,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
+        <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="CP7时间：" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="startTime">
               <el-date-picker
-                v-model="startTime"
+                v-model="formCount.startTime"
                 type="datetime"
                 size="small"
                 :picker-options="pickerOptions0"
@@ -427,9 +427,9 @@
             </el-form-item>
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
+            <el-form-item prop="endTime">
               <el-date-picker
-                v-model="endTime"
+                v-model="formCount.endTime"
                 type="datetime"
                 :picker-options="pickerOptions1"
                 size="small"
@@ -447,7 +447,7 @@
             <el-form-item label="KEEN号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="kennCode">
               <el-input v-model="formCount.kennCode" />
             </el-form-item>
           </el-col>
@@ -455,29 +455,29 @@
             <el-form-item label="底盘号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="chassisNumber">
               <el-input v-model="formCount.chassisNumber" />
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
 
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialCode">
+              <el-input v-model="formCount.materialCode" style="width: 450px" />
             </el-form-item>
           </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
+          <!-- <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="sapMaterialCode">
               <el-input v-model="formCount.sapMaterialCode" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -546,8 +546,8 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
-      startTime: "",
-      endTime: "",
+      // startTime: "",
+      // endTime: "",
       pickerOptionsCp7: {
         disabledDate: (time) => {
           let now = new Date();
@@ -562,7 +562,6 @@ export default {
         },
       },
       datetime5: [],
-      datetime7: [],
       checkedCities: [0],
       cities: cityOptions,
       selectValue: "",
@@ -599,15 +598,15 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        settledate: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
+        startTime: "",
+        endTime: "",
+        // name: "未结算对比",
+        // settledate: "",
+        // materialCode: "",
+        // sapMaterialCode: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        // version: "",
       },
       list: null,
       totalCount: 0,
@@ -662,7 +661,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -792,7 +791,6 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -802,28 +800,29 @@ export default {
           if (this.formCount.materialCode != "") {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
+          // if (this.formCount.sapMaterialCode != "") {
+          //   this.listExportQuery.sapMaterialCode =
+          //     this.formCount.sapMaterialCode; //厂内物料号
+          // }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
           var getdate5 = JSON.stringify(this.datetime5);
           if (getdate5 != "[]") {
-            alert(this.datetime5[0]);
             this.listExportQuery.begin = this.datetime5
               ? this.datetime5[0] || undefined
               : undefined;
             this.listExportQuery.end = this.datetime5
               ? this.datetime5[1] || undefined
               : undefined;
+          } else {
+            this.listExportQuery.begin = undefined;
+            this.listExportQuery.end = undefined;
           }
-          if (this.startTime != "") {
-            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          }
-          if (this.endTime != "") {
-            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          }
+          this.listExportQuery.cp7begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
@@ -831,6 +830,7 @@ export default {
             this.listExportQuery.materialGroup =
               this.formCount.materialGroupValue; //物料组车型
           }
+
           console.log(
             "大众准时化未结明细-导出条件：" +
               JSON.stringify(this.listExportQuery)
@@ -868,8 +868,12 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
       this.dialogFormVisible = true;
     },
+
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;
@@ -982,7 +986,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化未结明细表";
+      this.listQuery.name = "大众发票与结算核对明细表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
index 4ad85d7e..19a560e5 100644
--- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
+++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
@@ -33,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -333,7 +333,13 @@
       append-to-body
       width="680px"
     >
-      <el-form ref="formCount" :inline="true" :rules="rules" :model="formCount" size="mini">
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -357,25 +363,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" style="width:300px"/>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-        <!-- <el-row>
+        <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="物料组(车型)" />
           </el-col>
@@ -398,7 +386,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
 
         <el-row>
           <el-col :md="4" :xs="24">
@@ -425,9 +413,9 @@
             <el-form-item label="CP7时间：" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="startTime">
               <el-date-picker
-                v-model="startTime"
+                v-model="formCount.startTime"
                 type="datetime"
                 size="small"
                 :picker-options="pickerOptions0"
@@ -439,9 +427,9 @@
             </el-form-item>
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
+            <el-form-item prop="endTime">
               <el-date-picker
-                v-model="endTime"
+                v-model="formCount.endTime"
                 type="datetime"
                 :picker-options="pickerOptions1"
                 size="small"
@@ -459,7 +447,7 @@
             <el-form-item label="KEEN号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="kennCode">
               <el-input v-model="formCount.kennCode" />
             </el-form-item>
           </el-col>
@@ -467,13 +455,30 @@
             <el-form-item label="底盘号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="chassisNumber">
               <el-input v-model="formCount.chassisNumber" />
             </el-form-item>
           </el-col>
         </el-row>
 
-      
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialCode">
+              <el-input v-model="formCount.materialCode" style="width:450px"/>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item prop="sapMaterialCode">
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -494,7 +499,12 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
-
+const cityOptions = [
+  { id: 0, name: "未结" },
+  { id: 1, name: "部分结算" },
+  { id: 2, name: "已结" },
+  /* { id: 3, name: "预批量" }, */
+];
 
 export default {
   name: "UnInvoiceSettledDetailDiff",
@@ -536,8 +546,8 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
-      startTime: "",
-      endTime: "",
+      // startTime: "",
+      // endTime: "",
       pickerOptionsCp7: {
         disabledDate: (time) => {
           let now = new Date();
@@ -552,8 +562,8 @@ export default {
         },
       },
       datetime5: [],
-      datetime7: [],
       checkedCities: [0],
+      cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
       radio: "0", //结算状态：0未结 1部分结算
@@ -588,15 +598,15 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        settledate: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
+        startTime: "",
+        endTime: "",
+        // name: "未结算对比",
+        // settledate: "",
+        // materialCode: "",
+        // sapMaterialCode: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        // version: "",
       },
       list: null,
       totalCount: 0,
@@ -651,7 +661,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -662,8 +672,6 @@ export default {
     this.getAllVersionList();
     this.getMaterialGroup();
     this.getList();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -694,16 +702,6 @@ export default {
         prop: "createdAt",
         width: 150,
       });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
       return tempsTabs;
     },
   },
@@ -781,7 +779,6 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -791,33 +788,42 @@ export default {
           if (this.formCount.materialCode != "") {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
+          // if (this.formCount.sapMaterialCode != "") {
+          //   this.listExportQuery.sapMaterialCode =
+          //     this.formCount.sapMaterialCode; //厂内物料号
+          // }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
           var getdate5 = JSON.stringify(this.datetime5);
           if (getdate5 != "[]") {
-            alert(this.datetime5[0]);
             this.listExportQuery.begin = this.datetime5
               ? this.datetime5[0] || undefined
               : undefined;
             this.listExportQuery.end = this.datetime5
               ? this.datetime5[1] || undefined
               : undefined;
+          } else {
+            this.listExportQuery.begin = undefined;
+            this.listExportQuery.end = undefined;
           }
-          if (this.startTime != "") {
-            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          }
-          if (this.endTime != "") {
-            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          }
+          this.listExportQuery.cp7begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
-          // if (this.formCount.materialGroupValue != "") {
-          //   this.listExportQuery.materialGroup =
-          //     this.formCount.materialGroupValue; //物料组车型
-          // }
-          console.log("准时化结算数量差异比对-导出条件：" + JSON.stringify(this.listExportQuery));
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.materialGroup =
+              this.formCount.materialGroupValue; //物料组车型
+          }
+          console.log(
+            "准时化结算数量差异比对-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
+          // this.formLoading = false;
+          // this.dialogFormVisible = false;
           this.$axios
             .gets(
               "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
@@ -851,8 +857,12 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
       this.dialogFormVisible = true;
     },
+
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;
@@ -1030,3 +1040,4 @@ export default {
 }
 </style>
 
+