带CP5和CP7日期的更改

vue/src/router/index.js

@@ -86,7 +86,8 @@ export const constantRoutes = [
     children: [
       {
         path: 'dashboard',
-        component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+        //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis
+        component: () => import('@/views/ux/backGroundWork'),
         name: 'Dashboard',
         meta: {
           title: '系统首页',
@@ -169,14 +170,14 @@ export const asyncRoutes = [
   /** when your routing map is too long, you can split it into small modules **/
   managerRouter,//系统首页
   personRouter,//系统管理
-  //basedataRouter,//基础数据维护
+  basedataRouter,//基础数据维护
-  //vwFisDataRouter,//结算与开票数据导入
+  vwFisDataRouter,//结算与开票数据导入
-  //billdataRouter,//销售结算与开票报表
+  billdataRouter,//销售结算与开票报表
   //businessdataRouter,
-  //wheeldataRouter,//大众看板和备件
+  wheeldataRouter,//大众看板和备件
-  pgfisPrint,//排序单打印
+  // pgfisPrint,//排序单打印
-  pgfis,//派格fis
+  // pgfis,//派格fis
-  //JobTimeDataRouter,//后台作业监控
+  JobTimeDataRouter,//后台作业监控
 
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }

vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@@ -369,7 +369,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+           <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="物料组(车型)" />
           </el-col>
@@ -378,12 +378,9 @@
               <el-select
                 v-model="formCount.materialGroupValue"
                 size="medium"
-                multiple
-                collapse-tags
                 filterable
                 clearable
-                style="width: 350px; margin-right: 15px"
+                style="width: 188px; margin-right: 15px"
-                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option

vue/src/views/ux/billManage/SettleDoorPanel/index.vue

@@ -5,6 +5,12 @@
     <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
+        <JobSelectVerson
+          :options="JobVersionList"
+          style="width: 150px; margin-left: -10px"
+          class="search-container"
+          @value-change="JobVersionValue"
+        ></JobSelectVerson>
         <el-button
           class="filter-item"
           size="mini"
@@ -372,9 +378,12 @@
               <el-select
                 v-model="formCount.materialGroupValue"
                 size="medium"
+                collapse-tags
+                multiple
                 filterable
                 clearable
-                style="width: 188px; margin-right: 15px"
+                @change="valueChange"
+                style="width: 350px; margin-right: 15px"
                 placeholder="请选择"
               >
                 <el-option
@@ -388,7 +397,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="CP5时间：" />
           </el-col>
@@ -407,6 +416,39 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="cp5startTime"
+                :picker-options="pickerOptions2"
+                type="datetime"
+                size="small"
+                @change="getdateValueCp5"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="cp5endTime"
+                :picker-options="pickerOptions3"
+                type="datetime"
+                size="small"
+                @change="getdateValCp5"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
@@ -447,16 +489,26 @@
             <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-input
+                v-model="formCount.kennCode"
+                :rows="5"
+                type="textarea"
+                placeholder="多个KEEN号，请以回车换行形式添加！"
+              />
             </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-form-item prop="chassisNumber">
-              <el-input v-model="formCount.chassisNumber" />
+              <el-input
+                v-model="formCount.chassisNumber"
+                :rows="5"
+                type="textarea"
+                placeholder="多个底盘号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -466,16 +518,26 @@
             <el-form-item label="客户零件号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="materialCode">
-              <el-input v-model="formCount.materialCode" />
+              <el-input
+                type="textarea"
+                v-model="formCount.materialCode"
+                :rows="5"
+                placeholder="多个客户零件号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
           <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
+            <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-input
+                v-model="formCount.sapMaterialCode"
+                :rows="5"
+                type="textarea"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -499,21 +561,25 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
-
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
   name: "SettleDoorPanel",
-  components: { Pagination, CRMTableHead },
+  components: { Pagination, CRMTableHead, JobSelectVerson },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      JobVersionList: [],
+      getmaterialGroupValue: "",
       rules: {
         versionValue: [
           { required: true, message: "必须输入！", trigger: "change" },
         ],
       },
+      JobversionValue: "",
+      JobversionValueVerson: "",
       pickerOptionsCp5: {
         disabledDate: (time) => {
           let now = new Date();
@@ -541,8 +607,22 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          return time.getTime() > new Date(this.cp5endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions3: {
+        disabledDate: (time) => {
+          return time.getTime() <= new Date(this.cp5startTime).getTime();
+        },
+      },
       startTime: "",
       endTime: "",
+      cp5startTime: "",
+      cp5endTime: "",
       pickerOptionsCp7: {
         disabledDate: (time) => {
           let now = new Date();
@@ -593,15 +673,14 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
+        startTime: "",
-        // datetime5: [],
+        endTime: "",
-        // datetime7: [],
+        cp5startTime: "",
-        settledate: "",
+        cp5endTime: "",
         materialCode: "",
         sapMaterialCode: "",
         chassisNumber: "",
         kennCode: "",
-        version: "",
       },
       list: null,
       totalCount: 0,
@@ -667,6 +746,7 @@ export default {
     this.getAllVersionList();
     this.getMaterialGroup();
     this.getList();
+    this.getJobVersionInfo();
     // this.getCurrentMonthFirst();
     // this.getCurrentMonthLast();
   },
@@ -713,6 +793,46 @@ export default {
     },
   },
   methods: {
+    valueChange(data) {
+      this.getmaterialGroupValue = "";
+      this.getmaterialGroupValue += data + ",";
+      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
+        0,
+        this.getmaterialGroupValue.length - 1
+      );
+    },
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    getJobVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          this.JobVersionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
+    //cp7
     getdateValue(val) {
       this.startTime = val;
       this.getbalanceIndexData();
@@ -721,6 +841,15 @@ export default {
       this.endTime = val;
       this.getbalanceIndexData();
     },
+    //cp5
+    getdateValueCp5(val) {
+      this.cp5startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateValCp5(val) {
+      this.cp5endTime = val;
+      this.getbalanceIndexData();
+    },
 
     getCurrentMonthFirst() {
       var date = new Date();
@@ -772,7 +901,7 @@ export default {
           response.items.forEach((element) => {
             let options = {};
             options.value = element.description;
-            options.label = element.description;
+            options.label = element.description + "/" + element.value;
             this.materialGroupList.push(options);
           });
         })
@@ -786,7 +915,8 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      // this.datetime7 = [];
+      this.cp5startTime = "";
+      this.cp5endTime = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -797,21 +927,18 @@ export default {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
           if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode = 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);
+          this.listExportQuery.begin = this.cp5startTime
-          if (getdate5 != "[]") {
+            ? this.cp5startTime
-            alert(this.datetime5[0]);
+            : undefined;
-            this.listExportQuery.begin = this.datetime5
+          this.listExportQuery.end = this.cp5endTime
-              ? this.datetime5[0] || undefined
+            ? this.cp5endTime
-              : undefined;
+            : undefined;
-            this.listExportQuery.end = this.datetime5
-              ? this.datetime5[1] || undefined
-              : undefined;
-          }
           if (this.startTime != "") {
             this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
           }
@@ -822,8 +949,7 @@ export default {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
           if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup =
+            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-              this.formCount.materialGroupValue; //物料组车型
           }
           console.log(
             "大众准时化结算门板价格差异比对报表-导出条件：" +
@@ -862,6 +988,10 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.startTime = "";
+      this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
       this.dialogFormVisible = true;
     },
     filterHandler(value, row, column) {
@@ -977,6 +1107,7 @@ export default {
       this.listLoading = true;
       //导入界面中超链接过来的参数
       this.listQuery.name = "大众准时化结算门板价格差异比对报表";
+      this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {

vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@@ -5,6 +5,12 @@
     <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
+        <JobSelectVerson
+          :options="JobVersionList"
+          style="width: 150px; margin-left: -10px"
+          class="search-container"
+          @value-change="JobVersionValue"
+        ></JobSelectVerson>
         <el-button
           class="filter-item"
           size="mini"
@@ -372,9 +378,12 @@
               <el-select
                 v-model="formCount.materialGroupValue"
                 size="medium"
+                collapse-tags
+                multiple
                 filterable
                 clearable
-                style="width: 188px; margin-right: 15px"
+                @change="valueChange"
+                style="width: 350px; margin-right: 15px"
                 placeholder="请选择"
               >
                 <el-option
@@ -388,7 +397,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="CP5时间：" />
           </el-col>
@@ -407,6 +416,39 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="cp5startTime"
+                :picker-options="pickerOptions2"
+                type="datetime"
+                size="small"
+                @change="getdateValueCp5"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="cp5endTime"
+                :picker-options="pickerOptions3"
+                type="datetime"
+                size="small"
+                @change="getdateValCp5"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
@@ -448,7 +490,12 @@
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
             <el-form-item prop="kennCode">
-              <el-input v-model="formCount.kennCode" />
+              <el-input
+                v-model="formCount.kennCode"
+                :rows="5"
+                type="textarea"
+                placeholder="多个KEEN号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
           <el-col :md="4" :xs="24">
@@ -456,7 +503,12 @@
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
             <el-form-item prop="chassisNumber">
-              <el-input v-model="formCount.chassisNumber" />
+              <el-input
+                v-model="formCount.chassisNumber"
+                :rows="5"
+                type="textarea"
+                placeholder="多个底盘号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -465,19 +517,29 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialCode">
-              <el-input v-model="formCount.materialCode" style="width:450px"/>
+              <el-input
+                type="textarea"
+                v-model="formCount.materialCode"
+                :rows="5"
+                placeholder="多个客户零件号，请以回车换行形式添加！"
+              />
             </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 prop="sapMaterialCode">
-              <el-input v-model="formCount.sapMaterialCode" />
+              <el-input
+                v-model="formCount.sapMaterialCode"
+                :rows="5"
+                type="textarea"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -499,16 +561,11 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
-const cityOptions = [
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-  { id: 0, name: "未结" },
-  { id: 1, name: "部分结算" },
-  { id: 2, name: "已结" },
-  /* { id: 3, name: "预批量" }, */
-];
 
 export default {
   name: "UnInvoiceSettledDetailDiff",
-  components: { Pagination, CRMTableHead },
+  components: { Pagination, CRMTableHead, JobSelectVerson },
   directives: { permission },
 
   data() {
@@ -519,6 +576,7 @@ export default {
           { required: true, message: "必须输入！", trigger: "change" },
         ],
       },
+      getmaterialGroupValue: "",
       pickerOptionsCp5: {
         disabledDate: (time) => {
           let now = new Date();
@@ -546,6 +604,19 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
+
+      pickerOptions2: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          return time.getTime() > new Date(this.cp5endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions3: {
+        disabledDate: (time) => {
+          return time.getTime() <= new Date(this.cp5startTime).getTime();
+        },
+      },
       // startTime: "",
       // endTime: "",
       pickerOptionsCp7: {
@@ -563,7 +634,7 @@ export default {
       },
       datetime5: [],
       checkedCities: [0],
-      cities: cityOptions,
+      JobVersionList: [],
       selectValue: "",
       selectNameValue: "",
       radio: "0", //结算状态：0未结 1部分结算
@@ -600,14 +671,15 @@ export default {
       formCount: {
         startTime: "",
         endTime: "",
-        // name: "未结算对比",
+        cp5startTime: "",
-        // settledate: "",
+        cp5endTime: "",
-        // materialCode: "",
+        materialCode: "",
-        // sapMaterialCode: "",
+        sapMaterialCode: "",
-        // chassisNumber: "",
+        chassisNumber: "",
-        // kennCode: "",
+        kennCode: "",
-        // version: "",
       },
+      cp5startTime: "",
+      cp5endTime: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -629,6 +701,7 @@ export default {
         materialGroup: undefined,
         begin: undefined,
         end: undefined,
+        sapCode: undefined,
       },
       listQuery: {
         taskId: "",
@@ -672,6 +745,7 @@ export default {
     this.getAllVersionList();
     this.getMaterialGroup();
     this.getList();
+    this.getJobVersionInfo();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -681,7 +755,11 @@ export default {
     /* 主表头 */
     getDefaultField() {
       var tempsTabs = [];
-
+      tempsTabs.push({
+        label: "版本号",
+        prop: "type",
+        width: 85,
+      });
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
@@ -702,12 +780,57 @@ export default {
         prop: "createdAt",
         width: 150,
       });
+      tempsTabs.push({
+        label: "说明",
+        prop: "remark",
+        width: 220,
+      });
       return tempsTabs;
     },
   },
   methods: {
+    valueChange(data) {
+      this.getmaterialGroupValue = "";
+      this.getmaterialGroupValue += data + ",";
+      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
+        0,
+        this.getmaterialGroupValue.length - 1
+      );
+    },
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    getJobVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          this.JobVersionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
     getdateValue(val) {
       this.startTime = val;
+      alert(this.startTime);
       this.getbalanceIndexData();
     },
     getdateVal(val) {
@@ -715,6 +838,16 @@ export default {
       this.getbalanceIndexData();
     },
 
+    //cp5
+    getdateValueCp5(val) {
+      this.cp5startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateValCp5(val) {
+      this.cp5endTime = val;
+      this.getbalanceIndexData();
+    },
+
     getCurrentMonthFirst() {
       var date = new Date();
       date.setDate(1);
@@ -765,7 +898,7 @@ export default {
           response.items.forEach((element) => {
             let options = {};
             options.value = element.description;
-            options.label = element.description;
+            options.label = element.description + "/" + element.value;
             this.materialGroupList.push(options);
           });
         })
@@ -779,7 +912,21 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
     },
+    // var getdate5 = JSON.stringify(this.datetime5);
+    // if (getdate5 != "[]") {
+    //   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;
+    // }
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
@@ -788,25 +935,19 @@ export default {
           if (this.formCount.materialCode != "") {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
-          // if (this.formCount.sapMaterialCode != "") {
+          if (this.formCount.sapMaterialCode != "") {
-          //   this.listExportQuery.sapMaterialCode =
+            this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号
-          //     this.formCount.sapMaterialCode; //厂内物料号
+          }
-          // }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
-          var getdate5 = JSON.stringify(this.datetime5);
+          //cp5
-          if (getdate5 != "[]") {
+          this.listExportQuery.begin = this.cp5startTime
-            this.listExportQuery.begin = this.datetime5
+            ? this.cp5startTime
-              ? this.datetime5[0] || undefined
+            : undefined;
-              : undefined;
+          this.listExportQuery.end = this.cp5endTime
-            this.listExportQuery.end = this.datetime5
+            ? this.cp5endTime
-              ? this.datetime5[1] || undefined
+            : undefined;
-              : undefined;
-          } else {
-            this.listExportQuery.begin = undefined;
-            this.listExportQuery.end = undefined;
-          }
           this.listExportQuery.cp7begin = this.startTime
             ? this.startTime
             : undefined;
@@ -815,15 +956,12 @@ export default {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
           if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup =
+            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-              this.formCount.materialGroupValue; //物料组车型
           }
           console.log(
             "准时化结算数量差异比对-导出条件：" +
               JSON.stringify(this.listExportQuery)
           );
-          // this.formLoading = false;
-          // this.dialogFormVisible = false;
           this.$axios
             .gets(
               "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
@@ -857,9 +995,11 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
-      this.datetime5 = [];
+      //this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
       this.dialogFormVisible = true;
     },
 
@@ -975,7 +1115,8 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众结算未发运核对明细表";
+      this.listQuery.name = "大众准时化结算数量差异比对表";
+      this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {