zhibinlv
/
FIS_GLM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【前端pc】暂存

master
安虹睿 5 days ago
parent
fafbc26c8d
commit
dde1f33ff8
16 changed files with 5917 additions and 1157 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. 2
      vue/public/config.js
  2. 1505
      vue/src/views/pg-fis/basedate/m100BIll/index copy.vue
  3. 22
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  4. 22
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  5. 2
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  6. 2
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  7. 829
      vue/src/views/pg-fis/basedate/r100Online/index copy.vue
  8. 43
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  9. 941
      vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
  10. 61
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  11. 16
      vue/src/views/pg-fis/basedate/select/detailMB.vue
  12. 1690
      vue/src/views/pg-fis/basedate/select/index copy.vue
  13. 997
      vue/src/views/pg-fis/basedate/select/index.vue
  14. 880
      vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue
  15. 42
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
  16. 6
      vue/src/views/ux/billManage/SettleDoorPanel/index.vue

2
vue/public/config.js
View File

@ -1,5 +1,5 @@
let sysConfig = { let sysConfig = {
authApi:'http://192.168.1.228:8066', authApi:'http://192.168.1.228:8066',
baseApi:'http://192.168.1.228:8092', baseApi:'http://192.168.1.228:8092',
m100FleshTime:60000 m100PrintFreshTime:60000
} }

1505
vue/src/views/pg-fis/basedate/m100BIll/index copy.vue
View File

File diff suppressed because it is too large

22
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
View File

@ -1,4 +1,4 @@
<!--重新打印门板模块 todo-an:门板--> <!--重新打印模块-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -164,7 +164,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="vehicleModel_DoorPlankCode" prop="vehicleModel_DoorPlankCode"
label="车型门板代码" label="车型代码"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="topBoxPositionNum" prop="topBoxPositionNum"
@ -366,7 +366,7 @@ export default {
watch: { watch: {
customerInfosMB: { customerInfosMB: {
handler(newVal) { handler(newVal) {
console.log("门板-接收的父组件的值：" + JSON.stringify(newVal)); console.log("接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
} else { } else {
@ -491,7 +491,6 @@ export default {
that.expands = []; that.expands = [];
} }
}, },
//门板
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
@ -559,7 +558,7 @@ export default {
this.listLoading = false; this.listLoading = false;
}); });
}, },
//重新打印-门板 //重新打印
handleUpdate(row) { handleUpdate(row) {
var MBVin1 = []; var MBVin1 = [];
let myalert = ""; //声明变量，其变量必须在此声明后使用 let myalert = ""; //声明变量，其变量必须在此声明后使用
@ -583,7 +582,7 @@ export default {
// reportIdList: MBId, // reportIdList: MBId,
// }; // };
// debugger //重新打印 // debugger //重新打印
// console.log("门板打印-主界面传过来的值：" + JSON.stringify(params)); // console.log("打印-主界面传过来的值：" + JSON.stringify(params));
// this.$axios // this.$axios
// .posts("/api/newjit/bill-m100/print-menban-packing-list", params) // .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
// .then((response) => { // .then((response) => {
@ -598,7 +597,7 @@ export default {
// } else if (response.status === true) { // } else if (response.status === true) {
// 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=menban传的值：" +
// JSON.stringify(this.fileQuery.dataname) // JSON.stringify(this.fileQuery.dataname)
// ); // );
// this.$axios // this.$axios
@ -615,8 +614,8 @@ export default {
// .catch(() => {}); // .catch(() => {});
debugger //重新打印 debugger //重新打印
var params = MBVin1; //选中的门板ID列表 var params = MBVin1; //选中的ID列表
console.log("门板打印-主界面传过来的值：" + JSON.stringify(params)); console.log("打印-主界面传过来的值：" + JSON.stringify(params));
this.$axios this.$axios
.posts("/api/newjit/bill-m100/load-menban-report", params) .posts("/api/newjit/bill-m100/load-menban-report", params)
.then((response) => { .then((response) => {
@ -631,7 +630,7 @@ export default {
} else if (response.status === true) { } else if (response.status === true) {
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=menban传的值：" +
JSON.stringify(this.fileQuery.dataname) JSON.stringify(this.fileQuery.dataname)
); );
this.$axios this.$axios
@ -650,7 +649,7 @@ export default {
}, },
//作废操作，支持批量操作-门板 //作废操作，支持批量操作
handleDelete(row) { handleDelete(row) {
//批量删除 //批量删除
var params = []; var params = [];
@ -748,7 +747,6 @@ export default {
roleFilter(type) { roleFilter(type) {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
//门板
handleFilter() { handleFilter() {
this.page = 1; this.page = 1;
this.getList(); this.getList();

22
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板--> <!--总成模块信息管理页-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -138,7 +138,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="vehicleModel_DoorPlankCode" prop="vehicleModel_DoorPlankCode"
label="车型门板代码" label="车型代码"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="topBoxPositionNum" prop="topBoxPositionNum"
@ -398,7 +398,7 @@ export default {
watch: { watch: {
customerInfosMB: { customerInfosMB: {
handler(newVal) { handler(newVal) {
console.log("门板-接收的父组件的值：" + JSON.stringify(newVal)); console.log("接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
} else { } else {
@ -523,7 +523,6 @@ export default {
that.expands = []; that.expands = [];
} }
}, },
//门板
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
@ -584,7 +583,7 @@ export default {
this.listLoading = false; this.listLoading = false;
}); });
}, },
//重新打印-门板 //重新打印
handleUpdate(row) { handleUpdate(row) {
this.isEdit = true; this.isEdit = true;
if (this.multipleSelection.length != 1) { if (this.multipleSelection.length != 1) {
@ -602,7 +601,7 @@ export default {
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
Vin: Vin1, Vin: Vin1,
}; };
console.log("门板打印-主界面传过来的值：" + JSON.stringify(params)); console.log("打印-主界面传过来的值：" + JSON.stringify(params));
this.$axios this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params) .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => { .then((response) => {
@ -617,7 +616,7 @@ export default {
} else if (response.status === true) { } else if (response.status === true) {
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=menban传的值：" +
JSON.stringify(this.fileQuery.dataname) JSON.stringify(this.fileQuery.dataname)
); );
this.$axios this.$axios
@ -663,7 +662,7 @@ export default {
this.fileQuery.dataname = JSON.stringify(response); this.fileQuery.dataname = JSON.stringify(response);
this.zflist = response; this.zflist = response;
console.log( console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值：" + "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(this.fileQuery.dataname) JSON.stringify(this.fileQuery.dataname)
); );
} }
@ -680,7 +679,7 @@ export default {
.posts("/api/newjit/MenBanPackingList/scrap", params) .posts("/api/newjit/MenBanPackingList/scrap", params)
.then((response) => { .then((response) => {
console.log( console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值：" + "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(response) JSON.stringify(response)
); );
this.$notify({ this.$notify({
@ -695,7 +694,7 @@ export default {
}, },
//作废操作，支持批量操作-门板 //作废操作，支持批量操作
// handleDelete(row) { // handleDelete(row) {
// //批量删除 // //批量删除
// var params = []; // var params = [];
@ -731,7 +730,7 @@ export default {
// myalertcount.push(itemsss.billNum); // myalertcount.push(itemsss.billNum);
// }); // });
// console.log( // console.log(
// "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + // "调用Handlers/Handler1.ashx?report=menban传的值：" +
// JSON.stringify(this.fileQuery.dataname) // JSON.stringify(this.fileQuery.dataname)
// ); // );
// this.$confirm( // this.$confirm(
@ -822,7 +821,6 @@ export default {
roleFilter(type) { roleFilter(type) {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
//门板
handleFilter() { handleFilter() {
this.page = 1; this.page = 1;
this.getList(); this.getList();

2
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板--> <!--总成模块信息管理页-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">

2
vue/src/views/pg-fis/basedate/m100Online/index.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板?--> <!--总成模块信息管理页-->
<!-- <!--
此 此

829
vue/src/views/pg-fis/basedate/r100Online/index copy.vue
View File

@ -0,0 +1,829 @@
<!--总成模块信息管理页 pg-R100Online-->
<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-row> -->
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<!-- <el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State">
<el-checkbox-group v-model="listQuery.state">
<el-checkbox
v-for="(item, index) in billState"
:key="item.id"
:label="item.id"
@change="checkedListChange(index)"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item style="margin:0">
<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
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)
</el-button>
<el-button
type="primary"
size="mini"
style="margin-left: 15px"
@click="SAPExport()"
>导出Excel（用于SAP导入）
</el-button>
</el-form-item>
<!-- </el-row> -->
</el-form>
</flexbox>
</div>
<div class="l-table" style="margin-top:-30px">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%;margin-top:30px"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
label="KNR"
prop="knr"
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.knr
}}</span>
</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>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</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";
//组件计量单位
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "R100Online",
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//翻译是否签字
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
data() {
const validVersion = (rule, value, callback) => {
let numberReg = /^\d{6}$/;
if (!numberReg.test(value)) {
callback(new Error("只能为6位数字！"));
} else {
callback();
}
};
return {
crmType: "R100Online",
rules: {
erpAssemblyName: [
{ required: true, message: "必须输入！", trigger: "blur" },
],
},
billState: [
{ id: 2, name: "未导出" },
{ id: 3, name: "已导出" },
],
valueSelect: "",
customerInfos: [],
dialogOptions: [],
versionValue: "",
searchContent: "", // 输入内容
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
bomId: "",
},
// 高级搜索
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
Version: undefined,
HostSNBegin: undefined,
HostSNBegin: undefined,
KNRBegin: undefined,
KNREnd: undefined,
//VINBegin:undefined,
VINEnd: undefined,
OnlineTimeValue: [],
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeValue: [],
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
billStatus: undefined,
state: [],
},
listExportQuery: {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
listPLQuery: {
BillType: 1,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form: {
details: [],
},
page: 1,
// 显示搜索条件
showSearch: true,
bomUnit,
multipleSelection: [],
drawer: false,
dialogFormVisible: false,
formTitle: "",
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight: 250,
details: [], //修改子表数据源
PLChildList: [], //筛选后产线下拉
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
};
},
mounted() {
this.getList();
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
//console.log(this.$refs.box.offsetHeight);
//console.log(this.tableHeight);
});
},
created() {
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
}
});
this.getProductLine();
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120});
// tempsTabs.push({
// label: "底盘号",
// prop: "vin",
// width: 130,
// });
// tempsTabs.push({
// label: "KNR",
// prop: "knr",
// width: 150,
// });
tempsTabs.push({
label: "单据状态",
prop: "billStatus",
width: 150,
});
tempsTabs.push({
label: "上线时间",
prop: "onlineTime",
width: 150,
});
tempsTabs.push({
label: "接收时间",
prop: "receiveTime",
width: 180,
});
tempsTabs.push({
label: "车型代码",
prop: "vehicleModelCode",
width: 120,
});
tempsTabs.push({
label: "版本",
prop: "version",
width: 150,
});
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 150,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 400,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
// tempsTabs.push({
// label: "状态",
// prop: "billStatus",
// width: 120,
// });
tempsTabs.push({
label: "备注",
prop: "remark",
width: 120,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
//抽屉
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.assemblyID; //主键id
this.customerInfos = [
{
ParentId: parentId,
},
];
},
handleDrawerClose(done) {
done();
},
/** 导出功能 */
handleDownload() {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.listQuery.OnlineTimeValue = [];
this.listQuery.ReceiveTimeValue = [];
this.listQuery.state = [];
this.handleQuery();
this.getProductLine();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
},
selectValue(params) {
//版本下拉选择
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
importExcelData() {
//关闭导入窗体时调用
this.showExcelImport = false;
//this.getList();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
handleAddDetails() {
if (this.form.details === undefined) {
this.form.details = [];
//console.log(679);
}
let obj = {};
obj.partCode = "";
obj.partName = "";
obj.partNum = "";
obj.isKey = false;
obj.description = "";
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
handleDeleteDetails(index) {
this.form.details.splice(index, 1);
//console.log(693);
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 0: "未匹配", 2: "未导出", 3: "已导出" }[row[column.property]];
}
if (column.property == "onlineTime" || 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];
},
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.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.$axios
.gets("/api/newjit/bill-r100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
getDetialList(partCode) {
this.listLoading = true;
console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
//console.log(partCode)
if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter(
(u) => u.partCode === partCode
);
} else {
this.list = response.item.details;
}
//alert(JSON.stringify(response.Items))
//this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
valueselectChange() {
this.$forceUpdate();
},
handleImportSAP() {},
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);
},
SAPExport() {
this.listLoading = true;
// this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
// this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
//获取所有产线
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList)
})
.catch(() => {});
},
//产线类型变更
ptypeselectChange() {
this.$forceUpdate();
//console.log(this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList)
},
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id);
} else {
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
// /*表格全选框去除空框*/
// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
// display: none;
// position: relative;
// }
// /*表格全选框改为：选择*/
// .el-table >>> .DisabledSelection .cell:before {
// content: "是否Key件";
// position: absolute;
// left: 7px;
// }
.divider1 {
margin: 0;
}
.divider2 {
margin: 10px;
margin-bottom: 20px;
width: 95%;
}
</style>

43
vue/src/views/pg-fis/basedate/r100Online/index.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板--> <!--总成模块信息管理页 pg-R100Online-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -9,25 +9,7 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<!-- <el-row> --> <el-form-item label="生产线:" prop="productLine">
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select <el-select
v-model="listQuery.productLine" v-model="listQuery.productLine"
clearable clearable
@ -357,7 +339,6 @@ export default {
listQuery: { listQuery: {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
productType: 1,
ProductLine: undefined, ProductLine: undefined,
Version: undefined, Version: undefined,
HostSNBegin: undefined, HostSNBegin: undefined,
@ -400,10 +381,6 @@ export default {
detailTableHeight: 250, detailTableHeight: 250,
details: [], //修改子表数据源 details: [], //修改子表数据源
PLChildList: [], //筛选后产线下拉 PLChildList: [], //筛选后产线下拉
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
}; };
}, },
mounted() { mounted() {
@ -766,9 +743,7 @@ export default {
.then((response) => { .then((response) => {
//console.log(response); //console.log(response);
this.PLList = response.item; this.PLList = response.item;
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.sort((a, b) => {
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode; return a.productLineCode - b.productLineCode;
}); });
this.listQuery.productLine = this.PLChildList[0].productLineCode; this.listQuery.productLine = this.PLChildList[0].productLineCode;
@ -777,18 +752,6 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
//产线类型变更
ptypeselectChange() {
this.$forceUpdate();
//console.log(this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList)
},
/*单据状态变更 */ /*单据状态变更 */
checkedListChange(index) { checkedListChange(index) {
if (this.listQuery.state.length <= 1) { if (this.listQuery.state.length <= 1) {

941
vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
View File

@ -0,0 +1,941 @@
<!--重复报文信息页 pg-repeatR100-->
<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 label="数据采集点" prop="productType">
<el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
<el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
</el-form-item> -->
<el-form-item label="数据采集点" prop="State" >
<el-checkbox-group v-model="listQuery.state">
<el-checkbox
v-for="(item, index) in billState"
:key="item.id"
:label="item.id"
@change="checkedListChange(index)"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option
v-for="item in PLChildList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
<el-form-item label="起始顺序号" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder="起始顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束顺序号" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder="结束顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车型代码" prop="vehicleModelCode">
<el-select
v-model="listQuery.vehicleModelCode"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange1"
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
<!-- <el-select
v-model="listQuery.VehicleModelCode"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/> -->
<el-form-item label="版本" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上线日期">
<el-date-picker
v-model="OnlineTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="接收日期">
<el-date-picker
v-model="ReceiveTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="单据状态" prop="BillStatus">
<el-select
v-model="listQuery.BillStatus"
placeholder="请选择"
style="width: 200px"
>
<el-option label="未领取生产任务" :value="1"></el-option>
<el-option label="已领取生产任务" :value="2"></el-option>
<el-option label="完成生产任务" :value="3"></el-option>
</el-select>
</el-form-item> -->
<el-form-item>
<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
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)查询信息
</el-button>
</el-form-item>
</el-form>
</flexbox>
</div>
<div class="l-table">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
label="底盘号"
prop="vin "
sortable="custom"
align="center"
fixed
width="180px"
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.vin
}}</span>
</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>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</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 { mapGetters } from "vuex";
import Lockr from "lockr";
import moment from "moment";
import message_table from "../../components/mixins/message_table";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//组件计量单位
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "RepeatM100",
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//翻译是否签字
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
mixins: [message_table],
data() {
return {
crmType: "bomdatabase",
customerInfos: [],
billState: [
{ id: 2, name: "R100" },
{ id: 3, name: "M100" },
],
isVINShowState:false,
OnlineTimeValue: [],
ReceiveTimeValue: [],
versionValue: "",
customerInfosMB:[],
customerInfosZHB:[],
versionList: [], //版本列表
searchContent: "", // 输入内容
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
bomId: "",
},
// 高级搜索
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
productType: 1, //1:门板；2:柱护板
ProductLine: undefined,
checked1:true,
checked2:true,
SkipCount: 0,
MaxResultCount: 15,
HostSNBegin: undefined,
HostSNEnd: undefined,
VIN: undefined,
VINBegin: undefined,
VINEnd: undefined,
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
VehicleModelCode: undefined,
Version: undefined,
KNR: undefined,
state: [],
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
vehicleModelQuery:{
dicTypeName:"派格车型",
},
page: 1,
// 显示搜索条件
// VehicleModelCodelist:[
// {id: 1, name: "C8"},
// {id: 2, name: "B8L"},
// {id: 3, name: "CC"},
// {id: 4, name: "BSMV"},
// {id: 5, name: "B9"},
// {id: 6, name: "Q5"},
// ],
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
showSearch: true,
bomUnit,
PLList: [],
PLChildList: [], //筛选后产线下拉
multipleSelection: [],
drawer: false,
isShowState: true,
dialogTableVisible: false,
vehicleModelList:[],//车型list
//tableHeight: document.documentElement.clientHeight - 260,
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
});
},
created() {
//this.getList();
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
}
});
this.getvehicleModel();
this.getProductLine();
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 120,
});
tempsTabs.push({
label: "底盘号",
prop: "vin",
width: 130,
});
tempsTabs.push({
label: "上线时间",
prop: "onlineTime",
width: 150,
});
tempsTabs.push({
label: "接收时间",
prop: "receiveTime",
width: 180,
});
tempsTabs.push({
label: "车型代码",
prop: "vehicleModelCode",
width: 120,
});
tempsTabs.push({
label: "版本",
prop: "version",
width: 150,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 150,
});
tempsTabs.push({
label: "数据采集点",
prop: "",
width: 150,
});
tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
tempsTabs.push({
label: "车型名称",
prop: "vehicleModelName",
width: 120,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
ss(data) {
//alert(data);
//版本下拉选择
this.valueSelect = data;
this.getList();
},
//抽屉
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.id; //传入的是总成id
this.customerInfos = [
{
ParentId: parentId,
},
];
},
handleDrawerClose(done) {
done();
},
/** 导出功能 */
handleDownload() {
this.listLoading = true;
// if (this.OnlineTimeValue != []) {
// this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
// this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
// }
// if (this.ReceiveTimeValue != []) {
// this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
// this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
// }
if (this.OnlineTimeValue != []) {
this.listQuery.OnlineTimeBegin = this.OnlineTimeValue
? this.OnlineTimeValue[0] || undefined
: undefined;
this.listQuery.OnlineTimeEnd = this.OnlineTimeValue
? this.OnlineTimeValue[1] || undefined
: undefined;
}
if (this.ReceiveTimeValue != []) {
this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue
? this.ReceiveTimeValue[0] || undefined
: undefined;
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue
? this.ReceiveTimeValue[1] || undefined
: undefined;
}
console.log("重复报文导出条件：" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/repeat-m100/export", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
});
},
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id);
} else {
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
if(this.listQuery.state[0]=="3")
{
this.isVINShowState = true;
}
else
{
this.isVINShowState = false;
}
},
/** 重置按钮操作 */
resetQuery(refName) {
this.OnlineTimeValue = [];
this.ReceiveTimeValue = [];
this.listQuery.state = [];
this.$refs[refName].resetFields();
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
// this.getListM100();
// this.getListR100();
},
selectValue(params) {
//版本下拉选择
this.versionValue = params.value;
this.getList();
// this.getListM100();
// this.getListR100();
},
selectOptionsChange(item) {
this.getList();
// this.getListM100();
// this.getListR100();
},
importExcelData() {
//关闭导入窗体时调用
this.showExcelImport = false;
//this.getList();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
// this.getListM100();
// this.getListR100();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未领取生产任务", 2: "已领取生产任务", 3: "完成生产任务" }[
row[column.property]
];
}
if (column.property == "onlineTime" || 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];
},
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.OnlineTimeValue != []) {
this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
}
// if (this.valueSelect != "") {
// this.listQuery.VehicleModelCode = this.valueSelect;
// } else {
// this.listQuery.VehicleModelCode = "";
// }
if (this.ReceiveTimeValue != []) {
this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
}
if(this.listQuery.state[0] == "2")
{
this.dialogTableVisible = false;
console.log("555555555555555555555555555555"+JSON.stringify(this.listQuery));
this.$axios
.gets("/api/newjit/repeat-r100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
}
else
{
this.dialogTableVisible = true;
this.$axios
.gets("/api/newjit/repeat-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
}
// if (this.billState=== 2) {
// this.$axios
// .gets("/api/newjit/repeat-r100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //大数据量加载时
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// }
// else if(this.billState === 3){
// this.$axios
// .gets("/api/newjit/repeat-m100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //大数据量加载时
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// }
//}
},
// 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.OnlineTimeValue != []) {
// this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
// this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
// }
// if (this.ReceiveTimeValue != []) {
// this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
// this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
// }
// if (this.listQuery.state !== undefined) {
// this.listQuery.billStatus = this.listQuery.state[0];
// }
// //this.listQueryList.ProductLine = this.listQuery.productLine;
// this.$axios
// .gets("/api/newjit/repeat-m100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //大数据量加载时
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// },
handleFilter() {
this.dialogTableVisible = false;
this.page = 1;
this.getList();
// this.getListM100();
// this.getListR100();
},
//产线类型变更
ptypeselectChange() {
debugger
this.$forceUpdate();
//console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log(this.PLList)
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
getProductLine() {
//debugger
//console.log(JSON.stringify(this.userInfo));
this.listPLQuery.UserId = this.userInfo.userId;
console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log("获取产线数据："+JSON.stringify(response.item));
this.PLList = response.item;
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
this.listQuery.productLine = this.PLChildList[0].productLineCode;
if (this.listQuery.productLine != "") {
//把产线值传到子组件
this.customerInfosMB = [
{
PrintType: 1,
ProductLine: this.PLChildList[0].productLineCode,
},
];
}
this.getList();
// this.getListM100();
// this.getListR100();
//console.log(this.PLList)
})
.catch(() => {});
},
valueselectChange1(){},
valueselectChange(val) {
this.$forceUpdate();
this.customerInfosMB = [];
this.customerInfosZHB = [];
if (this.listQuery.productType === 1) {
//把产线值传到子组件
this.customerInfosMB = [
{
PrintType: 1,
ProductLine: val,
},
];
}
if (this.listQuery.productType === 2) {
//把产线值传到子组件
this.customerInfosZHB = [
{
PrintType: 1,
ProductLine: val,
},
];
}
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
getvehicleModel()
{
this.$axios
.gets(
"/api/newjit/dic/list",this.vehicleModelQuery
)
.then((response) => {
//console.log(response);
this.vehicleModelList = response.item;
//console.log()
})
.catch(() => {
});
},
/** 通过回调控制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);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
</style>

61
vue/src/views/pg-fis/basedate/repeatR100/index.vue
View File

@ -1,4 +1,4 @@
<!--重复报文信息页 todo-an:门板--> <!--重复报文信息页 pg-repeatR100-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -9,10 +9,6 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<!-- <el-form-item label="数据采集点" prop="productType">
<el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
<el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
</el-form-item> -->
<el-form-item label="数据采集点" prop="State" > <el-form-item label="数据采集点" prop="State" >
<el-checkbox-group v-model="listQuery.state"> <el-checkbox-group v-model="listQuery.state">
<el-checkbox <el-checkbox
@ -25,25 +21,7 @@
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="生产线:" prop="productLine">
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select <el-select
v-model="listQuery.productLine" v-model="listQuery.productLine"
clearable clearable
@ -383,8 +361,6 @@ export default {
}, },
}, },
listQuery: { listQuery: {
productType: 1, //1:门板；2:柱护板
ProductLine: undefined, ProductLine: undefined,
checked1:true, checked1:true,
checked2:true, checked2:true,
@ -422,10 +398,6 @@ export default {
// {id: 5, name: "B9"}, // {id: 5, name: "B9"},
// {id: 6, name: "Q5"}, // {id: 6, name: "Q5"},
// ], // ],
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
showSearch: true, showSearch: true,
bomUnit, bomUnit,
PLList: [], PLList: [],
@ -809,19 +781,6 @@ this.$axios
// this.getListM100(); // this.getListM100();
// this.getListR100(); // this.getListR100();
}, },
//产线类型变更
ptypeselectChange() {
debugger
this.$forceUpdate();
//console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log(this.PLList)
},
sortChange(data) { sortChange(data) {
const { prop, order } = data; const { prop, order } = data;
if (!prop || !order) { if (!prop || !order) {
@ -843,9 +802,7 @@ this.$axios
//console.log("获取产线数据："+JSON.stringify(response.item)); //console.log("获取产线数据："+JSON.stringify(response.item));
this.PLList = response.item; this.PLList = response.item;
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.sort((a, b) => {
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode; return a.productLineCode - b.productLineCode;
}); });
console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList)); console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
@ -872,7 +829,6 @@ this.$axios
this.$forceUpdate(); this.$forceUpdate();
this.customerInfosMB = []; this.customerInfosMB = [];
this.customerInfosZHB = []; this.customerInfosZHB = [];
if (this.listQuery.productType === 1) {
//把产线值传到子组件 //把产线值传到子组件
this.customerInfosMB = [ this.customerInfosMB = [
{ {
@ -880,16 +836,7 @@ this.$axios
ProductLine: val, ProductLine: val,
}, },
]; ];
}
if (this.listQuery.productType === 2) {
//把产线值传到子组件
this.customerInfosZHB = [
{
PrintType: 1,
ProductLine: val,
},
];
}
}, },
handleSelectionChange(val) { handleSelectionChange(val) {

16
vue/src/views/pg-fis/basedate/select/detailMB.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板--> <!--总成模块信息管理页-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -170,7 +170,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="vehicleModel_DoorPlankCode" prop="vehicleModel_DoorPlankCode"
label="车型门板代码" label="车型代码"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="topBoxPositionNum" prop="topBoxPositionNum"
@ -378,7 +378,7 @@ export default {
watch: { watch: {
customerInfosMB: { customerInfosMB: {
handler(newVal) { handler(newVal) {
console.log("门板-接收的父组件的值：" + JSON.stringify(newVal)); console.log("接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
} else { } else {
@ -501,7 +501,6 @@ export default {
that.expands = []; that.expands = [];
} }
}, },
//门板
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
@ -551,7 +550,7 @@ export default {
this.listLoading = false; this.listLoading = false;
}); });
}, },
//重新打印-门板 //重新打印
handleUpdate(row) { handleUpdate(row) {
this.isEdit = true; this.isEdit = true;
if (this.multipleSelection.length != 1) { if (this.multipleSelection.length != 1) {
@ -571,7 +570,7 @@ export default {
beginVin: beginVin1, beginVin: beginVin1,
endVin: endVin1, endVin: endVin1,
}; };
console.log("门板打印-主界面传过来的值：" + JSON.stringify(params)); console.log("打印-主界面传过来的值：" + JSON.stringify(params));
this.$axios this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params) .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => { .then((response) => {
@ -586,7 +585,7 @@ export default {
} else if (response.status === true) { } else if (response.status === true) {
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=menban传的值：" +
JSON.stringify(this.fileQuery.dataname) JSON.stringify(this.fileQuery.dataname)
); );
this.$axios this.$axios
@ -602,7 +601,7 @@ export default {
.catch(() => {}); .catch(() => {});
} }
}, },
//作废操作，支持批量操作-门板 //作废操作，支持批量操作
handleDelete(row) { handleDelete(row) {
//批量删除 //批量删除
var params = []; var params = [];
@ -700,7 +699,6 @@ export default {
roleFilter(type) { roleFilter(type) {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
//门板
handleFilter() { handleFilter() {
this.page = 1; this.page = 1;
this.getList(); this.getList();

1690
vue/src/views/pg-fis/basedate/select/index copy.vue
View File

File diff suppressed because it is too large

997
vue/src/views/pg-fis/basedate/select/index.vue
View File

File diff suppressed because it is too large

880
vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue
View File

@ -0,0 +1,880 @@
<!--总成模块信息管理页 pg-weldingAssembly-->
<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-row> -->
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="version">
<el-input
v-model="listQuery.version"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<el-form-item label="流水号:" prop="serialNumBegin">
<el-input
v-model="listQuery.serialNumBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="serialNumEnd">
<el-input
v-model="listQuery.serialNumEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd ">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="对比状态" prop="State">
<el-checkbox-group v-model="listQuery.cstate">
<el-checkbox
v-for="item in compareState"
:key="item.id"
:label="item.id"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item >
<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
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出焊装总成对比(Excel)
</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownloadCSV()"
>导出焊装总成对比(CSV)
</el-button>
</el-form-item>
<!-- </el-row> -->
</el-form>
</flexbox>
</div>
<div class="l-table" style="margin-top:-20px">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column
label="底盘号"
prop="vin "
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.vin
}}</span>
</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>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
</el-drawer>
</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 { downloadFile } from "@/utils/crmindex.js";
//组件计量单位
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "WeldingAssembly",
components: { Pagination, CRMTableHead, importExcel },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//翻译是否签字
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
data() {
const validVersion = (rule, value, callback) => {
let numberReg = /^\d{6}$/;
if (!numberReg.test(value)) {
callback(new Error("只能为6位数字！"));
} else {
callback();
}
};
return {
crmType: "WeldingAssembly",
rules: {
erpAssemblyName: [
{ required: true, message: "必须输入！", trigger: "blur" },
],
},
compareState: [
{ id: 0, name: "有焊装无总装" },
{ id: 1, name: "有焊装有总装" },
],
valueSelect: "",
customerInfos: [],
dialogOptions: [],
versionValue: "",
searchContent: "", // 输入内容
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
bomId: "",
},
// 高级搜索
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
version: undefined,
serialNumBegin: undefined,
serialNumEnd: undefined,
HostSNBegin: undefined,
HostSNEnd: undefined,
KNRBegin: undefined,
KNREnd: undefined,
VINBegin: undefined,
VINEnd: undefined,
OnlineTimeValue: undefined,
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeValue: undefined,
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
HasR100NotHasM100: undefined, //有焊装无总装
HasR100HasM100: undefined, //有焊装有总装
cstate: [],
},
listExportQuery: {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
listPLQuery: {
BillType: 1,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form: {
details: [],
},
page: 1,
// 显示搜索条件
showSearch: true,
bomUnit,
multipleSelection: [],
drawer: false,
dialogFormVisible: false,
formTitle: "",
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight: 250,
details: [], //修改子表数据源
billStatus: [],
PLChildList: [], //筛选后产线下拉
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
};
},
mounted() {
this.getList();
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
//console.log(this.$refs.box.offsetHeight);
//console.log(this.tableHeight);
});
},
created() {
this.compareState.forEach((element, index) => {
this.listQuery.cstate.push(element.id);
});
this.getProductLine();
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
// tempsTabs.push({
// label: "底盘号",
// prop: "vin",
// width: 130,
// });
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 150,
});
tempsTabs.push({
label: "R100单据状态",
prop: "r100BillStatus",
width: 150,
});
tempsTabs.push({
label: "R100上线时间",
prop: "r100OnlineTime",
width: 150,
});
tempsTabs.push({
label: "R100接收时间",
prop: "r100ReceiveTime",
width: 180,
});
tempsTabs.push({
label: "车型代码",
prop: "vehicleModelCode",
width: 120,
});
tempsTabs.push({
label: "版本",
prop: "version",
width: 150,
});
tempsTabs.push({
label: "M100流水号",
prop: "serialNum",
width: 130,
});
tempsTabs.push({
label: "M100底盘号",
prop: "Vin",
width: 130,
});
tempsTabs.push({
label: "M100上线时间",
prop: "m100OnlineTime",
width: 150,
});
tempsTabs.push({
label: "M100接收时间",
prop: "m100ReceiveTime",
width: 180,
});
tempsTabs.push({
label: "M100单据状态",
prop: "m100BillStatus",
width: 150,
});
tempsTabs.push({
label: "总成编号",
prop: "r100ErpAssemblyCode",
width: 150,
});
tempsTabs.push({
label: "总成名称",
prop: "r100ErpAssemblyName",
width: 180,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
//抽屉
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.id; //主键id
this.customerInfos = [
{
ParentId: parentId,
},
];
},
handleDrawerClose(done) {
done();
},
/** 导出功能 */
handleDownload() {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listExportQuery));
this.$axios
.posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
/** 导出功能 */
handleDownloadCSV() {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/r100-m100-compare/export-CSV", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功！",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.listQuery.billType = undefined;
this.listQuery.productLine = undefined;
this.listQuery.Version = undefined;
this.listQuery.serialNumBegin = undefined;
this.listQuery.serialNumEnd = undefined;
this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = undefined;
this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = undefined;
this.listQuery.cstate = [];
this.handleQuery();
this.getProductLine();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
},
selectValue(params) {
//版本下拉选择
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
importExcelData() {
//关闭导入窗体时调用
this.showExcelImport = false;
//this.getList();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
handleAddDetails() {
if (this.form.details === undefined) {
this.form.details = [];
//console.log(679);
}
let obj = {};
obj.partCode = "";
obj.partName = "";
obj.partNum = "";
obj.isKey = false;
obj.description = "";
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
handleDeleteDetails(index) {
this.form.details.splice(index, 1);
//console.log(693);
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (
column.property == "r100BillStatus" ||
column.property == "m100BillStatus"
) {
return { 1: "未匹配", 2: "未打印", 3: "已发布" }[row[column.property]];
}
return row[column.property] || "--"; //|| "--"加上后会掩盖m100单据状态为0不显示
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
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.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];
}
this.listQuery.HasR100NotHasM100 = false;
this.listQuery.HasR100HasM100 = false;
if (
this.listQuery.cstate !== undefined &&
this.listQuery.cstate.length > 0
) {
//console.log(this.listQuery.cstate)
this.listQuery.cstate.forEach((element) => {
//console.log(element)
if (element === 0) {
this.listQuery.HasR100NotHasM100 = true;
}
if (element === 1) {
this.listQuery.HasR100HasM100 = true;
}
});
}
this.$axios
.gets("/api/newjit/r100-m100-compare/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
getDetialList(partCode) {
this.listLoading = true;
console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
//console.log(partCode)
if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter(
(u) => u.partCode === partCode
);
} else {
this.list = response.item.details;
}
//alert(JSON.stringify(response.Items))
//this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
valueselectChange() {
this.$forceUpdate();
},
handleImportSAP() {},
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);
},
SAPExport() {},
//获取所有产线
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
})
.catch(() => {});
},
//产线类型变更
ptypeselectChange() {
//console.log(this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss";
// /*表格全选框去除空框*/
// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
// display: none;
// position: relative;
// }
// /*表格全选框改为：选择*/
// .el-table >>> .DisabledSelection .cell:before {
// content: "是否Key件";
// position: absolute;
// left: 7px;
// }
.divider1 {
margin: 0;
}
.divider2 {
margin: 10px;
margin-bottom: 20px;
width: 95%;
}
</style>

42
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
View File

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板--> <!--总成模块信息管理页 pg-weldingAssembly-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -9,25 +9,7 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<!-- <el-row> --> <el-form-item label="生产线:" prop="productLine">
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select <el-select
v-model="listQuery.productLine" v-model="listQuery.productLine"
clearable clearable
@ -371,7 +353,6 @@ export default {
listQuery: { listQuery: {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
productType: 1,
ProductLine: undefined, ProductLine: undefined,
version: undefined, version: undefined,
serialNumBegin: undefined, serialNumBegin: undefined,
@ -418,10 +399,6 @@ export default {
details: [], //修改子表数据源 details: [], //修改子表数据源
billStatus: [], billStatus: [],
PLChildList: [], //筛选后产线下拉 PLChildList: [], //筛选后产线下拉
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
}; };
}, },
mounted() { mounted() {
@ -828,9 +805,7 @@ export default {
.then((response) => { .then((response) => {
//console.log(response); //console.log(response);
this.PLList = response.item; this.PLList = response.item;
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.sort((a, b) => {
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode; return a.productLineCode - b.productLineCode;
}); });
this.listQuery.productLine = this.PLChildList[0].productLineCode; this.listQuery.productLine = this.PLChildList[0].productLineCode;
@ -838,17 +813,6 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
//产线类型变更
ptypeselectChange() {
//console.log(this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList);
},
}, },
}; };
</script> </script>

6
vue/src/views/ux/billManage/SettleDoorPanel/index.vue
View File

@ -1,4 +1,4 @@
<!--准时化结算门板价格差异 todo-an:门板--> <!--准时化结算门板价格差异-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<!--功能栏--> <!--功能栏-->
@ -1014,7 +1014,7 @@ export default {
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
} }
console.log( console.log(
"大众准时化结算门板价格差异比对报表-导出条件：" + "大众准时化结算价格差异比对报表-导出条件：" +
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
@ -1168,7 +1168,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "大众准时化结算门板价格差异比对报表"; this.listQuery.name = "大众准时化结算价格差异比对报表";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)

Write Preview
Loading…
Cancel
Save