PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

日常打印M100信息相关需求更改

master
LAPTOP-AKBAACR8\An.Hr 2 years ago
parent
40193d133f
commit
d39dd61f48
3 changed files with 78 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      vue/src/router/index.js
  2. 31
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  3. 145
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

4
vue/src/router/index.js
View File

@ -64,10 +64,10 @@ export const constantRoutes = [
}, },
{ {
path: '/login', path: '/login',
//component: () => import('@/views/login/index'), component: () => import('@/views/login/index'),
//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), // component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
hidden: true hidden: true
}, },
{ {

31
vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
View File

@ -286,19 +286,17 @@ export default {
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight; let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度 this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
//this.tableHeight = offsetHei -260 //this.tableHeight = offsetHei -260
}); });
}, },
created() { // created() {
this.getList(); // this.getList();
}, // },
watch: { watch: {
customerInfosZHB: { customerInfosZHB: {
handler(newVal) { handler(newVal) {
debugger
console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal)); console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
@ -306,6 +304,7 @@ export default {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.printType = 2; //2时补打 this.customerInfo.printType = 2; //2时补打
this.customerInfo.productLine = element.ProductLine; this.customerInfo.productLine = element.ProductLine;
this.customerInfo.productGroup = element.productGroup
}); });
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
this.getList(); this.getList();
@ -453,7 +452,6 @@ export default {
* @param {Object} data * @param {Object} data
*/ */
getList(data) { getList(data) {
//debugger
this.listLoading = true; this.listLoading = true;
let inputParam = {}; let inputParam = {};
if (data != undefined) { if (data != undefined) {
@ -474,7 +472,7 @@ export default {
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
inputParam.productLine = this.customerInfo.productLine; inputParam.productLine = this.customerInfo.productLine;
} }
inputParam.Groupname = this.customerInfo.productGroup;
console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery)); console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
this.$axios this.$axios
.gets( .gets(
@ -495,7 +493,6 @@ export default {
}, },
//补打-柱护板 //补打-柱护板
handleReplenishPrint() { handleReplenishPrint() {
debugger
this.isEdit = true; this.isEdit = true;
if (this.multipleSelection == null || this.multipleSelection.length == 0) { if (this.multipleSelection == null || this.multipleSelection.length == 0) {
this.$message({ this.$message({
@ -510,6 +507,7 @@ export default {
var params = { var params = {
printType: 2, printType: 2,
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
Groupname: this.customerInfo.productGroup,
beginVin: beginVin1, beginVin: beginVin1,
endVin: endVin1, endVin: endVin1,
m100IdList: [] m100IdList: []
@ -558,18 +556,15 @@ export default {
*/ */
private_printZhuHuBan(input) private_printZhuHuBan(input)
{ {
debugger //门板 /api/newjit/bill-m100/save-zhuhuban-report
//门板
//传递大众顺序号起止 //传递大众顺序号起止
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/save-zhuhuban-report", "/api/newjit/bill-m100/save-group-zhuhuban-report",
input input
) )
.then((response) => { .then((response) => {
console.log("保存柱护板报表"); console.log("保存柱护板报表",response,response.status);
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -590,9 +585,7 @@ export default {
loadInput loadInput
) )
.then((response) => { .then((response) => {
console.log("加载柱护板报表"); console.log("加载柱护板报表",response,response.status);
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -606,8 +599,7 @@ export default {
response.item response.item
); );
//this.fileQuery.dataname = ""; //this.fileQuery.dataname = "";
console.log("打印json"); console.log("打印json",this.fileQuery.dataname);
console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban",
@ -615,7 +607,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response);
this.formLoading = false; this.formLoading = false;
this.isDisable = false; this.isDisable = false;
this.printpdf(response); //打印我文件流 this.printpdf(response); //打印我文件流

145
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
View File

@ -27,13 +27,13 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="productLine"> <el-form-item prop="productLine">
<el-select <el-select
v-model="listQuery.productLine" v-model="listQuery.productLine"
clearable clearable
placeholder="请选择" placeholder="请选择"
size="medium" size="medium"
style="margin-right: 15px" style="margin-right: 10px"
@change="valueselectChange" @change="valueselectChange"
> >
<el-option <el-option
@ -44,6 +44,27 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 柱护板时候显示 -->
<el-form-item
prop="productGroup"
v-show="this.listQuery.productType == 2"
>
<el-select
v-model="listQuery.productGroup"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 10px"
@change="GroupselectChange"
>
<el-option
v-for="(item,key) in PLChildGroupList"
:key="key"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -140,14 +161,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div id="app"> <div id="app">
<div <div style="border: solid 1px darkgray;border-radius: 5px;margin: 5px;padding: 5px;">
style="
border: solid 1px darkgray;
border-radius: 5px;
margin: 5px;
padding: 5px;
"
>
<span ref="sp01">{{ content01 }}</span> <span ref="sp01">{{ content01 }}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span ref="sp05">{{ content05 }}</span> <span ref="sp05">{{ content05 }}</span>
@ -174,6 +188,7 @@
</el-drawer> </el-drawer>
<!--门板补打--> <!--门板补打-->
<el-drawer <el-drawer
v-if="drawerbudaMBPrint"
title="门板补打" title="门板补打"
:visible.sync="drawerbudaMBPrint" :visible.sync="drawerbudaMBPrint"
direction="rtl" direction="rtl"
@ -201,9 +216,9 @@
<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB> <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
</el-drawer> </el-drawer>
<!--柱护板补打--> <!--柱护板补打-->
<el-drawer <el-drawer
v-if="drawerbudaZHBPrint"
title="柱护板补打" title="柱护板补打"
:visible.sync="drawerbudaZHBPrint" :visible.sync="drawerbudaZHBPrint"
direction="rtl" direction="rtl"
@ -212,8 +227,6 @@
<budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB> <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
</el-drawer> </el-drawer>
<!--柱护板重打和作废--> <!--柱护板重打和作废-->
<el-drawer <el-drawer
title="柱护板作废" title="柱护板作废"
@ -402,9 +415,9 @@
type="primary" type="primary"
:disabled="isDisable" :disabled="isDisable"
@click="save" @click="save"
v-debounce="debounceClick"
>确认</el-button >确认</el-button
> >
<!-- v-debounce="debounceClick" -->
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -414,7 +427,7 @@
<pagination <pagination
v-show="totalCount > 0" v-show="totalCount > 0"
:total="totalCount" :total="totalCount"
style="margin-bottom: -5px; float: right" style="float: right"
:page.sync="page" :page.sync="page"
:limit.sync="listQuery.MaxResultCount" :limit.sync="listQuery.MaxResultCount"
@pagination="getList" @pagination="getList"
@ -558,6 +571,7 @@ export default {
MaxResultCount: 15, MaxResultCount: 15,
productType: 1, //1:门板；2:柱护板 productType: 1, //1:门板；2:柱护板
ProductLine: undefined, ProductLine: undefined,
productGroup:undefined,//仅在柱护板时候显示
Version: undefined, Version: undefined,
printBillNum: undefined, printBillNum: undefined,
serialNumBegin: undefined, serialNumBegin: undefined,
@ -584,6 +598,7 @@ export default {
BillStatus: undefined, BillStatus: undefined,
CanNotPrint: false, CanNotPrint: false,
ZHBBillStatus: undefined, ZHBBillStatus: undefined,
GroupNmae:undefined,
}, },
listExportQuery: { listExportQuery: {
erpAssemblyCode: undefined, erpAssemblyCode: undefined,
@ -611,6 +626,7 @@ export default {
endHostSN: undefined, endHostSN: undefined,
beginVin: undefined, beginVin: undefined,
endVin: undefined, endVin: undefined,
Groupname: undefined,
}, },
vinPrintQuery: { vinPrintQuery: {
printType: undefined, //0:打印;1:重打;2:补打; printType: undefined, //0:打印;1:重打;2:补打;
@ -639,6 +655,7 @@ export default {
details: [], //修改子表数据源 details: [], //修改子表数据源
PLList: [], //产线下拉 PLList: [], //产线下拉
PLChildList: [], //筛选后产线下拉 PLChildList: [], //筛选后产线下拉
PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
productTypeList: [ productTypeList: [
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, { id: 2, name: "柱护板" },
@ -651,12 +668,11 @@ export default {
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight; let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 67 - 79; //57为footer高度，79为页面上部标签高度 this.tableHeight = offsetHei - boxH - 67 - 79 - 70; //57为footer高度，79为页面上部标签高度
//this.tableHeight = offsetHei -260 //this.tableHeight = offsetHei -260
}); });
this.getPLChildGroupList()
let timer = setInterval(() => { let timer = setInterval(() => {
this.open(); this.open();
}, 5000); }, 5000);
@ -742,12 +758,10 @@ export default {
}, },
methods: { methods: {
opens() { opens() {
this.getList(); this.getList();
}, },
open() { open() {
// let productLineList = []; // let productLineList = [];
// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
// productLineList.forEach(element => { // productLineList.forEach(element => {
// element=this.listQuery.productLine; // element=this.listQuery.productLine;
// }); // });
@ -764,9 +778,7 @@ export default {
productLineListMain.productLineList.push(itm.productLineCode); productLineListMain.productLineList.push(itm.productLineCode);
}); });
console.log( console.log("门版-主界面传过来的值：" + JSON.stringify(productLineListMain));
"门版-主界面传过来的值：" + JSON.stringify(productLineListMain)
);
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/product-line-timeout-remind", "/api/newjit/bill-m100/product-line-timeout-remind",
@ -780,9 +792,7 @@ export default {
}); });
return; return;
} else { } else {
console.log( console.log("超时提醒-接口传过来的值：" + JSON.stringify(response.item));
"超时提醒-接口传过来的值：" + JSON.stringify(response.item)
);
if (response.item !== null) { if (response.item !== null) {
response.item.forEach((JKITEM) => { response.item.forEach((JKITEM) => {
@ -794,9 +804,6 @@ export default {
"分钟没收到报文\xa0\xa0\xa0\xa0"; "分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息 //写提示信息
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp01.style.color = "red"; this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold"; this.$refs.sp01.style.fontWeight = "bold";
} else { } else {
@ -811,9 +818,6 @@ export default {
"分钟没收到报文\xa0\xa0\xa0\xa0"; "分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息 //写提示信息
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp05.style.color = "red"; this.$refs.sp05.style.color = "red";
this.$refs.sp05.style.fontWeight = "bold"; this.$refs.sp05.style.fontWeight = "bold";
} else { } else {
@ -828,9 +832,6 @@ export default {
"分钟没收到报文\xa0\xa0\xa0\xa0"; "分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息 //写提示信息
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp07.style.color = "red"; this.$refs.sp07.style.color = "red";
this.$refs.sp07.style.fontWeight = "bold"; this.$refs.sp07.style.fontWeight = "bold";
} else { } else {
@ -846,9 +847,6 @@ export default {
"分钟没收到报文"; "分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息 //写提示信息
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp08.style.color = "red"; this.$refs.sp08.style.color = "red";
this.$refs.sp08.style.fontWeight = "bold"; this.$refs.sp08.style.fontWeight = "bold";
} else { } else {
@ -980,8 +978,6 @@ export default {
//抽屉 //抽屉
handleDrawerOpen(param) { handleDrawerOpen(param) {
this.drawer = true; this.drawer = true;
//console.log(510)
//console.log(param)
var parentId = param.assemblyID; //主键id var parentId = param.assemblyID; //主键id
this.customerInfos = [ this.customerInfos = [
{ {
@ -1000,7 +996,6 @@ export default {
.then((response) => { .then((response) => {
this.form = response.item; this.form = response.item;
//this.details = response.item.details; //this.details = response.item.details;
//console.log(this.details);
}); });
}, },
/** 导出功能 */ /** 导出功能 */
@ -1080,7 +1075,6 @@ export default {
handleAddDetails() { handleAddDetails() {
if (this.form.details === undefined) { if (this.form.details === undefined) {
this.form.details = []; this.form.details = [];
//console.log(679);
} }
let obj = {}; let obj = {};
obj.partCode = ""; obj.partCode = "";
@ -1088,14 +1082,10 @@ export default {
obj.partNum = ""; obj.partNum = "";
obj.isKey = false; obj.isKey = false;
obj.description = ""; obj.description = "";
//console.log(this.form.details);
this.form.details.push(obj); this.form.details.push(obj);
//console.log(688);
}, },
handleDeleteDetails(index) { handleDeleteDetails(index) {
this.form.details.splice(index, 1); this.form.details.splice(index, 1);
//console.log(693);
}, },
/** 格式化字段 */ /** 格式化字段 */
@ -1138,9 +1128,8 @@ export default {
this.listQueryList.BillStatus = 2; //状态 this.listQueryList.BillStatus = 2; //状态
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 this.listQueryList.ProductLine = this.listQuery.productLine; //产线
this.listQueryList.CanNotPrint = false; //不可打印 this.listQueryList.CanNotPrint = false; //不可打印
console.log( this.listQueryList.GroupNmae = this.listQuery.productGroup
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList));
);
//this.click(); //this.click();
this.$axios this.$axios
.gets("/api/newjit/bill-m100/list", this.listQueryList) .gets("/api/newjit/bill-m100/list", this.listQueryList)
@ -1163,9 +1152,7 @@ export default {
this.$axios this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId) .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => { .then((response) => {
//console.log(partCode)
if (partCode !== "" && partCode !== undefined) { if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter( this.list = response.item.details.filter(
(u) => u.partCode === partCode (u) => u.partCode === partCode
); );
@ -1207,6 +1194,9 @@ export default {
]; ];
} }
}, },
GroupselectChange(val){
this.customerInfosZHB[0].productGroup = val
},
handleImportSAP() {}, handleImportSAP() {},
handleFilter() { handleFilter() {
@ -1256,6 +1246,7 @@ export default {
endHostSN: undefined, endHostSN: undefined,
beginVin: undefined, beginVin: undefined,
endVin: undefined, endVin: undefined,
Groupname: undefined,
}), }),
(this.hostCheckQuery.printType = 0); (this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0; this.hostPrintQuery.printType = 0;
@ -1274,6 +1265,7 @@ export default {
(this.printNumZHB = "24"), (this.printNumZHB = "24"),
(this.hostSNQuery.productLine = this.listQuery.productLine); (this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostPrintQuery.productLine = this.listQuery.productLine; this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.Groupname = this.listQuery.productGroup;
//后端服务更改了 前端跟着更改成以下方式 //后端服务更改了 前端跟着更改成以下方式
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
//门板 //门板
@ -1285,8 +1277,7 @@ export default {
this.hostSNQuery this.hostSNQuery
) )
.then((response) => { .then((response) => {
console.log("获取hostsn大众顺序号起始"); console.log("获取hostsn大众顺序号起始",response.item);
console.log(response.item);
if (response.item !== null) { if (response.item !== null) {
this.form.beginHostSN = parseInt(response.item); this.form.beginHostSN = parseInt(response.item);
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
@ -1315,7 +1306,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("获取hostsn大众顺序号起始"); console.log("获取hostsn大众顺序号起始");
console.log(response.item);
if (response.item !== null) { if (response.item !== null) {
this.form.beginHostSN = parseInt(response.item); this.form.beginHostSN = parseInt(response.item);
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
@ -1616,7 +1606,6 @@ export default {
*/ */
private_printMenBan() private_printMenBan()
{ {
debugger
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/save-menban-report", "/api/newjit/bill-m100/save-menban-report",
@ -1624,8 +1613,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("保存门板报表"); console.log("保存门板报表");
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -1642,8 +1629,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("加载门板报表"); console.log("加载门板报表");
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -1658,7 +1643,6 @@ export default {
); );
//this.fileQuery.dataname = ""; //this.fileQuery.dataname = "";
console.log("打印json"); console.log("打印json");
console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=menban", "/Handlers/Handler1.ashx?report=menban",
@ -1666,7 +1650,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response);
this.formLoading = false; this.formLoading = false;
this.isDisable = false; this.isDisable = false;
this.printpdf(response); //打印我文件流 this.printpdf(response); //打印我文件流
@ -1687,18 +1670,16 @@ export default {
*/ */
private_printZhuHuBan(isSelAll = true) private_printZhuHuBan(isSelAll = true)
{ {
debugger console.log(1702,this.hostPrintQuery)
//门板 //门板 /api/newjit/bill-m100/save-zhuhuban-report
//传递大众顺序号起止 //传递大众顺序号起止
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/save-zhuhuban-report", "/api/newjit/bill-m100/save-group-zhuhuban-report",
this.hostPrintQuery this.hostPrintQuery
) )
.then((response) => { .then((response) => {
console.log("保存柱护板报表"); console.log("保存柱护板报表");
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -1719,8 +1700,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("加载柱护板报表"); console.log("加载柱护板报表");
console.log(response);
console.log(response.status);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
message: response.message, message: response.message,
@ -1735,7 +1714,6 @@ export default {
); );
//this.fileQuery.dataname = ""; //this.fileQuery.dataname = "";
console.log("打印json"); console.log("打印json");
console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban",
@ -1743,7 +1721,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response);
this.formLoading = false; this.formLoading = false;
this.isDisable = false; this.isDisable = false;
this.printpdf(response); //打印我文件流 this.printpdf(response); //打印我文件流
@ -1762,14 +1739,13 @@ export default {
//获取所有产线 //获取所有产线
getProductLine() { getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId; this.listPLQuery.UserId = this.userInfo.userId;
console.log( // console.log(
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + // "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
this.listPLQuery.UserId // this.listPLQuery.UserId
); // );
this.$axios this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery) .gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => { .then((response) => {
//console.log(response);
this.PLList = response.item; this.PLList = response.item;
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType) (u) => u.productType === parseInt(this.listQuery.productType)
@ -1787,21 +1763,19 @@ export default {
]; ];
} }
this.getList(); this.getList();
//console.log(this.PLList)
}) })
.catch(() => {}); .catch(() => {});
}, },
//产线类型变更 //产线类型变更
ptypeselectChange() { ptypeselectChange() {
this.$forceUpdate(); this.$forceUpdate();
//console.log(this.listQuery.productType);
this.listQuery.productLine = ""; this.listQuery.productLine = "";
this.listQuery.productGroup = undefined
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType) (u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => { ).sort((a, b) => {
return a.productLineCode - b.productLineCode; return a.productLineCode - b.productLineCode;
}); });
//console.log(this.PLList)
//变更打印按钮文字 //变更打印按钮文字
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
this.$refs.btn1.$el.innerText = "打印门板发货排序单"; this.$refs.btn1.$el.innerText = "打印门板发货排序单";
@ -1898,12 +1872,23 @@ export default {
return temp; return temp;
}, },
// 获取PLChildGroupList
getPLChildGroupList(){
this.$axios
.gets(
"/api/newjit/print-template-configuration/list",
)
.then((response) => {
if (response.item !== null) {
this.PLChildGroupList= response.item;
}
});
}
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";

Write Preview
Loading…
Cancel
Save