Administrator 3 years ago
parent
commit
1daf1465e2
  1. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  2. 64
      vue/src/components/CreateCom/Job-Select.vue
  3. 3
      vue/src/components/ImportExcel-base/index.vue
  4. 93
      vue/src/components/PasteExcel/index.vue
  5. 10
      vue/src/router/index.js
  6. 20
      vue/src/router/modules/vwFisData.js
  7. 22
      vue/src/router/modules/vwKBdata.js
  8. 18
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  9. 764
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  10. 745
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  11. 784
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  12. 180
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  13. 8
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  14. 909
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  15. 186
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
  16. 358
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  17. 43
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  18. 125
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  19. 121
      vue/src/views/ux/billManage/UnSettledDiff/index.vue
  20. 594
      vue/src/views/ux/vw/dataInput/hq_h/index.vue

2
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -2763,7 +2763,7 @@
<param name="state"></param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDiffMake(System.String,System.String,System.String,System.Collections.Generic.List{System.String},System.String,System.String,System.String)">
<summary>
1.大众发票与结算核对汇总表
</summary>

64
vue/src/components/CreateCom/Job-Select.vue

@ -0,0 +1,64 @@
<template>
<el-select
v-model="dataValue"
style="width: 200px"
placeholder="请选择版本"
@change="valueChange"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
<script type="text/javascript">
import stringMixin from "./stringMixin";
export default {
name: "JobSelect",
components: {},
props: {
options: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
dataValue: "",
};
},
created() {},
watch: {
options: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
//
this.dataValue = this.options[0].value;
}
},
immediate: true,
},
},
computed: {},
methods: {
//
valueChange(val) {
/** 回调筛选数据 */
this.$emit("value-change", {
index: this.index,
value: val,
data: this.options,
});
},
},
};
</script>
<style lang="scss" scoped>
</style>

3
vue/src/components/ImportExcel-base/index.vue

@ -301,7 +301,7 @@ export default {
vWKanBan: "大众看板结算明细",
scrapClaims: "CP7报废和索赔",
sparePart: "大众备件结算明细",
hqHPlatform: "红旗H平台导入",
bomdatabase: "产品结构BOM",
prebatch: "预批量",
secondaryPriceRatio: "二配结算价格比例",
@ -327,6 +327,7 @@ export default {
vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //
scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7
sparePart: "/api/settleaccount/SparePart/ExcelImport", //
hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //H
bomdatabase: "/api/settleaccount/bom/ExcelImport",
prebatch: "/api/settleaccount/Prebatch/ExcelImport",

93
vue/src/components/PasteExcel/index.vue

@ -0,0 +1,93 @@
<template>
<el-dialog v-loading="loading" @close="hiddenView">
<flexbox class="content">
<div class="book">
<el-input type="text" v-model="paster" @paste.native="pasteMe" />
<el-table :data="tableData">
<el-table-column
prop="name"
label="说明:只支持从Excel上粘贴复制,不支持手输!"
width="120"
>
</el-table-column>
</el-table>
</div>
</flexbox>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submiteBillNo()">确定录入</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
props: {
typeName: {
type: String,
default: "",
},
},
data() {
return {
loading: false,
paster: "",
pasterValue: "",
tableData: [
{
name: "单据号",
},
],
};
},
methods: {
submiteBillNo() {
var getbillNo = this.pasterValue.substring(
0,
this.pasterValue.length - 1
);
this.$emit("savebillNo", { biilNo: getbillNo, billName: this.typeName });
this.hiddenView();
},
hiddenView() {
this.$emit("close");
},
pasteMe(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.pasterValue = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
// console.log(columns);
let dataone = {}; //
for (let j = 0; j < columns.length; j++) {
// tableDatajkey
let keys = Object.keys(this.tableData[j]); // key
dataone[keys[j]] = columns[j];
this.pasterValue += columns[j] + ",";
}
this.tableData.push(dataone);
console.log(this.tableData);
}
}
},
},
};
</script>
<style lang="scss" scoped>
.book {
width: 50%;
height: 400px;
border: 1px solid red;
margin: 0 auto;
margin-top: 50px;
overflow-y: scroll;
}
.el-input__inner {
height: 100px !important;
}
</style>

10
vue/src/router/index.js

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

20
vue/src/router/modules/vwFisData.js

@ -78,16 +78,16 @@ const vwFisDataRouter = {
}
},
// {
// path: '/EP',
// component: () => import('@/views/ux/vw/dataInput/erpei'),
// name: 'ERPEI',//命名路由
// meta: {
// title: '二配结算表',
// roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
{
path: 'hq-H-platform',
component: () => import('@/views/ux/vw/dataInput/hq_h'),
name: 'ERPEI',//命名路由
meta: {
title: '红旗H平台导入',
roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
]
}

22
vue/src/router/modules/vwKBdata.js

@ -37,7 +37,7 @@ const billdataRouter = {
}
},
{
path: 'unSettle-diffExport',
path: 'unsettle-diff/export',
component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
name: 'UnSettleDiffExport',//命名路由
meta: {
@ -66,16 +66,16 @@ const billdataRouter = {
icon: '结算对比'
}
},
{
path: 'FisUnSettledDiff',
component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
name: 'FisUnSettledDiff',//命名路由
meta: {
title: '准时化交货与结算核对',
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '看板'
}
},
// {
// path: 'FisUnSettledDiff',
// component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
// name: 'FisUnSettledDiff',//命名路由
// meta: {
// title: '准时化交货与结算核对',
// roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
// icon: '看板'
// }
// },
{
path: 'unInvoice-settled/detailDiff',
component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),

18
vue/src/views/pg-fis/basedate/m100BIll/index.vue

@ -76,7 +76,7 @@
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-form-item label="KNR:" prop="KNRBegin" >
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
@ -133,7 +133,7 @@
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-form-item label="接收日期" style="margin-top: -15px">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
@ -146,7 +146,7 @@
></el-date-picker>
</el-form-item>
<el-form-item style="margin: 0px">
<el-form-item style="margin-top: -15px">
<el-button
type="primary"
icon="el-icon-search"
@ -172,7 +172,7 @@
</el-form-item>
<!-- </el-row> -->
<el-divider class="divider1" ></el-divider>
<el-form-item style="margin-bottom: 0px;margin-top: 10px">
<el-form-item style="margin-bottom: 0px;margin-top: -1px">
<el-button
class="filter-item"
size="mini"
@ -201,7 +201,7 @@
</el-form>
</flexbox>
</div>
<div class="l-table">
<div class="l-table" style="margin-top: -9px">
<!--表格渲染-->
<el-table
ref="multipleTable"
@ -1235,9 +1235,13 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList() {
getList(data) {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
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];

764
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@ -0,0 +1,764 @@
<!--总成模块信息管理页-->
<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="beginHostSN">
<el-input
v-model="listQuery.beginHostSN"
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="beginVin">
<el-input
v-model="listQuery.beginVin"
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-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>作废(支持批量)</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,
beginVin: undefined,
endVin: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginPrintDate: undefined,
endPrintDate: undefined,
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
hostSNQuery: {
productLine: undefined,
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: 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: "beginVin",
width: 160,
});
tempsTabs.push({
label: "止底盘号",
prop: "endVin",
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;
}
this.listQuery.partType = this.listQuery.partType;
this.listQuery.beginVin = this.listQuery.beginVin;
this.listQuery.endVin = this.listQuery.endVin;
this.listQuery.beginHostSN = this.listQuery.beginHostSN;
this.listQuery.endHostSN = this.listQuery.endHostSN;
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 beginVin1 = this.multipleSelection[0].beginVin1;
let endVin1 = this.multipleSelection[0].endVin1;
var params = {
printType: 1,
productLine: this.customerInfo.productLine,
beginVin: beginVin1,
endVin: endVin1,
};
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 {
let dataname = JSON.stringify(response.item);
console.log("门板-调用Handlers/Handler1.ashx?report=menban传的值:"+dataname)
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
qs.stringify(dataname)
)
.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>

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

@ -0,0 +1,745 @@
<!--总成模块信息管理页-->
<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="beginHostSN">
<el-input
v-model="listQuery.beginHostSN"
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="beginVin">
<el-input
v-model="listQuery.beginVin"
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-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>作废(支持批量)</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="partCode"
label="柱护板零件号"
></el-table-column>
<el-table-column
prop="partCode2"
label="柱护板零件号2"
></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: {
customerInfosZHB: {
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,
beginVin: undefined,
endVin: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginPrintDate: undefined,
endPrintDate: undefined,
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
hostSNQuery: {
productLine: undefined,
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: 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: {
customerInfosZHB: {
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;
});
console.log("柱护板监控传值:"+JSON.stringify(this.customerInfo))
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: "beginVin",
width: 160,
});
tempsTabs.push({
label: "止底盘号",
prop: "endVin",
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;
}
this.listQuery.partType = this.listQuery.partType;
this.listQuery.beginVin = this.listQuery.beginVin;
this.listQuery.endVin = this.listQuery.endVin;
this.listQuery.beginHostSN = this.listQuery.beginHostSN;
this.listQuery.endHostSN = this.listQuery.endHostSN;
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/ZhuHuBanPackingList/ZhuHuBanPackingList-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 beginVin1 = this.multipleSelection[0].beginVin1;
let endVin1 = this.multipleSelection[0].endVin1;
var params = {
printType: this.customerInfo.printType,
productLine: this.customerInfo.productLine,
beginVin: beginVin1,
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
console.log("柱护版-打印返回的状态:"+response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else {
let dataname = JSON.stringify(response.item);
console.log("柱板-调用Handlers/Handler1.ashx?report=menban传的值:"+dataname)
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
qs.stringify(dataname)
)
.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/ZhuHuBanPackingList/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>

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

File diff suppressed because it is too large

180
vue/src/views/pg-fis/basedate/r100Online/index.vue

@ -2,7 +2,7 @@
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header" >
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
@ -23,7 +23,8 @@
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id" />
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
@ -39,7 +40,8 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"/>
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
@ -146,14 +148,19 @@
></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)">
<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: 0px">
<el-form-item style="margin:0">
<el-button
type="primary"
icon="el-icon-search"
@ -188,7 +195,7 @@
</el-form>
</flexbox>
</div>
<div class="l-table">
<div class="l-table" style="margin-top:-30px">
<!--表格渲染-->
<el-table
ref="multipleTable"
@ -209,13 +216,11 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
label="KNR"
prop="knr"
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
@ -240,7 +245,6 @@
</template>
</el-table-column>
</el-table>
</div>
<div class="table-footer">
@ -277,7 +281,7 @@ 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 { mapGetters } from "vuex";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -289,7 +293,6 @@ const bomUnit = [
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
@ -297,7 +300,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
export default {
name: "R100Online",
components: { Pagination, CRMTableHead, importExcel , Detail},
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -325,9 +328,9 @@ export default {
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
billState:[
{id:2,name:"已匹配"},
{id:3,name:"已导出"}
billState: [
{ id: 2, name: "已匹配" },
{ id: 3, name: "已导出" },
],
valueSelect: "",
customerInfos: [],
@ -355,33 +358,32 @@ export default {
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
Version:undefined,
HostSNBegin:undefined,
HostSNBegin:undefined,
KNRBegin:undefined,
KNREnd: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:[],
VINEnd: undefined,
OnlineTimeValue: [],
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeValue: [],
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
billStatus: undefined,
state: [],
},
listExportQuery: {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
listPLQuery:{
listPLQuery: {
BillType: 1,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form:{
details:[]
form: {
details: [],
},
page: 1,
//
@ -394,10 +396,13 @@ export default {
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight:250,
details:[], //
PLChildList:[],//线
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
detailTableHeight: 250,
details: [], //
PLChildList: [], //线
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
};
},
mounted() {
@ -405,15 +410,14 @@ export default {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
//console.log(this.$refs.box.offsetHeight);
//console.log(this.tableHeight);
});
},
created() {
this.billState.forEach((element,index) => {
if(index === 0)
{
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
}
});
@ -421,7 +425,6 @@ export default {
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
// tempsTabs.push({
@ -473,6 +476,11 @@ export default {
label: "产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "状态",
prop: "billStatus",
width: 120,
});
tempsTabs.push({
label: "备注",
@ -481,7 +489,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
...mapGetters(["userInfo"]), //
},
methods: {
//
@ -587,7 +595,7 @@ export default {
this.form.details.push(obj);
//console.log(688);
},
handleDeleteDetails(index){
handleDeleteDetails(index) {
this.form.details.splice(index, 1);
//console.log(693);
},
@ -595,7 +603,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
return { 0: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
@ -609,21 +617,22 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList() {
getList(data) {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if(this.listQuery.OnlineTimeValue!== undefined)
{
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)
{
if (this.listQuery.ReceiveTimeValue !== undefined) {
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if(this.listQuery.state!== undefined)
{
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
}
this.$axios
@ -641,7 +650,6 @@ export default {
});
},
getDetialList(partCode) {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
@ -649,13 +657,12 @@ export default {
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter(u => u.partCode === partCode);
}
else
{
this.list = response.item.details.filter(
(u) => u.partCode === partCode
);
} else {
this.list = response.item.details;
}
//alert(JSON.stringify(response.Items))
@ -670,8 +677,10 @@ export default {
});
},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
valueselectChange() {
this.$forceUpdate();
},
handleImportSAP() {},
handleFilter() {
this.page = 1;
@ -710,44 +719,43 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
SAPExport(){},
SAPExport() {},
//线
getProductLine()
{
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
)
.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.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(() => {
});
.catch(() => {});
},
//线
ptypeselectChange()
{
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});
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)
{
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id);
}
else
{
} else {
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
@ -771,12 +779,12 @@ export default {
// position: absolute;
// left: 7px;
// }
.divider1{
margin: 0 ;
.divider1 {
margin: 0;
}
.divider2{
.divider2 {
margin: 10px;
margin-bottom: 20px ;
margin-bottom: 20px;
width: 95%;
}
</style>

8
vue/src/views/pg-fis/basedate/repeatR100/index.vue

@ -513,9 +513,13 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList() {
getList(data) {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
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];

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

File diff suppressed because it is too large

186
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

@ -2,7 +2,7 @@
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header" >
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
@ -23,7 +23,8 @@
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id" />
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
@ -39,7 +40,8 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"/>
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
@ -166,14 +168,18 @@
></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">
<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 style="margin: 0px">
<el-form-item style="margin-top: -20px;">
<el-button
type="primary"
icon="el-icon-search"
@ -210,7 +216,7 @@
</el-form>
</flexbox>
</div>
<div class="l-table">
<div class="l-table" style="margin-top:-20px">
<!--表格渲染-->
<el-table
ref="multipleTable"
@ -231,7 +237,6 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column
label="底盘号"
prop="vin "
@ -262,7 +267,6 @@
</template>
</el-table-column>
</el-table>
</div>
<div class="table-footer">
@ -293,7 +297,7 @@ 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 { mapGetters } from "vuex";
import moment from "moment";
import { downloadFile } from "@/utils/crmindex.js";
@ -304,7 +308,6 @@ const bomUnit = [
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
@ -340,9 +343,9 @@ export default {
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
compareState:[
{id:0,name:"有焊装无总装"},
{id:1,name:"有焊装有总装"}
compareState: [
{ id: 0, name: "有焊装无总装" },
{ id: 1, name: "有焊装有总装" },
],
valueSelect: "",
customerInfos: [],
@ -370,36 +373,35 @@ export default {
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:[],
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:{
listPLQuery: {
BillType: 1,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form:{
details:[]
form: {
details: [],
},
page: 1,
//
@ -412,11 +414,14 @@ export default {
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight:250,
details:[], //
billStatus:[],
PLChildList:[],//线
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
detailTableHeight: 250,
details: [], //
billStatus: [],
PLChildList: [], //线
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
};
},
mounted() {
@ -424,20 +429,19 @@ export default {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
//console.log(this.$refs.box.offsetHeight);
//console.log(this.tableHeight);
});
},
created() {
this.compareState.forEach((element,index) => {
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({
@ -512,7 +516,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
...mapGetters(["userInfo"]), //
},
methods: {
//
@ -671,7 +675,7 @@ export default {
this.form.details.push(obj);
//console.log(688);
},
handleDeleteDetails(index){
handleDeleteDetails(index) {
this.form.details.splice(index, 1);
//console.log(693);
},
@ -685,25 +689,29 @@ export default {
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if(column.property == "r100BillStatus" || column.property == "m100BillStatus")
{
if (
column.property == "r100BillStatus" ||
column.property == "m100BillStatus"
) {
return { 1: "未匹配", 2: "已匹配", 3: "已发布" }[row[column.property]];
}
return row[column.property] || "--";//|| "--"m1000
return row[column.property] || "--"; //|| "--"m1000
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList() {
getList(data) {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if(this.listQuery.OnlineTimeValue!== undefined)
{
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)
{
if (this.listQuery.ReceiveTimeValue !== undefined) {
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
@ -711,21 +719,20 @@ export default {
this.listQuery.HasR100NotHasM100 = false;
this.listQuery.HasR100HasM100 = false;
if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
{
if (
this.listQuery.cstate !== undefined &&
this.listQuery.cstate.length > 0
) {
//console.log(this.listQuery.cstate)
this.listQuery.cstate.forEach(element => {
this.listQuery.cstate.forEach((element) => {
//console.log(element)
if(element === 0)
{
if (element === 0) {
this.listQuery.HasR100NotHasM100 = true;
}
if(element === 1)
{
if (element === 1) {
this.listQuery.HasR100HasM100 = true;
}
});
}
this.$axios
.gets("/api/newjit/r100-m100-compare/list", this.listQuery)
@ -742,7 +749,6 @@ export default {
});
},
getDetialList(partCode) {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
@ -750,13 +756,12 @@ export default {
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter(u => u.partCode === partCode);
}
else
{
this.list = response.item.details.filter(
(u) => u.partCode === partCode
);
} else {
this.list = response.item.details;
}
//alert(JSON.stringify(response.Items))
@ -771,8 +776,10 @@ export default {
});
},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
valueselectChange() {
this.$forceUpdate();
},
handleImportSAP() {},
handleFilter() {
this.page = 1;
@ -811,31 +818,34 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
SAPExport(){},
SAPExport() {},
//线
getProductLine()
{
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
)
.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.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(() => {
});
.catch(() => {});
},
//线
ptypeselectChange()
{
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});
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList);
},
},
@ -857,12 +867,12 @@ export default {
// position: absolute;
// left: 7px;
// }
.divider1{
margin: 0 ;
.divider1 {
margin: 0;
}
.divider2{
.divider2 {
margin: 10px;
margin-bottom: 20px ;
margin-bottom: 20px;
width: 95%;
}
</style>

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

@ -5,6 +5,12 @@
<!-- 搜索 -->
<div style="float: left">
<flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
class="filter-item"
size="mini"
@ -372,9 +378,12 @@
<el-select
v-model="formCount.materialGroupValue"
size="medium"
multiple
collapse-tags
filterable
clearable
style="width: 188px; margin-right: 15px"
style="width: 350px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
<el-option
@ -387,22 +396,32 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP5时间:" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="cp5startTime">
<el-date-picker
v-model="datetime5"
type="datetimerange"
:picker-options="pickerOptionsCp5"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="formCount.cp5startTime"
type="datetime"
size="small"
@change="cp5getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
default-time="00:00:00"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item prop="cp5endTime">
<el-date-picker
v-model="formCount.cp5endTime"
type="datetime"
size="small"
@change="cp5getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
@ -442,21 +461,58 @@
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title">
其他搜索条件(单击折叠或伸展)<i
class="header-icon el-icon-info"
style="color: #37b328"
></i>
</template>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-col :md="18" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" />
<el-input
type="textarea"
v-model="formCount.kennCode"
style="width: 380px"
:rows="4"
placeholder="请输入正确的KENN号!"
/>
</el-form-item>
</el-col>
<el-col :md="2" :xs="24">
<el-tooltip
content="一键复制粘贴"
placement="bottom"
effect="light"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="kennBtn"
></el-button>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="底盘号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" />
<el-input
v-model="formCount.chassisNumber"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="请输入正确底盘号!"
/>
</el-form-item>
</el-col>
</el-row>
@ -467,18 +523,34 @@
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width:450px"/>
<el-input
v-model="formCount.materialCode"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="请输入正确的客户零件号!"
/>
</el-form-item>
</el-col>
<!-- <el-col :md="4" :xs="24">
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapCode">
<el-input
v-model="formCount.sapCode"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="请输入正确厂内零件号!"
/>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="text" @click="dialogFormVisible = false"
@ -490,6 +562,36 @@
>
</div>
</el-dialog>
<el-dialog
title="批量录入KEEN号"
:visible.sync="showModal"
width="400px"
height="500px"
append-to-body
>
<flexbox class="content">
<div>
<el-input
type="textarea"
v-model="paster"
@paste.native="pasteMe"
:rows="6"
/>
<el-table :data="tableData" max-height="400">
<el-table-column
prop="name"
label="说明:只支持从Excel上粘贴复制,不支持手输!"
width="300"
>
</el-table-column>
</el-table>
</div>
</flexbox>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submiteBillNo">确定录入</el-button>
</div>
</el-dialog>
</div>
</template>
@ -499,26 +601,33 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
const cityOptions = [
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
import PasteExcel from "@/components/PasteExcel/index.vue";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default {
name: "InvoiceSettledDetailDiff",
components: { Pagination, CRMTableHead },
components: { Pagination, CRMTableHead, PasteExcel, JobSelectVerson },
directives: { permission },
data() {
return {
crmType: "backJob",
activeNames: ["1"],
tableData: [
{
name: "KEEN号",
},
],
paster: "",
pasterValue: "",
JobVersionList: [],
JobVersionValue: "",
rules: {
versionValue: [
{ required: true, message: "必须输入!", trigger: "change" },
],
},
showModal: false,
pickerOptionsCp5: {
disabledDate: (time) => {
let now = new Date();
@ -546,8 +655,6 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -563,7 +670,6 @@ export default {
},
datetime5: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
selectNameValue: "",
radio: "0", //0 1
@ -572,7 +678,7 @@ export default {
//
openView: false,
versionValue: "",
materialGroupValue: "",
materialGroupValue: [],
formTitle: "",
timer: null, //
//
@ -600,6 +706,8 @@ export default {
formCount: {
startTime: "",
endTime: "",
cp5startTime: "",
cp5endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
@ -608,6 +716,11 @@ export default {
// kennCode: "",
// version: "",
},
dataKenCode: "",
datachassisNumber: "",
datamaterialCode: "",
datasapCode: "",
getmaterialGroupValue: "",
list: null,
totalCount: 0,
listLoading: true,
@ -622,6 +735,7 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
sapCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
@ -635,6 +749,8 @@ export default {
name: "",
},
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260,
@ -672,6 +788,7 @@ export default {
this.getAllVersionList();
this.getMaterialGroup();
this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst();
// this.getCurrentMonthLast();
},
@ -718,6 +835,86 @@ export default {
},
},
methods: {
getJobVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/Job/versionlist", this.listQuery)
.then((response) => {
this.JobVersionList = [];
response.forEach((element) => {
let options = {};
options.value = element;
options.label = element;
this.JobVersionList.push(options);
});
if (JSON.stringify(this.JobVersionList) != "[]") {
//
this.JobversionValue = this.JobVersionList[0].value;
this.JobversionValueVerson = this.JobVersionList[0].label;
this.getList();
}
})
.catch(() => {
//this.listLoading = false;
});
},
submiteBillNo() {
var getkeenCodeNo = this.pasterValue.substring(
0,
this.pasterValue.length - 1
);
this.dataKenCode = getkeenCodeNo;
this.formCount.kennCode = this.dataKenCode;
this.showModal = false;
},
pasteMe(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.pasterValue = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
let dataone = {}; //
for (let j = 0; j < columns.length; j++) {
// tableDatajkey
let keys = Object.keys(this.tableData[j]); // key
dataone[keys[j]] = columns[j];
this.pasterValue += columns[j] + ",";
}
this.tableData.push(dataone);
console.log(this.tableData);
}
}
},
//excel
pasteExcelToKennCode(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.dataKenCode = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) {
this.dataKenCode += columns[j] + ",";
}
}
}
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
getdateValue(val) {
this.startTime = val;
this.getbalanceIndexData();
@ -727,6 +924,14 @@ export default {
this.getbalanceIndexData();
},
cp5getdateValue(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
cp5getdateValue(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() {
var date = new Date();
date.setDate(1);
@ -777,7 +982,7 @@ export default {
response.items.forEach((element) => {
let options = {};
options.value = element.description;
options.label = element.description;
options.label = element.description + "/" + element.value;
this.materialGroupList.push(options);
});
})
@ -791,6 +996,8 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
},
save() {
this.$refs.formCount.validate((valid) => {
@ -800,25 +1007,18 @@ export default {
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
}
// if (this.formCount.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
if (this.formCount.sapCode != "") {
this.listExportQuery.sapCode = this.formCount.sapCode; //
}
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
}
var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") {
this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined
this.listExportQuery.begin = this.cp5startTime
? this.cp5startTime
: undefined;
this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
@ -826,37 +1026,43 @@ export default {
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
// if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup =
// '"'+this.formCount.materialGroupValue+'"'; //
// }
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
}
console.log(
"大众发票与结算核对明细表-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
});
}
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
});
// this.$axios
// .gets(
// "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
// this.listExportQuery
// )
// .then((res) => {
// let taskid = res;
// if (Number.isInteger(taskid)) {
// this.$notify({
// title: "",
// message: ":" + taskid,
// type: "success",
// duration: 2000,
// });
// }
// this.getList();
// this.formLoading = false;
// this.dialogFormVisible = false;
// })
// .catch(() => {
// this.formLoading = false;
// this.dialogFormVisible = false;
// });
}
});
},
@ -870,9 +1076,19 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
this.dialogFormVisible = true;
},
kennBtn() {
this.paster = "";
this.showModal = true;
this.tableData = [
{
name: "KEEN号",
},
];
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;

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

@ -1,4 +1,4 @@
<!--发出未结算页-->
<!--发出未结算明细-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -408,39 +408,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="startTime">
<el-date-picker
v-model="formCount.startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item prop="endTime">
<el-date-picker
v-model="formCount.endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -622,8 +589,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -819,10 +784,6 @@ export default {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
@ -986,7 +947,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众发票与结算核对明细表";
this.listQuery.name = "大众准时化未结明细表";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

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

@ -1,5 +1,5 @@
<!--准时化未结差异比对-->
<!--发出未结算页-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -34,7 +34,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -364,7 +364,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="物料组(车型)" />
</el-col>
@ -387,7 +387,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -409,46 +409,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item>
<el-date-picker
v-model="endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" />
</el-form-item>
</el-col>
@ -456,29 +423,29 @@
<el-form-item label="底盘号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item>
<el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" />
</el-form-item>
</el-col>
</el-row>-->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-input v-model="formCount.materialCode" />
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width: 450px" />
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
<!-- <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item>
<el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -547,8 +514,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
startTime: "",
endTime: "",
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -563,7 +530,6 @@ export default {
},
},
datetime5: [],
datetime7: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
@ -600,15 +566,15 @@ export default {
searchContent: "", //
form: {},
formCount: {
name: "未结算对比",
// datetime5: [],
// datetime7: [],
settledate: "",
materialCode: "",
sapMaterialCode: "",
chassisNumber: "",
kennCode: "",
version: "",
startTime: "",
endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
// sapMaterialCode: "",
// chassisNumber: "",
// kennCode: "",
// version: "",
},
list: null,
totalCount: 0,
@ -624,8 +590,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -663,7 +627,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 30); //30
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -793,7 +757,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
// this.datetime7 = [];
},
save() {
this.$refs.formCount.validate((valid) => {
@ -803,38 +766,35 @@ export default {
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
}
if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapMaterialCode =
this.formCount.sapMaterialCode; //
}
// if (this.formCount.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
}
var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") {
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined
: undefined;
this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined
: undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
// if (this.startTime != "") {
// this.listExportQuery.cp7begin = this.startTime; //CP7
// }
// if (this.endTime != "") {
// this.listExportQuery.cp7end = this.endTime; //CP7
// }
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
// if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup =
// this.formCount.materialGroupValue; //
// }
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
}
console.log(
"准时化未结差异比对-导出条件:" +
"大众准时化未结差异比结-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
@ -870,8 +830,12 @@ export default {
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true;
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;
@ -984,7 +948,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众发票与结算核对明细表";
this.listQuery.name = "大众准时化未结差异比对表";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
@ -1048,3 +1012,4 @@ export default {
box-shadow: none !important;
}
</style>

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

@ -1,4 +1,4 @@
<!--大众准时化未结比对-->
<!--发出未结算比对页-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -33,7 +33,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -363,7 +363,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="物料组(车型)" />
</el-col>
@ -386,7 +386,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -408,46 +408,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item>
<el-date-picker
v-model="endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" />
</el-form-item>
</el-col>
@ -455,26 +422,26 @@
<el-form-item label="底盘号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item>
<el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" />
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-input v-model="formCount.materialCode" />
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width: 450px" />
</el-form-item>
</el-col>
<!-- <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item>
<el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
</el-form-item>
</el-col> -->
@ -499,10 +466,15 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
const cityOptions = [
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default {
name: "InvoiceSettledDetailDiff",
name: "UnSettledDiff",
components: { Pagination, CRMTableHead },
directives: { permission },
@ -541,8 +513,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
startTime: "",
endTime: "",
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -557,8 +529,8 @@ export default {
},
},
datetime5: [],
datetime7: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
selectNameValue: "",
radio: "0", //0 1
@ -593,15 +565,15 @@ export default {
searchContent: "", //
form: {},
formCount: {
name: "未结算对比",
// datetime5: [],
// datetime7: [],
settledate: "",
materialCode: "",
sapMaterialCode: "",
chassisNumber: "",
kennCode: "",
version: "",
startTime: "",
endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
// sapMaterialCode: "",
// chassisNumber: "",
// kennCode: "",
// version: "",
},
list: null,
totalCount: 0,
@ -617,8 +589,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -656,7 +626,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 30); //30
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -786,7 +756,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
// this.datetime7 = [];
},
save() {
this.$refs.formCount.validate((valid) => {
@ -796,27 +765,24 @@ export default {
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
}
if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //
}
// if (this.formCount.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
}
var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") {
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined
: undefined;
this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined
: undefined;
}
if (this.startTime != "") {
this.listExportQuery.cp7begin = this.startTime; //CP7
}
if (this.endTime != "") {
this.listExportQuery.cp7end = this.endTime; //CP5
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
@ -825,13 +791,14 @@ export default {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
}
console.log(
"大众发票与结算核对明细表-导出条件:" +
"大众准时化未结比对-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
"/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
this.listExportQuery
)
.then((res) => {
@ -862,8 +829,12 @@ export default {
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true;
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;
@ -976,7 +947,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众准时化未结明细表";
this.listQuery.name = "未结算对比";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

594
vue/src/views/ux/vw/dataInput/hq_h/index.vue

@ -0,0 +1,594 @@
<!--红旗H平台导入功能-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<XhJSSelect
:options="versionList"
style="width: 200px"
class="search-container"
@value-change="selectValue"
></XhJSSelect>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
<!-- <el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-download"
@click="handleDownload()"
>导出Excel
</el-button> -->
<el-dropdown
size="small"
class="filter-item"
style="margin-left: 15px; font-weight: bold"
@command="handleCommand"
>
<span class="el-dropdown-link">
导出数据<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="excel" icon="el-icon-plus"
>导出Excel</el-dropdown-item
>
<el-dropdown-item command="csv" icon="el-icon-circle-plus"
>导出Csv</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照采购订单号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading.fullscreen.lock="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 type="selection" width="44px"></el-table-column> -->
<el-table-column
label="版本"
prop="version"
sortable="custom"
align="center"
width="100px"
fixed
>
<template slot-scope="scope">
<el-tooltip :content="scope.row.version" placement="top">
<span class="link-type">{{ scope.row.version }}</span>
</el-tooltip>
</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"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import importExcel from "@/components/ImportExcel-base";
import CRMTableHead from "../../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "HQHPlatform",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "hqHPlatform",
versionValue: "",
versionList: [], //
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
settleAccountId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: true,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listVersionQuery: {
SkipCount: 0,
MaxResultCount: 15,
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
site: "TH",
userId: "00000000-0000-0000-0000-000000000000",
},
listExportQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
fileType: 0,
userId: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 260;
};
},
created() {
this.getVersionInfo();
if (this.versionList == []) {
this.getList();
}
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
tempsTabs.push({
label: "采购订单号",
prop: "purchaseOrderNo",
width: 220,
});
tempsTabs.push({
label: "采购订单行项目",
prop: "purchaseOrderNoItem",
width: 170,
});
tempsTabs.push({
label: "采购订单文本",
prop: "purchaseOrderNoText",
width: 170,
});
tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
tempsTabs.push({
label: "采购价格不含税",
prop: "purchasePriceNoTax",
width: 200,
});
tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
tempsTabs.push({
label: "日期",
prop: "spareDate",
width: 150,
formType: "datetime",
});
tempsTabs.push({
label: "交货单号",
prop: "deliveryOrderNo",
width: 150,
});
tempsTabs.push({
label: "交货行号",
prop: "deliveryLineNum",
width: 150,
});
tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
tempsTabs.push({
label: "德国发票号",
prop: "germanInvoiceNo",
width: 150,
});
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
return tempsTabs;
},
},
methods: {
handleCommand(command) {
if (this.versionValue === "") {
this.$message.error("请先选择版本!");
return;
}
switch (command) {
case "excel":
this.listQuery.fileType = 1; //0csv,1excel
break;
case "csv":
this.listQuery.fileType = 0; //0csv,1excel
break;
default:
//
break;
}
this.listLoading = true;
if (this.versionValue === "") {
this.$message.error("必需选择版本!");
this.listLoading = false;
return;
}
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("红旗H平台导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/HQHPlatform/Export", this.listQuery)
.then((res) => {
let fileNameOfProject = res;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
getVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
let options = {};
options.value = element.id;
options.label = element.version;
this.versionList.push(options);
});
if (JSON.stringify(this.versionList) != "[]") {
//
this.versionValue = this.versionList[0].label;
this.getList();
}
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
},
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
// if (column.property === "state") {
// return { 0: "", 2: "" }[row[column.property]];
// }
if (
column.property == "settleInputDate" ||
column.property == "settleDate"
) {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
return row[column.property] || "--";
},
importExcelData() {
this.getVersionInfo();
this.listLoading = false;
//
this.showExcelImport = false;
},
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/HQHPlatform/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
fetchData(id) {
//
this.$axios
.gets("/api/settleaccount/HQHPlatform/" + id)
.then((response) => {
this.form = response;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "purchaseOrderNo";
let filter = {
logic: 0,
column: column,
action: 0,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
/** 多项筛选操作 */
/** 筛选操作 */
handleFilters(data) {
if (data === null) {
this.listQuery.Filters = [];
this.getList(); //
} else {
this.filterObj = data;
console.log("筛选" + JSON.stringify(data));
var offsetHei = document.documentElement.clientHeight;
var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
this.tableHeight = offsetHei - removeHeight;
this.currentPage = 1;
let Filter = [];
data.forEach((item) => {
let filter = {};
if (item.formType === "datetime" || item.formType === "datetime") {
// (datetime >= a and datetime <=b)
filter["Column"] = item.fieldName;
filter["Logic"] = 0;
filter["Value"] = item.value[0];
filter["Action"] = item.action;
Filter.push(filter);
if (item.value[1] != null) {
filter["Value"] = item.value[1];
filter["Action"] = 5;
Filter.push(filter);
}
} else {
filter["Column"] = item.fieldName;
filter["Value"] = item.value;
filter["Logic"] = 0;
filter["Action"] = item.action;
Filter.push(filter);
}
});
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
}
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
console.log(this.listQuery.Sorting);
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
// if (column.property === "qty") {
// return { textAlign: "right" };
// } else {
// return { textAlign: "left" };
// }
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 "../../../styles/crmtable.scss";
</style>
<style lang="scss">
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
</style>
Loading…
Cancel
Save