Browse Source

前端代码提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
7eb26cca8c
  1. 2
      vue/src/components/Pagination/index.vue
  2. 12
      vue/src/router/index.js
  3. 6
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  4. 15
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  5. 109
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  6. 68
      vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
  7. 130
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  8. 131
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  9. 129
      vue/src/views/ux/billManage/UnSettledDiff/index.vue

2
vue/src/components/Pagination/index.vue

@ -35,7 +35,7 @@ export default {
pageSizes: { pageSizes: {
type: Array, type: Array,
default() { default() {
return [15, 200, 300, 500] return [15, 50, 100, 500]
} }
}, },
layout: { layout: {

12
vue/src/router/index.js

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

6
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

@ -461,7 +461,7 @@ export default {
ifr.setAttribute("name", "printPdf" + date); ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob); ifr.src = window.URL.createObjectURL(blob);
document.body.appendChild(ifr); document.body.appendChild(ifr);
this.doPrint("printPdf" + date); this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
window.URL.revokeObjectURL(ifr.src); // URL window.URL.revokeObjectURL(ifr.src); // URL
this.dialogFormVisible = false; this.dialogFormVisible = false;
}, },
@ -567,12 +567,12 @@ export default {
} else { } else {
this.fileQuery.dataname = JSON.stringify(response.item); this.fileQuery.dataname = JSON.stringify(response.item);
console.log( console.log(
"柱板-调用Handlers/Handler1.ashx?report=menban传的值:" + "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值:" +
JSON.stringify(this.fileQuery.dataname) JSON.stringify(this.fileQuery.dataname)
); );
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=menban", "/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

15
vue/src/views/pg-fis/basedate/m100Online/index.vue

@ -45,6 +45,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-collapse accordion>
<el-collapse-item>
<template slot="title">
其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
</template>
<el-form-item label="版本:" prop="Version"> <el-form-item label="版本:" prop="Version">
<el-input <el-input
v-model="listQuery.Version" v-model="listQuery.Version"
@ -179,8 +184,9 @@
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-collapse-item>
<el-form-item style="margin-top: -20px"> </el-collapse>
<el-form-item style="margin-top: -10px">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -244,6 +250,7 @@
><strong>柱护板重打和作废</strong></el-button ><strong>柱护板重打和作废</strong></el-button
> >
</el-form-item> </el-form-item>
<!-- </el-row> --> <!-- </el-row> -->
</el-form> </el-form>
</flexbox> </flexbox>
@ -1386,7 +1393,9 @@ export default {
this.hostPrintQuery this.hostPrintQuery
) )
.then((response) => { .then((response) => {
console.log("重新或补打打印门板装箱单"+JSON.stringify(this.hostPrintQuery)); console.log(
"重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
);
console.log(response); console.log(response);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({

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

@ -480,7 +480,7 @@
v-model="formCount.kennCode" v-model="formCount.kennCode"
style="width: 380px" style="width: 380px"
:rows="4" :rows="4"
placeholder="请输入正确的KENN号!" placeholder="多个KENN号,请以回车换行形式添加!"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -511,7 +511,7 @@
style="width: 450px" style="width: 450px"
type="textarea" type="textarea"
:rows="4" :rows="4"
placeholder="请输入正确底盘号!" placeholder="多个底盘号,请以回车换行形式添加!"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -528,7 +528,7 @@
style="width: 450px" style="width: 450px"
type="textarea" type="textarea"
:rows="4" :rows="4"
placeholder="请输入正确的客户零件号!" placeholder="多个客户零件号,请以回车换行形式添加!"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -544,7 +544,7 @@
style="width: 450px" style="width: 450px"
type="textarea" type="textarea"
:rows="4" :rows="4"
placeholder="请输入正确厂内零件号!" placeholder="多个厂内零件号,请以回车换行形式添加!"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -621,7 +621,6 @@ export default {
paster: "", paster: "",
pasterValue: "", pasterValue: "",
JobVersionList: [], JobVersionList: [],
JobVersionValue: "",
rules: { rules: {
versionValue: [ versionValue: [
{ required: true, message: "必须输入!", trigger: "change" }, { required: true, message: "必须输入!", trigger: "change" },
@ -747,6 +746,7 @@ export default {
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
type:""
}, },
page: 1, page: 1,
JobversionValue: "", JobversionValue: "",
@ -800,7 +800,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -821,11 +825,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
// tempsTabs.push({ tempsTabs.push({
// label: "", label: "说明",
// prop: "actionName", prop: "remark",
// width: 120, width: 220,
// }); });
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "stateName", // prop: "stateName",
@ -835,6 +839,12 @@ export default {
}, },
}, },
methods: { methods: {
//
JobVersionValue(params) {
//
this.JobversionValue = params.value;
this.getList();
},
getJobVersionInfo() { getJobVersionInfo() {
// //
//this.listLoading = true; //this.listLoading = true;
@ -891,22 +901,22 @@ export default {
} }
}, },
//excel //excel
pasteExcelToKennCode(e) { // pasteExcelToKennCode(e) {
let source = e.clipboardData.getData("Text"); // let source = e.clipboardData.getData("Text");
// // //
let rows = source.split("\r\n"); // // let rows = source.split("\r\n"); //
this.dataKenCode = ""; // this.dataKenCode = "";
for (let i = 0; i < rows.length; i++) { // for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") { // if (rows[i] != "") {
// // //
let columns = rows[i].split("\t"); // // let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) { // for (let j = 0; j < columns.length; j++) {
this.dataKenCode += columns[j] + ","; // this.dataKenCode += columns[j] + ",";
} // }
} // }
} // }
}, // },
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ","; this.getmaterialGroupValue += data + ",";
@ -1040,29 +1050,29 @@ export default {
); );
this.formLoading = false; this.formLoading = false;
this.dialogFormVisible = false; this.dialogFormVisible = false;
// this.$axios this.$axios
// .gets( .gets(
// "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
// this.listExportQuery this.listExportQuery
// ) )
// .then((res) => { .then((res) => {
// let taskid = res; let taskid = res;
// if (Number.isInteger(taskid)) { if (Number.isInteger(taskid)) {
// this.$notify({ this.$notify({
// title: "", title: "成功",
// message: ":" + taskid, message: "任务生成成功!任务号:" + taskid,
// type: "success", type: "success",
// duration: 2000, duration: 2000,
// }); });
// } }
// this.getList(); this.getList();
// this.formLoading = false; this.formLoading = false;
// this.dialogFormVisible = false; this.dialogFormVisible = false;
// }) })
// .catch(() => { .catch(() => {
// this.formLoading = false; this.formLoading = false;
// this.dialogFormVisible = false; this.dialogFormVisible = false;
// }); });
} }
}); });
}, },
@ -1202,6 +1212,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众发票与结算核对明细表"; this.listQuery.name = "大众发票与结算核对明细表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

68
vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -370,7 +376,13 @@
</el-col> </el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px"> <el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode"> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width: 300px" /> <el-input
v-model="formCount.materialCode"
type="textarea"
style="width: 450px"
:rows="4"
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -394,16 +406,11 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; 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 { export default {
name: "InvoiceSettledDiff", name: "InvoiceSettledDiff",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -459,7 +466,7 @@ export default {
datetime5: [], datetime5: [],
datetime7: [], datetime7: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions, JobVersionList: [],
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
@ -531,6 +538,8 @@ export default {
name: "", name: "",
}, },
page: 1, page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false, dialogFormVisible: false,
multipleSelection: [], multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 260,
@ -614,6 +623,45 @@ export default {
}, },
}, },
methods: { 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) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -691,6 +739,7 @@ export default {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; // this.listExportQuery.version = this.formCount.versionValue; //
//
this.listExportQuery.matialCode = this.formCount.materialCode this.listExportQuery.matialCode = this.formCount.materialCode
? this.formCount.materialCode ? this.formCount.materialCode
: undefined; : undefined;
@ -875,6 +924,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众发票与结算核对汇总表"; this.listQuery.name = "大众发票与结算核对汇总表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

130
vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -372,9 +378,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -415,7 +424,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode"> <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-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -423,7 +437,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -432,19 +451,29 @@
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </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-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-form-item>
</el-col> </el-col>
<!-- <el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" /> <el-form-item label="厂内零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapMaterialCode"> <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-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -466,16 +495,11 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; 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 { export default {
name: "UnsettledDetail", name: "UnsettledDetail",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -486,6 +510,8 @@ export default {
{ required: true, message: "必须输入!", trigger: "change" }, { required: true, message: "必须输入!", trigger: "change" },
], ],
}, },
JobVersionList: [],
getmaterialGroupValue: "",
pickerOptionsCp5: { pickerOptionsCp5: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -530,12 +556,13 @@ export default {
}, },
datetime5: [], datetime5: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions,
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
versionList: [], versionList: [],
materialGroupList: [], materialGroupList: [],
JobversionValue: "",
JobversionValueVerson: "",
// //
openView: false, openView: false,
versionValue: "", versionValue: "",
@ -594,10 +621,12 @@ export default {
materialGroup: undefined, materialGroup: undefined,
begin: undefined, begin: undefined,
end: undefined, end: undefined,
sapCode: undefined,
}, },
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
type: "",
}, },
page: 1, page: 1,
dialogFormVisible: false, dialogFormVisible: false,
@ -637,6 +666,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -648,7 +678,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -669,11 +703,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
// tempsTabs.push({ tempsTabs.push({
// label: "", label: "说明",
// prop: "actionName", prop: "remark",
// width: 120, width: 220,
// }); });
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "stateName", // prop: "stateName",
@ -683,6 +717,45 @@ export default {
}, },
}, },
methods: { methods: {
//
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;
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
getdateValue(val) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -742,7 +815,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -765,10 +838,9 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = 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 != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
} }
@ -788,8 +860,7 @@ export default {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }
if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
console.log( console.log(
@ -948,6 +1019,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众准时化未结明细表"; this.listQuery.name = "大众准时化未结明细表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

131
vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@ -6,6 +6,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -373,9 +379,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
multiple
collapse-tags
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -416,7 +425,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode"> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input
type="textarea"
v-model="formCount.kennCode"
:rows="4"
placeholder="多个KENN号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -424,7 +438,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber"> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input
v-model="formCount.chassisNumber"
type="textarea"
:rows="4"
placeholder="多个底盘号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -433,19 +452,29 @@
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </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-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width: 450px" /> <el-input
v-model="formCount.materialCode"
type="textarea"
:rows="4"
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" /> <el-form-item label="厂内零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapMaterialCode"> <el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" /> <el-input
v-model="formCount.sapMaterialCode"
type="textarea"
:rows="4"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -467,16 +496,11 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; 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 { export default {
name: "UnSettleDiffExport", name: "UnSettleDiffExport",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -530,8 +554,9 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
JobVersionList: [],
getmaterialGroupValue: "",
checkedCities: [0], checkedCities: [0],
cities: cityOptions,
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
@ -595,12 +620,15 @@ export default {
materialGroup: undefined, materialGroup: undefined,
begin: undefined, begin: undefined,
end: undefined, end: undefined,
sapCode:undefined
}, },
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
}, },
page: 1, page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false, dialogFormVisible: false,
multipleSelection: [], multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 260,
@ -638,6 +666,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -649,7 +678,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -670,11 +703,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
// tempsTabs.push({ tempsTabs.push({
// label: "", label: "说明",
// prop: "actionName", prop: "remark",
// width: 120, width: 220,
// }); });
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "stateName", // prop: "stateName",
@ -684,6 +717,45 @@ export default {
}, },
}, },
methods: { 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) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -743,7 +815,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -766,13 +838,14 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = 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 != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
} }
//CP5
var getdate5 = JSON.stringify(this.datetime5); var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") { if (getdate5 != "[]") {
this.listExportQuery.begin = this.datetime5 this.listExportQuery.begin = this.datetime5
@ -789,8 +862,7 @@ export default {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }
if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
console.log( console.log(
@ -949,6 +1021,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众准时化未结差异比对表"; this.listQuery.name = "大众准时化未结差异比对表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

129
vue/src/views/ux/billManage/UnSettledDiff/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -372,9 +378,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -415,7 +424,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode"> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input
v-model="formCount.kennCode"
type="textarea"
:rows="6"
placeholder="多个KENN号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -423,7 +437,12 @@
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber"> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input
v-model="formCount.chassisNumber"
type="textarea"
:rows="6"
placeholder="多个底盘号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -432,19 +451,29 @@
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </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-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width: 450px" /> <el-input
v-model="formCount.materialCode"
type="textarea"
:rows="6"
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" /> <el-form-item label="厂内零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapMaterialCode"> <el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" /> <el-input
v-model="formCount.sapMaterialCode"
type="textarea"
:rows="6"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -466,16 +495,11 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; 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 { export default {
name: "UnSettledDiff", name: "UnSettledDiff",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -529,10 +553,11 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
JobVersionList: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions,
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
getmaterialGroupValue: "",
radio: "0", //0 1 radio: "0", //0 1
versionList: [], versionList: [],
materialGroupList: [], materialGroupList: [],
@ -589,6 +614,7 @@ export default {
listExportQuery: { listExportQuery: {
version: "", version: "",
materialCode: undefined, materialCode: undefined,
sapCode: undefined,
kenncode: undefined, kenncode: undefined,
chassisNumber: undefined, chassisNumber: undefined,
materialGroup: undefined, materialGroup: undefined,
@ -600,6 +626,8 @@ export default {
name: "", name: "",
}, },
page: 1, page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false, dialogFormVisible: false,
multipleSelection: [], multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 260,
@ -637,6 +665,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -648,7 +677,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -669,11 +702,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
// tempsTabs.push({ tempsTabs.push({
// label: "", label: "说明",
// prop: "actionName", prop: "remark",
// width: 120, width: 220,
// }); });
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "stateName", // prop: "stateName",
@ -683,6 +716,45 @@ export default {
}, },
}, },
methods: { 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) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -742,7 +814,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -765,10 +837,9 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = 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 != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
} }
@ -788,8 +859,7 @@ export default {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }
if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
console.log( console.log(
@ -948,6 +1018,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "未结算对比"; this.listQuery.name = "未结算对比";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

Loading…
Cancel
Save