Browse Source

晚上8点14提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
3123693d57
  1. 8
      vue/src/router/index.js
  2. 53
      vue/src/router/modules/fisprint.js
  3. 749
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  4. 39
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  5. 51
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  6. 32
      vue/src/views/pg-fis/basedate/select/index.vue
  7. 2
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

8
vue/src/router/index.js

@ -169,11 +169,11 @@ 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,//大众看板和备件
pgfisPrint,//排序单打印 pgfisPrint,//排序单打印
pgfis,//派格fis pgfis,//派格fis
//JobTimeDataRouter,//后台作业监控 //JobTimeDataRouter,//后台作业监控

53
vue/src/router/modules/fisprint.js

@ -0,0 +1,53 @@
/** 派格fis路由 */
//import Layout from '@/layout/firstLayout'
import Layout from '@/layout'
const pgfisPrint = {
path: '/pg-fis-print',
component: Layout,
redirect: 'fisprint',
name: 'pgfis',
meta: {
//requiresAuth: true,
title: '排序单打印',
index: 0,
type: 'crm',
icon: '业务',
keepAlive: false,
},
children: [
{
path: '/pg-m100normal-print',
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
name: 'pg-M100Online',//命名路由
meta: {
title: '日常打印M100信息',
//roles: ['SettleAccount.Reports'],
icon: '客户零件'
}
},
{
path: '/select',
component: () => import('@/views/pg-fis/basedate/select'),
name: 'select',//命名路由
meta: {
title: 'M100查询',
//roles: ['SettleAccount.Reports'],
icon: '结算对比'
}
},
{
path: '/pg-M100Online',
component: () => import('@/views/pg-fis/basedate/m100Online'),
name: 'pg-M100Online',//命名路由
meta: {
title: 'M100上线信息',
//roles: ['SettleAccount.Reports'],
icon: '售后'
}
}
]
}
export default pgfisPrint

749
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@ -0,0 +1,749 @@
<!--总成模块信息管理页-->
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<el-form-item>
<el-col :span="12">
<el-form-item prop="billNum" label="装箱单号">
<el-input
v-model="listQuery.billNum"
placeholder=""
clearable
size="small"
style="width: 140px"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="partType" label="零件类型">
<el-input
v-model="listQuery.partType"
placeholder=""
clearable
size="small"
style="width: 140px"
/>
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="大众顺序号">
<el-col :span="11">
<el-form-item prop="HostSN">
<el-input
v-model="listQuery.HostSN"
placeholder=""
clearable
size="small"
style="width: 170px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<!-- <el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="endHostSN">
<el-input
v-model="listQuery.endHostSN"
placeholder=""
clearable
size="small"
style="width: 170px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
-->
</el-form-item>
<el-form-item label="底盘号码">
<el-col :span="11">
<el-form-item prop="Vin">
<el-input
v-model="listQuery.Vin"
placeholder=""
clearable
size="small"
style="width: 140px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<!-- <el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="endVin">
<el-input
v-model="listQuery.endVin"
placeholder=""
clearable
size="small"
style="width: 140px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
-->
</el-form-item>
<el-form-item label="打印日期">
<el-date-picker
v-model="PrintTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item style="margin-top: -20px">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
>
<el-button
class="filter-item"
size="mini"
type="success"
icon="el-icon-s-shop"
@click="handleUpdate()"
>重打(只支持单选)</el-button
>
</el-form-item>
</el-form>
</flexbox>
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeightMB"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%; margin-top: -25px"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column type="expand" prop="details" label="详表">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column prop="knr" label="KNR订单号"></el-table-column>
<el-table-column prop="vin" label="底盘号"></el-table-column>
<el-table-column
prop="hostSN"
label="大众顺序号"
></el-table-column>
<el-table-column
prop="vehicleModel_DoorPlankCode"
label="车型门板代码"
></el-table-column>
<el-table-column
prop="topBoxPositionNum"
label="上箱位号"
></el-table-column>
<el-table-column
prop="topSAPMaterialNum"
label="上箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="topMaterialDescription"
label="上箱位 物料描述"
></el-table-column>
<el-table-column
prop="belowBoxPositionNum"
label="下箱位号"
></el-table-column>
<el-table-column
prop="belowSAPMaterialNum"
label="下箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="belowMaterialDescription "
label="下箱位 物料描述"
></el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
style="margin-bottom: -5px; float: right"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from "vuex";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs";
export default {
name: "M100Online-MB",
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfosMB: {
type: Array,
default: () => {
return [];
},
},
},
data() {
const validVersion = (rule, value, callback) => {
let numberReg = /^\d{6}$/;
if (!numberReg.test(value)) {
callback(new Error("只能为6位数字!"));
} else {
callback();
}
};
return {
crmType: "M100Online-MB",
getRowKeys: (row) => {
return row.id; //id
},
expands: [], //id
PrintTimeValue: [],
activeNames: ["1"],
multipleSelection: [],
valueSelect: "",
customerInfos: [],
dialogOptions: [],
versionValue: "",
searchContent: "", //
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
printType: "",
productLine: "",
},
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
billNum: undefined,
partType: undefined,
Vin: undefined,
HostSN: undefined,
beginPrintDate: undefined,
endPrintDate: undefined,
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
hostSNQuery: {
productLine: undefined,
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
Vin: undefined,
HostSN: undefined,
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
Vin: undefined,
HostSN: undefined,
},
fileQuery: {
dataname: undefined,
},
form: {
details: [],
},
page: 1,
//
showSearch: true,
drawer: false,
dialogFormVisible: false,
formTitle: "",
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
tableHeightMB: document.documentElement.clientHeight - 300,
detailTableHeight: 250,
details: [], //
PLList: [], //线
isShowHostSN: false,
isShowVin: false,
isShowState: true,
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
//this.tableHeight = offsetHei -260
});
},
created() {
this.getList();
},
watch: {
customerInfosMB: {
handler(newVal) {
console.log("门板-接收的父组件的值:" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.printType = element.PrintType;
this.customerInfo.productLine = element.ProductLine;
});
if (this.customerInfo.productLine != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
tempsTabs.push({
label: "左或右",
prop: "billLocation",
width: 150,
});
tempsTabs.push({
label: "供应商厂家代码",
prop: "providerCode",
width: 150,
});
tempsTabs.push({
label: "零件类型",
prop: "partType",
width: 180,
});
tempsTabs.push({
label: "器具容量",
prop: "capacity",
width: 150,
});
tempsTabs.push({
label: "打印日期",
prop: "printDate",
width: 180,
});
tempsTabs.push({
label: "打印类型",
prop: "printType",
width: 120,
});
tempsTabs.push({
label: "生产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "底盘号",
prop: "Vin",
width: 160,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //
},
methods: {
//base64dataurlbase64
dataURLtoBlob(dataurl) {
var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
var n = bstr.length;
var u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: "application/pdf" });
},
doPrint(val) {
var ordonnance = document.getElementById(val).contentWindow;
setTimeout(() => {
// window.print()
ordonnance.print();
this.pdfLoading = false;
}, 100);
},
printpdf(dataResult) {
//dataResultbase64
let blob = this.dataURLtoBlob(dataResult);
var date = new Date().getTime();
var ifr = document.createElement("iframe");
ifr.style.frameborder = "no";
ifr.style.display = "none";
ifr.style.pageBreakBefore = "always";
ifr.setAttribute("id", "printPdf" + date);
ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob);
document.body.appendChild(ifr);
this.doPrint("printPdf" + date);
window.URL.revokeObjectURL(ifr.src); // URL
this.dialogFormVisible = false;
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
exChange(row, rowList) {
//this.listLoading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
//
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
if (this.listQuery.billNum != "") {
this.listQuery.billNum = this.listQuery.billNum;
}
if (this.listQuery.Vin != "") {
this.listQuery.Vin = this.listQuery.Vin;
}
if (this.listQuery.HostSN != "") {
this.listQuery.HostSN = this.listQuery.HostSN;
}
this.listQuery.partType = this.listQuery.partType;
var getdate5 = JSON.stringify(this.PrintTimeValue);
if (getdate5 != "[]") {
this.listQuery.beginPrintDate = this.PrintTimeValue
? this.PrintTimeValue[0] || undefined
: undefined;
this.listQuery.endPrintDate = this.PrintTimeValue
? this.PrintTimeValue[1] || undefined
: undefined;
} else {
this.listQuery.beginPrintDate = undefined;
this.listQuery.endPrintDate = undefined;
}
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/newjit/MenBanPackingList/MenBanPackingList-List",
this.listQuery
)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
//-
handleUpdate(row) {
this.isEdit = true;
if (this.multipleSelection.length != 1) {
this.$message({
message: "重新打印必须选择单行,不能多选!",
type: "warning",
});
return;
} else {
//this.fetchData(this.multipleSelection[0].id);
//
let MBVin1 = this.multipleSelection[0].id;
let MBId = [MBVin1];
var params = {
printType: 1,
productLine: this.customerInfo.productLine,
reportIdList: MBId,
};
console.log("门板打印-主界面传过来的值:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => {
//alert(response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
qs.stringify(this.fileQuery)
)
.then((response) => {
this.printpdf(response); //
});
}
})
.catch(() => {});
}
},
//-
handleDelete(row) {
//
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/newjit/MenBanPackingList/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "作废成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
fetchData(id) {
//
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + id)
.then((response) => {
this.form = response.item;
//this.details = response.item.details;
//console.log(this.details);
});
},
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.PrintTimeValue = [];
this.handleQuery();
this.getProductLine();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
return row[column.property] || "--";
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
//
handleFilter() {
this.page = 1;
this.getList();
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
closeDialog() {},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
.divider1 {
margin: 0;
}
.divider2 {
margin: 10px;
margin-bottom: 20px;
width: 95%;
}
.label1 {
margin-left: 5px;
margin-right: 5px;
}
</style>

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

@ -47,10 +47,10 @@
<!-- <el-collapse accordion> <!-- <el-collapse accordion>
<el-collapse-item> --> <el-collapse-item> -->
<!-- <template slot="title"> <!-- <template slot="title">
其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i> 其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
</template> --> </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"
placeholder="" placeholder=""
@ -60,8 +60,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<!-- </el-row> --> <!-- </el-row> -->
<!-- <el-form-item label="流水号:" prop="serialNumBegin"> <!-- <el-form-item label="流水号:" prop="serialNumBegin">
<el-input <el-input
v-model="listQuery.serialNumBegin" v-model="listQuery.serialNumBegin"
placeholder="" placeholder=""
@ -71,7 +71,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="-" prop="serialNumEnd"> <!-- <el-form-item label="-" prop="serialNumEnd">
<el-input <el-input
v-model="listQuery.serialNumEnd" v-model="listQuery.serialNumEnd"
placeholder="" placeholder=""
@ -81,8 +81,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-row> --> <!-- <el-row> -->
<!-- <el-form-item label="大众顺序号:" prop="HostSNBegin"> <!-- <el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
@ -103,7 +103,7 @@
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="KNR:" prop="KNRBegin"> <!-- <el-form-item label="KNR:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNRBegin" v-model="listQuery.KNRBegin"
placeholder="" placeholder=""
@ -123,9 +123,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<!-- </el-row> --> <!-- </el-row> -->
<!-- <el-row> --> <!-- <el-row> -->
<!-- <el-form-item label="底盘号:" prop="VINBegin"> <!-- <el-form-item label="底盘号:" prop="VINBegin">
<el-input <el-input
v-model="listQuery.VINBegin" v-model="listQuery.VINBegin"
placeholder="" placeholder=""
@ -146,7 +146,7 @@
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="上线日期"> <!-- <el-form-item label="上线日期">
<el-date-picker <el-date-picker
v-model="listQuery.OnlineTimeValue" v-model="listQuery.OnlineTimeValue"
size="small" size="small"
@ -158,9 +158,9 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> --> </el-form-item> -->
<!-- </el-row> --> <!-- </el-row> -->
<!-- <el-row> --> <!-- <el-row> -->
<!-- <el-form-item label="接收日期"> <!-- <el-form-item label="接收日期">
<el-date-picker <el-date-picker
v-model="listQuery.ReceiveTimeValue" v-model="listQuery.ReceiveTimeValue"
size="small" size="small"
@ -172,7 +172,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="单据状态" prop="State" v-show="isShowState"> <!-- <el-form-item label="单据状态" prop="State" v-show="isShowState">
<el-checkbox-group v-model="listQuery.state"> <el-checkbox-group v-model="listQuery.state">
<el-checkbox <el-checkbox
v-for="(item, index) in billState" v-for="(item, index) in billState"
@ -184,9 +184,9 @@
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> --> </el-form-item> -->
<!-- </el-collapse-item> <!-- </el-collapse-item>
</el-collapse> --> </el-collapse> -->
<el-form-item style="margin-top: -10px"> <el-form-item style="margin-top: -5px">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -851,7 +851,7 @@ export default {
}, },
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {alert()
this.listQuery.SkipCount = (this.page - 1) * data.limit; this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else { } else {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
@ -867,6 +867,7 @@ export default {
if (this.listQuery.state == 1) { if (this.listQuery.state == 1) {
this.listQuery.billStatus = this.listQuery.state[0]; this.listQuery.billStatus = this.listQuery.state[0];
} }
this.$axios this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery) .gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => { .then((response) => {

51
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@ -126,7 +126,7 @@
> >
<RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB> <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
</el-drawer> </el-drawer>
<!--门板作废--> <!--门板作废-->
<el-drawer <el-drawer
title="门板作废" title="门板作废"
:visible.sync="drawerMBDelete" :visible.sync="drawerMBDelete"
@ -275,7 +275,7 @@
</el-row> </el-row>
</el-row> </el-row>
<el-form-item <el-form-item
label="大众顺序号1:" label="大众顺序号:"
prop="beginHostSN" prop="beginHostSN"
v-show="isShowHostSN" v-show="isShowHostSN"
> >
@ -291,6 +291,7 @@
v-model="form.endHostSN" v-model="form.endHostSN"
placeholder="" placeholder=""
clearable clearable
:disabled="true"
size="small" size="small"
style="width: 240px" style="width: 240px"
/> />
@ -373,10 +374,10 @@ import MBDetail from "./detailMB.vue";
import ZHBDetail from "./detailZHB.vue"; import ZHBDetail from "./detailZHB.vue";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs"; import qs from "qs";
import RepetitionMB from './RepetitionMB.vue' import RepetitionMB from "./RepetitionMB.vue";
import RepetitionZHB from './RepetitionZHB.vue' import RepetitionZHB from "./RepetitionZHB.vue";
import ScrapMB from './ScrapMB.vue' import ScrapMB from "./ScrapMB.vue";
import ScrapZHB from './ScrapZHB.vue' import ScrapZHB from "./ScrapZHB.vue";
export default { export default {
name: "M100Online", name: "M100Online",
@ -390,7 +391,7 @@ export default {
RepetitionMB, RepetitionMB,
RepetitionZHB, RepetitionZHB,
ScrapMB, ScrapMB,
ScrapZHB ScrapZHB,
}, },
directives: { permission }, directives: { permission },
filters: { filters: {
@ -477,6 +478,13 @@ export default {
billStatus: undefined, billStatus: undefined,
state: [], state: [],
}, },
listQueryList: {
SkipCount: 0,
MaxResultCount: 15,
ProductLine: undefined,
BillStatus: undefined,
CanNotPrint: false,
},
listExportQuery: { listExportQuery: {
erpAssemblyCode: undefined, erpAssemblyCode: undefined,
erpAssemblyName: undefined, erpAssemblyName: undefined,
@ -811,23 +819,18 @@ export default {
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit; this.listQueryList.SkipCount = (this.page - 1) * data.limit;
} else { } else {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQueryList.SkipCount = (this.page - 1) * 15;
}
if (this.listQuery.OnlineTimeValue !== undefined) {
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
if (this.listQuery.ReceiveTimeValue !== undefined) {
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
} }
this.listQueryList.BillStatus = 2; //
this.listQueryList.ProductLine = this.listQuery.productLine; //线
this.listQueryList.CanNotPrint = false; //
console.log(
"日常打印M100查询条件:" + JSON.stringify(this.listQueryList)
);
this.$axios this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery) .gets("/api/newjit/bill-m100/list", this.listQueryList)
.then((response) => { .then((response) => {
this.list = response.items; this.list = response.items;
this.totalCount = response.totalCount; this.totalCount = response.totalCount;
@ -954,7 +957,9 @@ export default {
}); });
return; return;
} }
this.hostSNQuery.productLine = this.listQuery.productLine; (this.printNum = "12"),
(this.printNumZHB = "24"),
(this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostPrintQuery.productLine = this.listQuery.productLine; this.hostPrintQuery.productLine = this.listQuery.productLine;
// //
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
@ -1182,7 +1187,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("检查门板-大众顺序号是否断号"); console.log("检查门板-大众顺序号是否断号");
response.item = ["断号1", "断号2"];
if (response.item.length > 0) { if (response.item.length > 0) {
// //
this.$confirm( this.$confirm(
@ -1290,7 +1294,6 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("检查柱护板-大众顺序号是否断号"); console.log("检查柱护板-大众顺序号是否断号");
response.item = ["断号1", "断号2"];
if (response.item.length > 0) { if (response.item.length > 0) {
// //
this.$confirm( this.$confirm(

32
vue/src/views/pg-fis/basedate/select/index.vue

@ -9,16 +9,13 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<el-collapse accordion>
<el-form-item label="版本:" prop="Version"> <el-form-item label="版本:" prop="Version">
<el-input <el-input
v-model="listQuery.Version" v-model="listQuery.Version"
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -29,7 +26,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -39,7 +36,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -50,7 +47,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -60,7 +57,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -71,7 +68,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -81,7 +78,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -93,7 +90,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -103,7 +100,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -147,7 +144,7 @@
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-collapse>
<el-form-item style="margin-top: -10px"> <el-form-item style="margin-top: -10px">
<el-button <el-button
type="primary" type="primary"
@ -275,7 +272,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
/> />
<label class="label1">-</label> <label class="label1">-</label>
<el-input <el-input
@ -283,7 +280,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -297,7 +294,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
/> />
<label class="label1">-</label> <label class="label1">-</label>
<el-input <el-input
@ -305,7 +302,7 @@
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 200px"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -636,7 +633,6 @@ export default {
handleDrawerClose(done) { handleDrawerClose(done) {
done(); done();
}, },
fetchData(id) { fetchData(id) {
// //
this.$axios this.$axios

2
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

@ -1031,7 +1031,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
/* 获取车型数据源 */ /* 获取车型数据源 */

Loading…
Cancel
Save