44673626 3 years ago
parent
commit
d561322b52
  1. 32
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  2. 7
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  3. 26
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs
  4. 31
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
  5. BIN
      src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
  6. BIN
      src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
  7. BIN
      src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
  8. 61
      vue/src/components/ImportTxt/index.vue
  9. 10
      vue/src/router/modules/fis.js
  10. 25
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  11. 166
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  12. 347
      vue/src/views/pg-fis/basedate/m100BIll/detail.vue
  13. 118
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  14. 354
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  15. 82
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  16. 6
      vue/src/views/pg-fis/basedate/productLine/index.vue
  17. 354
      vue/src/views/pg-fis/basedate/r100Online/detail.vue
  18. 106
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  19. 270
      vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
  20. 1491
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  21. 128
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

32
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@ -231,6 +231,38 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
return _taskid;
}
/// <summary>
/// 导入功能
/// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns>
[HttpGet]
[Route("SettleFisDiffExport-Make")]
[DisableRequestSizeLimit]
public async Task<string> SettleFisDiffExportMake( string version, string materialCode, string begin, string end)
{
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode});
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end });
var _taskid = await _service.ExportEnqueueAsync("大众准时化结算数量差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(SettleFisDiffExportService), customConditionList, (rs) =>
{
});
return _taskid;
}
/// <summary>
/// 结算总成和ERP总成价格对比
/// </summary>

7
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -2454,6 +2454,13 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleFisDiffExportMake(System.String,System.String,System.String,System.String)">
<summary>
导入功能
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettledPartAndErpPartPriceDiffMake(System.String,System.String)">
<summary>
结算总成和ERP总成价格对比

26
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs

@ -1,5 +1,6 @@
using Dapper;
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel;
using System;
using System.Collections.Generic;
using System.Data.Common;
@ -12,6 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{
[ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)]
public class SettleFisDiffDetail
{
[ExporterHeader(DisplayName = "年")]
@ -29,17 +31,17 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "零件号" )]
public string MaterialCode { set; get; }
[ExporterHeader(DisplayName = "结算数量" )]
public string SettleQty { set; get; }
public decimal SettleQty { set; get; }
[ExporterHeader(DisplayName = "M100状态" )]
public string WMSBillNum { set; get; }
[ExporterHeader(DisplayName = "M100数量" )]
public string Qty { set; get; }
public decimal Qty { set; get; }
[ExporterHeader(DisplayName = "差异")]
public string DiffQty { set; get; }
public decimal DiffQty { set; get; }
[ExporterHeader(DisplayName = "开票单价" )]
public string Price{ set; get; }
public decimal Price{ set; get; }
[ExporterHeader(DisplayName = "差异金额")]
public string DiffPrice{ set; get; }
public decimal DiffPrice{ set; get; }
[ExporterHeader(DisplayName = "SAP编码")]
public string SapCode { set; get; }
@ -53,22 +55,22 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "物料组车型")]
public string MaterialCodeGroup { set; get; }
[ExporterHeader(DisplayName = "SAP编码")]
public string KENNCode { set; get; }
public string SapCode { set; get; }
[ExporterHeader(DisplayName = "零件号")]
public string MaterialCode { set; get; }
[ExporterHeader(DisplayName = "结算数量")]
public string SettleQty { set; get; }
public decimal SettleQty { set; get; }
[ExporterHeader(DisplayName = "M100状态")]
public string WMSBillNum { set; get; }
[ExporterHeader(DisplayName = "M100数量")]
public string Qty { set; get; }
public decimal Qty { set; get; }
[ExporterHeader(DisplayName = "差异数量")]
public string DiffQty { set; get; }
public decimal DiffQty { set; get; }
[ExporterHeader(DisplayName = "开票单价")]
public string Price { set; get; }
public decimal Price { set; get; }
[ExporterHeader(DisplayName = "差异金额")]
public string DiffPrice { set; get; }
public decimal DiffPrice { set; get; }
}
public class SettleFisDiffDetailDapperRepository : DapperRepository<SettleAccountDbContext>, ITransientDependency
@ -101,7 +103,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Price,\n" +
" a.SettleQty - isnull( b.Qty, 0 ) DiffQty,(\n" +
" a.SettleQty - isnull( b.Qty, 0 ))* Price DiffPrice,\n" +
" d.CustomerPartCode SapCode \n" +
" d.MaterialCode SapCode \n" +
"FROM\n" +
" ( SELECT YEAR, KENNCode, ChassisNumber, Model, CP5A, CP7, MaterialCode, Qty SettleQty FROM Set_Settle WHERE version = '{0}' ) a\n" +
" LEFT JOIN (\n" +

31
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs

@ -27,14 +27,35 @@ namespace SettleAccount.Job.Services.Report
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
{
//var year = p_list.Where(p => p.Name == "Year").FirstOrDefault().Value;
//var state = p_list.Where(p => p.Name == "State").FirstOrDefault().Value;
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var _list= _dapper.GetReportList(version,string.Empty,begin,end);
_outputService.Export<SettleFisDiffDetail>(id,string.Format("3.大众准时化结算数量差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
var _list= _dapper.GetReportList(version, materialCode, begin,end);
_list.GroupBy(p => new { p.MaterialCode,p.SapCode }).Select(p =>new SettleFisDiffSum
{
MaterialCode= p.Key.MaterialCode,
SapCode= p.Key.SapCode,
DiffPrice=p.Sum(p=>p.DiffPrice),
DiffQty=p.Sum(p=>p.DiffQty),
Qty=p.Sum(p=>p.Qty),
SettleQty=p.Sum(p=>p.SettleQty),
Price=p.Sum(p=>p.Price)
});
_outputService.Export<SettleFisDiffDetail>(id,string.Format("大众准时化结算数量差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
return id.ToString();
}

BIN
src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache

Binary file not shown.

BIN
src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache

Binary file not shown.

BIN
src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache

Binary file not shown.

61
vue/src/components/ImportTxt/index.vue

@ -345,6 +345,7 @@ export default {
{
fis: "FIS发运数据",
settleAccount: "R3数据",
AssemblyCfgERP:"总成SAP数据",
}[this.crmType] || ""
);
},
@ -353,6 +354,7 @@ export default {
{
fis: "/api/settleaccount/fis/ExcelImport",
settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
}[this.crmType] || ""
);
},
@ -362,6 +364,7 @@ export default {
{
fis: "FIS发运数据导入模板.xlsx",
settleAccount: "R3数据模板.xlsx",
AssemblyCfgERP:"BOM-批量导入模板.txt",
}[this.crmType] || ""
);
},
@ -560,24 +563,48 @@ export default {
.posts(webapi, fd)
.then(async (res) => {
console.log("导入条件:" + JSON.stringify(res));
if (res === "Success") {
if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({
title: "成功",
message: "数据导入成功!",
type: "success",
duration: 2000,
});
this.stepList[1].status = "finish";
this.resultData.successMessage = "数据导入成功!";
this.stepsActive = 4;
if(this.crmType !== "AssemblyCfgERP"){
if (res === "Success") {
if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({
title: "成功",
message: "数据导入成功!",
type: "success",
duration: 2000,
});
this.stepList[1].status = "finish";
this.resultData.successMessage = "数据导入成功!";
this.stepsActive = 4;
}
} else {
this.stepList[0].status = "wait";
this.resultData.errTemplate = res; //
this.resultData.errSize = 1; //0
this.resultData.successMessage = "数据导入失败!";
this.stepsActive = 3;
}
}
else{
console.log(res.status)
if (res.status === true) {
if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({
title: "成功",
message: "数据导入成功!",
type: "success",
duration: 2000,
});
this.stepList[1].status = "finish";
this.resultData.successMessage = "数据导入成功!";
this.stepsActive = 4;
}
} else {
this.stepList[0].status = "wait";
this.resultData.errTemplate = res; //
this.resultData.errSize = 1; //0
this.resultData.successMessage = "数据导入失败!";
this.stepsActive = 3;
}
} else {
this.stepList[0].status = "wait";
this.resultData.errTemplate = res; //
this.resultData.errSize = 1; //0
this.resultData.successMessage = "数据导入失败!";
this.stepsActive = 3;
}
this.$emit("status", "finish");
this.loading = false;

10
vue/src/router/modules/fis.js

@ -36,6 +36,16 @@ const pgfis = {
icon: '发货'
}
},
{
path: '/pg-unknownAssembly',
component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
name: 'pg-unknownAssembly',//命名路由
meta: {
title: '未知总成模块管理',
roles: ['SettleAccount.Reports'],
icon: '发货'
}
},
{
path: '/pg-workLine',
component: () => import('@/views/pg-fis/basedate/productLine'),

25
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@ -174,7 +174,7 @@
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.model }}</span>
<span>{{ scope.row.vehicleModel }}</span>
</template>
</el-table-column>
</el-table>
@ -185,6 +185,7 @@
:close-on-click-modal="false"
:title="formTitle"
width="700px"
@close='closeDialog'
>
<el-form
ref="form"
@ -335,6 +336,13 @@
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
<!-- 抽屉控件 -->
<el-drawer
@ -358,7 +366,7 @@
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import importExcel from "@/components/ImportTxt";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
@ -411,7 +419,6 @@ export default {
versionValue: "",
searchContent: "", //
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
@ -697,8 +704,9 @@ export default {
},
importExcelData() {
//
this.listLoading = false;
this.showExcelImport = false;
//this.getList();
this.getList();
},
/** 刷新列表 */
@ -796,7 +804,11 @@ export default {
},
valueselectChange(){},
handleImportSAP(){},
handleImportSAP(){
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
handleFilter() {
this.page = 1;
@ -849,6 +861,9 @@ export default {
.catch(() => {
});
},
closeDialog(){
//this.multipleSelection = [];//
},
},
};
</script>

166
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@ -22,7 +22,7 @@
<el-form-item label="零件代码:" prop="partCode">
<el-input
v-model="partCode"
v-model="listQuery.partCode"
clearable
size="small"
placeholder=""
@ -34,7 +34,7 @@
<el-form-item label="零件名称:" prop="partName">
<el-input
v-model="partName"
v-model="listQuery.partName"
clearable
size="small"
placeholder=""
@ -46,29 +46,35 @@
<el-form-item label="零件类型:" prop="partType">
<el-select
v-model="partType"
v-model="listQuery.partType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option label="结算" value="R0003"></el-option>
<el-option label="二配" value="R0001"></el-option>
<!-- @change="valueselectChange" -->
<el-option
v-for="item in partType1List"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
<el-form-item label="零件子类型:" prop="partChildType">
<el-form-item label="零件子类型:" prop="partType2">
<el-select
v-model="partChildType"
v-model="listQuery.partType2"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option label="结算" value="R0003"></el-option>
<el-option label="二配" value="R0001"></el-option>
<!-- @change="valueselectChange" -->
<el-option
v-for="item in partType2List"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
@ -274,12 +280,12 @@ export default {
MaxResultCount: 15,
version: "",
//site: "TH",
customerCode: "",
customerCode: undefined,
//userId: "00000000-0000-0000-0000-000000000000",
partCode:"",//
partName:"",//
partType:"",//
partChildType:"",//
partType2:"",//
},
listExportQuery: {
Filters: [
@ -308,26 +314,34 @@ export default {
isEdit: false,
sortState:false, //
partCode:'',
partName:'',
partType:'',
partChildType:'',
partType1Query:{
dicTypeName:"客户零件类型1",
},
partType2Query:{
dicTypeName:"客户零件类型2",
},
partType1List:[],
partType2List:[],
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
console.log(offsetHei);
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
console.log(this.$refs.box.offsetHeight);
console.log(this.tableHeight);
//console.log(this.$refs.box.offsetHeight);
//console.log(this.tableHeight);
});
},
created() {
//this.getVersionInfo();
//if (this.versionList == []) {
this.getPartType();
this.getList();
//}
},
@ -353,7 +367,7 @@ export default {
});
tempsTabs.push({
label: "零件子类型",
prop: "partChildType",
prop: "partType2",
width: 120,
});
tempsTabs.push({
@ -452,16 +466,16 @@ export default {
//return moment(date).format("YYYY-MM-DD HH:mm:ss");
return moment(date).format("YYYY-MM-DD");
} */
if(column.property === 'customerCode')
if(column.property === "partType")
{
if(row[column.property] === 'R0001')
if(row[column.property] === "1")
{
var vname = '二配';
var vname = '门板';
return vname;
}
else if(row[column.property] === 'R0003')
else if(row[column.property] === '2')
{
var vname = '结算';
var vname = '柱护板';
return vname;
}
else
@ -472,7 +486,7 @@ export default {
return row[column.property] || "--";
},
importExcelData() {
this.getVersionInfo();
//this.getVersionInfo();
this.listLoading = false;
//
this.showExcelImport = false;
@ -480,34 +494,29 @@ export default {
//
async handleDownload() {
this.listLoading = true;
if (this.versionValue === "") {
this.$message.error("必需选择版本!");
this.listLoading = false;
return;
}
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
// if (this.versionValue === "") {
// this.$message.error("");
// this.listLoading = false;
// return;
// }
// if (this.versionValue != "") {
// this.listQuery.version = this.versionValue;
// }
console.log("发票导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/SettlementPart/Export",
"/api/newjit/part-cfg/export",
this.listQuery
)
.then((res) => {
let fileNameOfProject = res;
let filename = res.item;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
if (filename.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
@ -516,7 +525,7 @@ export default {
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功!",
@ -541,22 +550,22 @@ export default {
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
.gets(
"/api/newjit/part-cfg/list",
this.listQuery
)
.then((response) => {
this.list = response.items;
this.list.forEach(item => {
if(item.customerCode === 'R0001')
{
item.customerCode = '二配';
}
else if(item.customerCode === 'R0003')
{
item.customerCode = '结算';
}
});
// this.list.forEach(item => {
// if(item.customerCode === 'R0001')
// {
// item.customerCode = '';
// }
// else if(item.customerCode === 'R0003')
// {
// item.customerCode = '';
// }
// });
this.totalCount = response.totalCount;
setTimeout(() => {
//
@ -617,15 +626,15 @@ export default {
this.listQuery.Filters.push(filter);
}
if (this.partChildType != "") {
var column = "partChildType";
if (this.partType2 != "") {
var column = "partType2";
let filter = {
logic: 0,
column: column,
action: 0,
value: this.partChildType,
value: this.partType2,
};
this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partChildType")
this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partType2")
this.listQuery.Filters.push(filter);
}
*/
@ -677,9 +686,12 @@ export default {
},
/** 重置按钮操作 */
resetQuery(refName) {
this.OnlineTimeVale = [];
this.ReceiveTimeVale = [];
this.listQuery.partCode = "";
this.listQuery.partName = "";
this.listQuery.partType = "";
this.listQuery.partType2 = "";
this.$refs[refName].resetFields();
this.getPartType()
this.handleFilter();
},
sortChange(data) {
@ -723,6 +735,32 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
//
getPartType()
{
this.$axios
.gets(
"/api/newjit/dic/list",this.partType1Query
)
.then((response) => {
console.log(response);
this.partType1List = response.item;
//console.log()
})
.catch(() => {
});
this.$axios
.gets(
"/api/newjit/dic/list",this.partType2Query
)
.then((response) => {
console.log(response);
this.partType2List = response.item;
//console.log()
})
.catch(() => {
});
},
},
};
</script>

347
vue/src/views/pg-fis/basedate/m100BIll/detail.vue

@ -0,0 +1,347 @@
<!--M100上线信息-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
prop="总成名称"
label="erpAssemblyName"
sortable
width="180"
>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="180"
>
style="width: calc(100% - 47px)"
class="two-list"
</el-table-column> -->
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column
prop="partCode"
label="客户零件代码"
></el-table-column>
<el-table-column
prop="partNum"
label="客户零件数量"
></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</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-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="360"
>
</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"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
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 - 190;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
this.$axios
.gets("/api/newjit/bill-m100/"+ this.customerInfo.parentId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
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 === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
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 "../../../ux/styles/crmtable.scss";
</style>

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

@ -320,9 +320,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上线日期:">
<el-form-item label="上线日期:" prop="onlineTime" required>
<el-date-picker
v-model="form.year"
v-model="form.onlineTime"
style="width: 350px"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@ -362,26 +362,26 @@
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column prop="erpAssemblyCode" label="ERP总成编号" width="150px" >
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<el-input v-model="scope.row.erpAssemblyCode" size="mini" style="width:135px"></el-input>
</template> -->
</template>
</el-table-column>
<el-table-column prop="erpAssemblyName" label="ERP总成名称">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<el-input v-model="scope.row.erpAssemblyName" size="mini"></el-input>
</template> -->
</template>
</el-table-column>
<el-table-column prop="description" width="35px">
<el-table-column width="35px">
<template slot="header">
<!-- <el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button> -->
<el-button @click="handleAddLeftDetails" icon="el-icon-plus" type="text"></el-button>
</template>
<template slot-scope="scope">
<el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
<el-button @click="handleLeftDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-divider class="divider2" content-position="left">添加ERP总成</el-divider>
<!-- <el-divider class="divider2" content-position="left">添加ERP总成</el-divider>
<el-row>
<el-form-item label="ERP总成编码:" prop="erpAssemblyCode" >
<el-input
@ -420,7 +420,7 @@
</el-row>
<div style="text-align:center;margin: 0px;margin-bottom: 15px;">
<el-button type="primary" @click="leftclick">添加总成</el-button>
</div>
</div> -->
</div>
</el-col>
<el-col :span="12">
@ -454,9 +454,9 @@
<el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
</template>
</el-table-column>
<el-table-column prop="partName" label="客户零件名称">
<el-table-column prop="description" label="客户零件名称">
<template slot-scope="scope">
<el-input v-model="scope.row.partName" size="mini"></el-input>
<el-input v-model="scope.row.description" size="mini"></el-input>
</template>
</el-table-column>
<el-table-column prop="partNum" label="客户零件数量" width="120px" >
@ -464,17 +464,17 @@
<el-input-number v-model="scope.row.partNum" :min="1" size="mini" style="width:100px"></el-input-number>
</template>
</el-table-column>
<el-table-column prop="description" width="35px">
<el-table-column width="35px">
<template slot="header">
<!-- <el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button> -->
<el-button @click="handleAddRightDetails" icon="el-icon-plus" type="text"></el-button>
</template>
<template slot-scope="scope">
<el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
<el-button @click="handleRightDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-divider class="divider2" content-position="left">添加ERP结算件</el-divider>
<!-- <el-divider class="divider2" content-position="left">添加ERP结算件</el-divider>
<el-row>
<el-form-item label="客户零件代码:" prop="customerPartCode" >
<el-input
@ -507,7 +507,7 @@
</el-row>
<div style="text-align:center;margin: 0px;margin-bottom: 15px;">
<el-button type="primary">添加零件</el-button>
</div>
</div> -->
</div>
</el-col>
</el-row>
@ -559,6 +559,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//
@ -574,7 +575,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
export default {
name: "m100Bill",
components: { Pagination, CRMTableHead, importExcel },
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -652,6 +653,11 @@ export default {
//UserId: "00000000-0000-0000-0000-000000000000",
},
form:{
knr:"",
vehicleModelCode:"",
vin:"",
hostSN:"",
onlineTimeVale:"",
leftdetails:[],
rightdetails:[],
},
@ -758,11 +764,12 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
console.log("保存参数:" + JSON.stringify(this.form));
console.log(this.form);
this.formLoading = true;
if (this.isEdit) {
//
this.$axios
.puts("/api/newjit/assembly-cfg-erp/" + this.form.id, this.form)
.puts("/api/newjit/new-m100" + this.form.id, this.form)
.then((response) => {
this.formLoading = false;
this.$notify({
@ -875,9 +882,9 @@ export default {
fetchData(id) {
//
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + id)
.gets("/api/newjit/new-m100/" + id)
.then((response) => {
this.form = response.item;
this.form = response.item.m100Bill;
//this.details = response.item.details;
//console.log(this.details);
});
@ -889,7 +896,7 @@ export default {
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listExportQuery));
this.$axios
.posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
.posts("/api/newjit/new-m100/export", this.listExportQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -932,10 +939,10 @@ export default {
this.listQuery.KNREnd = "";
this.listQuery.VINBegin = "";
this.listQuery.VINEnd = "";
this.listQuery.OnlineTimeValue = "";
this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = "";
this.listQuery.OnlineTimeEnd = "";
this.listQuery.ReceiveTimeValue = "";
this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = "";
this.listQuery.ReceiveTimeEnd = "";
this.handleQuery();
@ -968,24 +975,42 @@ export default {
}
},
handleAddDetails() {
if (this.form.details === undefined) {
this.form.details = [];
handleAddLeftDetails() {
this.$forceUpdate();
if (this.form.leftdetails === undefined) {
this.form.leftdetails = [];
//console.log(679);
}
let obj = {};
obj.partCode = "";
obj.partName = "";
obj.partNum = "";
obj.isKey = false;
obj.description = "";
obj.erpAssemblyCode = "";
obj.erpAssemblyName = "";
obj.vehicleModel = this.form.vehicleModel;
console.log(this.form.details);
this.form.details.push(obj);
console.log(this.form.leftdetails);
this.form.leftdetails.push(obj);
//console.log(688);
},
handleDeleteDetails(index){
this.form.details.splice(index, 1);
handleAddRightDetails() {
this.$forceUpdate();
if (this.form.rightdetails === undefined) {
this.form.rightdetails = [];
//console.log(679);
}
let obj = {};
obj.customerPartCode = "";
obj.customerpartName = "";
obj.partQty= "";
console.log(this.form.rightdetails);
this.form.rightdetails.push(obj);
//console.log(688);
},
handleLeftDeleteDetails(index){
this.form.leftdetails.splice(index, 1);
//console.log(693);
},
handleRightDeleteDetails(index){
this.form.rightdetails.splice(index, 1);
//console.log(693);
},
@ -1009,8 +1034,22 @@ export default {
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
console.log(1030)
if(this.listQuery.OnlineTimeValue!== undefined)
{
console.log(1033)
console.log(this.listQuery.OnlineTimeValue)
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
console.log(this.listQuery.OnlineTimeValue)
if(this.listQuery.ReceiveTimeValue!== undefined)
{
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
this.$axios
.gets("/api/newjit/bill-r100/list", this.listQuery)
.gets("/api/newjit/new-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@ -1121,6 +1160,7 @@ export default {
//console.log(this.listQuery.productType)
//console.log(this.PLChildList)
},
//
getvehicleModel()
{
this.$axios
@ -1141,7 +1181,7 @@ export default {
let obj = {};
obj.erpAssemblyCode = this.form.erpAssemblyCode;
obj.erpAssemblyName = this.form.erpAssemblyName;
obj.vehicleModel = this.form.vehicleModel;
obj.vehicleModel = this.form.vehicleModelCode;
if (this.form.leftdetails === undefined) {
this.form.leftdetails = [];

354
vue/src/views/pg-fis/basedate/m100Online/detail.vue

@ -0,0 +1,354 @@
<!--M100上线信息-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
prop="总成名称"
label="erpAssemblyName"
sortable
width="180"
>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="180"
>
style="width: calc(100% - 47px)"
class="two-list"
</el-table-column> -->
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column
prop="partCode"
label="客户零件代码"
></el-table-column>
<el-table-column
prop="partNum"
label="客户零件数量"
></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</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-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="360"
>
</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"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
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 - 190;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 160,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
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 === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
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 "../../../ux/styles/crmtable.scss";
</style>

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

@ -39,7 +39,7 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.id"/>
:value="item.productLineCode"/>
</el-select>
</el-form-item>
@ -141,7 +141,7 @@
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeVale"
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -155,7 +155,7 @@
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeVale"
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -166,8 +166,8 @@
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State">
<el-checkbox-group v-model="listQuery.state" >
<el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
<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>
@ -294,6 +294,12 @@
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</div>
@ -306,6 +312,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//
@ -323,7 +330,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
export default {
name: "M100Online",
components: { Pagination, CRMTableHead, importExcel },
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -381,7 +388,7 @@ export default {
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
version:undefined,
Version:undefined,
serialNumBegin:undefined,
serialNumEnd:undefined,
HostSNBegin:undefined,
@ -390,12 +397,13 @@ export default {
KNREnd:undefined,
VINBegin:undefined,
VINEnd:undefined,
OnlineTimeValue:undefined,
OnlineTimeValue:[],
OnlineTimeBegin:undefined,
OnlineTimeEnd:undefined,
ReceiveTimeValue:undefined,
ReceiveTimeValue:[],
ReceiveTimeBegin:undefined,
ReceiveTimeEnd:undefined,
billStatus:undefined,
state:[],
},
@ -439,6 +447,12 @@ export default {
});
},
created() {
this.billState.forEach((element,index) => {
if(index === 0)
{
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
@ -488,6 +502,11 @@ export default {
prop: "r100ReceiveTime",
width: 180,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "备注",
prop: "remark",
@ -500,7 +519,9 @@ export default {
//
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.id; //id
console.log(510)
console.log(param)
var parentId = param.assemblyID; //id
this.customerInfos = [
{
ParentId: parentId,
@ -525,9 +546,9 @@ export default {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listExportQuery));
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
.posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -563,19 +584,23 @@ export default {
//this.$refs[refName].resetFields();
this.listQuery.billType = "";
this.listQuery.productLine = "";
this.listQuery.version = "";
this.listQuery.Version = "";
this.listQuery.serialNumBegin = "";
this.listQuery.serialNumEnd = "";
this.listQuery.HostSNBegin = "";
this.listQuery.HostSNEnd = "";
this.listQuery.KNRBegin = "";
this.listQuery.KNREnd = "";
this.listQuery.VINBegin = "";
this.listQuery.VINEnd = "";
this.listQuery.OnlineTimeValue = "";
this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = "";
this.listQuery.OnlineTimeEnd = "";
this.listQuery.ReceiveTimeValue = "";
this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = "";
this.listQuery.ReceiveTimeEnd = "";
this.listQuery.state = [];
this.listQuery.billStatus = "";
this.handleQuery();
this.getProductLine();
},
@ -647,6 +672,20 @@ export default {
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if(this.listQuery.OnlineTimeValue!== undefined)
{
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
if(this.listQuery.ReceiveTimeValue!== undefined)
{
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if(this.listQuery.state!== undefined)
{
this.listQuery.billStatus = this.listQuery.state[0];
}
this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => {
@ -759,6 +798,19 @@ export default {
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList)
},
/*单据状态变更 */
checkedListChange(index)
{
if(this.listQuery.state.length <= 1)
{
this.listQuery.state.push(this.billState[index].id);
}
else
{
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
},
},
};
</script>

6
vue/src/views/pg-fis/basedate/productLine/index.vue

@ -394,9 +394,9 @@ export default {
version: "",
customerCode: "",
//userId: "00000000-0000-0000-0000-000000000000",
userName:"",//
name:"",//
productLineCode:"",//线
userName:undefined,//
name:undefined,//
productLineCode:undefined,//线
},
listExportQuery: {
Filters: [

354
vue/src/views/pg-fis/basedate/r100Online/detail.vue

@ -0,0 +1,354 @@
<!--M100上线信息-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
prop="总成名称"
label="erpAssemblyName"
sortable
width="180"
>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="180"
>
style="width: calc(100% - 47px)"
class="two-list"
</el-table-column> -->
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column
prop="partCode"
label="客户零件代码"
></el-table-column>
<el-table-column
prop="partNum"
label="客户零件数量"
></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</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-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="360"
>
</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"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
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 - 190;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 160,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
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 === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
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 "../../../ux/styles/crmtable.scss";
</style>

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

@ -39,7 +39,7 @@
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.id"/>
:value="item.productLineCode"/>
</el-select>
</el-form-item>
@ -98,7 +98,7 @@
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="底盘号:" prop="VINBegin">
<!-- <el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
@ -117,11 +117,11 @@
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeVale"
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -135,7 +135,7 @@
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeVale"
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -147,7 +147,7 @@
</el-form-item>
<el-form-item label="单据状态" prop="State">
<el-checkbox-group v-model="listQuery.state" >
<el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
<el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id" @change="checkedListChange(index)">
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
@ -210,9 +210,9 @@
@row-click="handleRowClick"
>
<!-- <el-table-column
label="底盘号"
prop="vin "
<el-table-column
label="KNR"
prop="knr "
sortable="custom"
align="center"
@ -220,10 +220,10 @@
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.vin
scope.row.knr
}}</span>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
@ -260,6 +260,12 @@
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</div>
@ -272,6 +278,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//
@ -289,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
export default {
name: "M100Online",
components: { Pagination, CRMTableHead, importExcel },
components: { Pagination, CRMTableHead, importExcel , Detail},
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -347,19 +354,20 @@ export default {
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
version:undefined,
Version:undefined,
HostSNBegin:undefined,
HostSNBegin:undefined,
KNRBegin:undefined,
KNREnd:undefined,
VINBegin:undefined,
//VINBegin:undefined,
VINEnd:undefined,
OnlineTimeValue:undefined,
OnlineTimeValue:[],
OnlineTimeBegin:undefined,
OnlineTimeEnd:undefined,
ReceiveTimeValue:undefined,
ReceiveTimeValue:[],
ReceiveTimeBegin:undefined,
ReceiveTimeEnd:undefined,
billStatus:undefined,
state:[],
},
@ -402,6 +410,12 @@ export default {
});
},
created() {
this.billState.forEach((element,index) => {
if(index === 0)
{
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
@ -415,11 +429,11 @@ export default {
// prop: "vin",
// width: 130,
// });
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 150,
});
// tempsTabs.push({
// label: "KNR",
// prop: "knr",
// width: 150,
// });
tempsTabs.push({
label: "单据状态",
prop: "billState",
@ -455,6 +469,11 @@ export default {
prop: "erpAssemblyName",
width: 180,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "备注",
prop: "remark",
@ -467,7 +486,7 @@ export default {
//
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.id; //id
var parentId = param.assemblyID; //id
this.customerInfos = [
{
ParentId: parentId,
@ -482,9 +501,9 @@ export default {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listExportQuery));
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
.posts("/api/newjit/bill-r100/export", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -520,19 +539,21 @@ export default {
//this.$refs[refName].resetFields();
this.listQuery.billType = "";
this.listQuery.productLine = "";
this.listQuery.version = "";
this.listQuery.Version = "";
this.listQuery.HostSNBegin = "";
this.listQuery.HostSNEnd = "";
this.listQuery.KNRBegin = "";
this.listQuery.KNREnd = "";
this.listQuery.VINBegin = "";
//this.listQuery.VINBegin = "";
this.listQuery.VINEnd = "";
this.listQuery.OnlineTimeValue = "";
this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = "";
this.listQuery.OnlineTimeEnd = "";
this.listQuery.ReceiveTimeValue = "";
this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = "";
this.listQuery.ReceiveTimeEnd = "";
this.listQuery.state = [];
this.listQuery.billStatus = "";
this.handleQuery();
this.getProductLine();
},
@ -604,8 +625,22 @@ export default {
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if(this.listQuery.OnlineTimeValue!== undefined)
{
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
if(this.listQuery.ReceiveTimeValue!== undefined)
{
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if(this.listQuery.state!== undefined)
{
this.listQuery.billStatus = this.listQuery.state[0];
}
this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery)
.gets("/api/newjit/bill-r100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@ -714,6 +749,19 @@ export default {
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList)
},
/*单据状态变更 */
checkedListChange(index)
{
if(this.listQuery.state.length <= 1)
{
this.listQuery.state.push(this.billState[index].id);
}
else
{
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
},
},
};
</script>

270
vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue

@ -0,0 +1,270 @@
<!--未知总成-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
label="客户零件代码"
prop="partCode "
sortable="custom"
align="center"
width="220px"
>
<template slot-scope="scope">
<span>{{ scope.row.partCode }}</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div 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"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
parentId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
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 - 190;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
//tempsTabs.push({ label: "", prop: "partCode ", width: 120 });
tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 95 });
tempsTabs.push({ label: "描述", prop: "description", width: 280 });
return tempsTabs;
},
},
methods: {
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
// fieldFormatter(row, column) {
// return row[column.property] || "--";
// },
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
this.$axios
.gets("/api/newjit/unknown-assembly/" + this.customerInfo.parentId)
.then((response) => {
this.list = response.item.unknownAssemblyParts;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
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 }) {
return { textAlign: "left" };
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
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;
}

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

File diff suppressed because it is too large

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

@ -19,9 +19,11 @@
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option label="0" value="0"></el-option>
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
@ -34,10 +36,10 @@
@change="valueselectChange"
>
<el-option
v-for="item in PLList"
:key="item.productLineCode"
v-for="item in PLChildList"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"/>
:value="item.id"/>
</el-select>
</el-form-item>
@ -139,7 +141,7 @@
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeVale"
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -153,7 +155,7 @@
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeVale"
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
@ -164,8 +166,8 @@
></el-date-picker>
</el-form-item>
<el-form-item label="对比状态" prop="State">
<el-checkbox-group v-model="listQuery.state" >
<el-checkbox v-for="item in billState" :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>
@ -192,7 +194,16 @@
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出焊装总成对比
>导出焊装总成对比(Excel)
</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownloadCSV()"
>导出焊装总成对比(CSV)
</el-button>
</el-form-item>
<!-- </el-row> -->
@ -328,7 +339,7 @@ export default {
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
billState:[
compareState:[
{id:0,name:"有焊装无总装"},
{id:1,name:"有焊装有总装"}
],
@ -373,7 +384,9 @@ export default {
ReceiveTimeValue:undefined,
ReceiveTimeBegin:undefined,
ReceiveTimeEnd:undefined,
state:[],
HasR100NotHasM100:undefined,//
HasR100HasM100:undefined,//
cstate:[],
},
listExportQuery: {
@ -400,6 +413,9 @@ export default {
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight:250,
details:[], //
billStatus:[],
PLChildList:[],//线
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
};
},
mounted() {
@ -413,6 +429,10 @@ export default {
});
},
created() {
this.compareState.forEach((element,index) => {
this.listQuery.cstate.push(element.id);
});
this.getProductLine();
this.getList();
},
computed: {
@ -514,7 +534,45 @@ export default {
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listExportQuery));
this.$axios
.posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
.posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
/** 导出功能 */
handleDownloadCSV() {
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/r100-m100-compare/export-CSV", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -550,7 +608,9 @@ export default {
//this.$refs[refName].resetFields();
this.listQuery.billType = "";
this.listQuery.productLine = "";
this.listQuery.version = "";
this.listQuery.Version = "";
this.listQuery.serialNumBegin = "";
this.listQuery.serialNumEnd = "";
this.listQuery.HostSNBegin = "";
this.listQuery.HostSNEnd = "";
this.listQuery.KNRBegin = "";
@ -563,6 +623,7 @@ export default {
this.listQuery.ReceiveTimeValue = "";
this.listQuery.ReceiveTimeBegin = "";
this.listQuery.ReceiveTimeEnd = "";
this.listQuery.cstate = [];
this.handleQuery();
this.getProductLine();
},
@ -634,8 +695,38 @@ export default {
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if(this.listQuery.OnlineTimeValue!== undefined)
{
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
if(this.listQuery.ReceiveTimeValue!== undefined)
{
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
this.listQuery.HasR100NotHasM100 = false;
this.listQuery.HasR100HasM100 = false;
if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
{
console.log(this.listQuery.cstate)
this.listQuery.cstate.forEach(element => {
console.log(element)
if(element === 0)
{
this.listQuery.HasR100NotHasM100 = true;
}
if(element === 1)
{
this.listQuery.HasR100HasM100 = true;
}
});
}
this.$axios
.gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
.gets("/api/newjit/r100-m100-compare/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@ -729,7 +820,7 @@ export default {
.then((response) => {
//console.log(response);
this.PLList = response.item;
//console.log(this.PLList);
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
})
.catch(() => {
});
@ -738,7 +829,8 @@ export default {
ptypeselectChange()
{
//console.log(this.listQuery.productType);
this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList);
},
},

Loading…
Cancel
Save