From 7cbcf585e6d91ae89f7c3bba48966a96d86ad89f Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Thu, 18 Nov 2021 09:52:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AA=E7=BB=93=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5DTO=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UnSettleAccountImportDto.cs | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
index b97de870..9a41e069 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
@@ -1,4 +1,5 @@
-using System;
+using Magicodes.ExporterAndImporter.Core;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -13,59 +14,69 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
///
/// 期间
///
- public string Period { set; get; }
+ // public string Period { set; get; }
///
/// 年份
///
+ [ImporterHeader(Name = "年份")]
public string SettleYear { set; get; }
///
/// 年份
///
- public virtual string Year { set; get; }
+ //public virtual string Year { set; get; }
///
/// KENEN号
///
+ [ImporterHeader(Name = "KENN号")]
public virtual string KENNCode { set; get; }
///
/// 底盘号
///
+ [ImporterHeader(Name = "底盘号")]
public virtual string ChassisNumber { set; get; }
///
/// 车型
///
+ [ImporterHeader(Name = "车型")]
public virtual string Model { set; get; }
///
/// CP5A日期
///
+ [ImporterHeader(Name = "CP5A日期")]
public virtual DateTime CP5A { set; get; }
///
/// CP7
///
+ [ImporterHeader(Name = "CP7日期")]
public virtual DateTime CP7 { set; get; }
///
/// 零件号
///
+ [ImporterHeader(Name = "零件号",FixAllSpace =true)]
public virtual string MaterialCode { get; set; }
///
/// 数量
///
+ [ImporterHeader(Name = "数量")]
public virtual decimal Qty { get; set; }
///
/// 结算标识
///
-
+ [ImporterHeader(Name = "结算标识")]
public virtual string SettlementID { get; set; }
///
/// 结算供应商
///
+ [ImporterHeader(Name = "结算供应商")]
public virtual string SettlementSupplier { get; set; }
///
/// 未结算原因
///
+ [ImporterHeader(Name = "未结算原因")]
public string UnsettledReason { get; set; }
}
}
From 5b53adb69a33b5e4e929a6e0bb23c7fb57804a03 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Thu, 18 Nov 2021 16:12:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E6=9C=AA=E7=BB=93?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AF=BC=E5=85=A5=E5=90=8E=E7=AB=AF=E6=9C=8D?=
=?UTF-8?q?=E5=8A=A1=E5=92=8C=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2=E7=9A=84?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=92=8C=E5=AF=BC=E5=87=BA=E7=AD=89=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UnSettleAccountImportDto.cs | 2 +-
.../UnSettleAccountAppService.cs | 6 ++--
...ttleAccountApplicationAutoMapperProfile.cs | 28 ++++++++--------
.../UnSettleAccounts/UnSettleAccount.cs | 6 ++--
.../UnSettleAccountVersionRepository.cs | 33 +++++++++++++++----
.../UnSettleAccountImportService.cs | 4 +--
.../SettleAccountJobModule.cs | 5 ++-
vue/src/router/modules/vwFisData.js | 2 +-
.../views/ux/vw/dataInput/r3-open/index.vue | 7 ++--
vue/src/views/ux/vw/dataInput/r3/index.vue | 2 +-
vue/static/tableFieldForSearch.json | 10 +++---
11 files changed, 65 insertions(+), 40 deletions(-)
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
index 9a41e069..1b2eb0be 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
@@ -49,7 +49,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// CP7
///
[ImporterHeader(Name = "CP7日期")]
- public virtual DateTime CP7 { set; get; }
+ public virtual DateTime? CP7 { set; get; }
///
/// 零件号
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
index f2a94aa1..f3a36da0 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
@@ -101,13 +101,15 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("ExcelImport")]
[DisableRequestSizeLimit]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
- public async Task UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory)
+ public async Task UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId,
+ string year, string period, string version, string customerCode, string factory)
{
List customConditionList = new List();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode });
- customConditionList.Add(new CustomCondition() { Name = "Factory", Value = customerCode });
+ customConditionList.Add(new CustomCondition() { Name = "Year", Value = year });
+ customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory });
var _taskid = await _service.ImportEnqueueAsync(files, "大众FIS未结算明细", CurrentUser, typeof(UnSettleAccountImportService), customConditionList, (rs) => {
});
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 0e1cbd89..c2e7c21c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -201,8 +201,10 @@ namespace Win.Sfs.SettleAccount
CreateMapScrapClaimsVersion();
CreateMapSparePart();
CreateMapSparePartVersion();
+
CreateMapSettleAccount();
CreateMapSettleAccountVersion();
+
CreateMapUnSettleAccount();
CreateMapUnSettleAccountVersion();
@@ -353,27 +355,23 @@ namespace Win.Sfs.SettleAccount
///
private void CreateMapUnSettleAccount()
{
- CreateMap().ReverseMap();
- CreateMap();
- CreateMap();
-
- CreateMap();
-
-
-
- CreateMap();
- CreateMap();
+ CreateMap().ReverseMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
}
///
/// 大众FIS未结算明细导入-版本
///
private void CreateMapUnSettleAccountVersion()
{
- CreateMap().ReverseMap();
- CreateMap();
- CreateMap();
- CreateMap();
- CreateMap();
+ CreateMap().ReverseMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
+ CreateMap();
}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
index e88e0e8a..9b48cbf2 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
@@ -47,9 +47,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
///
public DateTime CP5A { set; get; }
///
- /// CP7日期
+ /// CP7日期,可空
///
- public DateTime CP7 { set; get; }
+ public DateTime? CP7 { set; get; }
///
/// 零件号
@@ -102,7 +102,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
public UnSettleAccount(
Guid id,
Guid branchId,
- string year, string kENNCode, string chassisNumber, string model, DateTime cP5A, DateTime cP7, string materialCode, decimal qty, string settlementID, string settlementSupplier, string period,string settleYear, Guid parentId,string version , DateTime creationTime, Guid guid,string reason) :base(id)
+ string year, string kENNCode, string chassisNumber, string model, DateTime cP5A, DateTime? cP7, string materialCode, decimal qty, string settlementID, string settlementSupplier, string period,string settleYear, Guid parentId,string version , DateTime creationTime, Guid guid,string reason) :base(id)
{
BranchId = branchId;
Year = year;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
index 392ba228..4da812ae 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
@@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
{
- public class UnSettleAccountVersionRepository : EfCoreRepository, ITransientDependency
+ public class UnSettleAccountVersionRepository : EfCoreRepository, ITransientDependency
{
public UnSettleAccountVersionRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider)
{
@@ -37,19 +37,18 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
}
return true;
}
-
- public virtual bool Insert(string p_version,string p_customCode,string p_factory)
+ public virtual bool Insert(Guid guid, string p_version, string p_customCode, string p_factory)
{
try
{
DbContext.Database.SetCommandTimeout(1200);
- var _first= GetQueryable().FirstOrDefault(p => p.Version == p_version);
+ var _first = GetQueryable().FirstOrDefault(p => p.Version == p_version);
if (_first == null)
{
- var version = new SettleAccountVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
- List _ls = new List();
+ var version = new UnSettleAccountVersion(guid, GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
+ List _ls = new List();
_ls.Add(version);
- DbContext.BulkInsert(_ls) ;
+ DbContext.BulkInsert(_ls);
}
}
catch (Exception e)
@@ -58,5 +57,25 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
}
return true;
}
+ //public virtual bool Insert(string p_version,string p_customCode,string p_factory)
+ //{
+ // try
+ // {
+ // DbContext.Database.SetCommandTimeout(1200);
+ // var _first= GetQueryable().FirstOrDefault(p => p.Version == p_version);
+ // if (_first == null)
+ // {
+ // var version = new UnSettleAccountVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
+ // List _ls = new List();
+ // _ls.Add(version);
+ // DbContext.BulkInsert(_ls) ;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // throw e;
+ // }
+ // return true;
+ //}
}
}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
index 9322831d..fcc1167c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
@@ -42,7 +42,7 @@ namespace TaskJob.Services
var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value;
var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
var year = customConditions.Where(p => p.Name == "Year").FirstOrDefault().Value;
- var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value;
+ //var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value;
var factory = customConditions.Where(p => p.Name == "Factory").FirstOrDefault().Value;
//_versionRepository.Delete(version);
//_repository.Delete(version);
@@ -85,7 +85,7 @@ namespace TaskJob.Services
where g.Count() > 1
select g;
_repository.Insert(_setls);
- _versionRepository.Insert(version, customerCode, customerCode);
+ _versionRepository.Insert(_id, version, customerCode, customerCode);
#region
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
index fe54a625..03164267 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
@@ -56,7 +56,10 @@ namespace Win.Sfs.SettleAccount
{
return implementationFactory.GetService();
}
-
+ if (key.Equals(typeof(UnSettleAccountImportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
if (key.Equals(typeof(InvoiceImportService).FullName))
{
return implementationFactory.GetService();
diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js
index 213c3609..51e0a383 100644
--- a/vue/src/router/modules/vwFisData.js
+++ b/vue/src/router/modules/vwFisData.js
@@ -17,7 +17,7 @@ const vwFisDataRouter = {
},
children: [
{
- path: '/settleAccount',
+ path: '/unSettleAccount',
component: () => import('@/views/ux/vw/dataInput/r3-open'),
name: 'SettleAccount',//命名路由
meta: {
diff --git a/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
index 49e10a41..5da23df7 100644
--- a/vue/src/views/ux/vw/dataInput/r3-open/index.vue
+++ b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
@@ -394,7 +394,7 @@ export default {
}
console.log("R3已结导出:" + JSON.stringify(this.versionValueVerson));
this.$axios
- .gets("/api/settleaccount/UnSettleAccount/Export", {
+ .posts("/api/settleaccount/UnSettleAccount/Export", {
version: this.versionValueVerson,
})
.then((res) => {
@@ -429,7 +429,10 @@ export default {
}
this.listLoading = false;
});
- });
+ })
+ .catch(() => {
+ this.listLoading = false;
+ });;
},
getList() {
this.listLoading = true;
diff --git a/vue/src/views/ux/vw/dataInput/r3/index.vue b/vue/src/views/ux/vw/dataInput/r3/index.vue
index c32408dc..17371498 100644
--- a/vue/src/views/ux/vw/dataInput/r3/index.vue
+++ b/vue/src/views/ux/vw/dataInput/r3/index.vue
@@ -416,7 +416,7 @@ export default {
}
console.log("R3已结导出:" + JSON.stringify(this.versionValueVerson));
this.$axios
- .gets("/api/settleaccount/SettleAccount/Export", {
+ .posts("/api/settleaccount/SettleAccount/Export", {
version: this.versionValueVerson,
})
.then((res) => {
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index f7e2ddd1..386df8d8 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -1898,17 +1898,17 @@
{
"fieldId": 0,
"formType": "text",
- "name": "物料凭证",
+ "name": "工厂",
"type": 1,
"value": "",
"fieldType": 1,
- "fieldName": "textCode",
+ "fieldName": "factory",
"setting": []
},
{
"fieldId": 1,
"formType": "text",
- "name": "物料编号",
+ "name": "物料号",
"type": 1,
"value": "",
"fieldType": 1,
@@ -1918,11 +1918,11 @@
{
"fieldId": 1,
"formType": "text",
- "name": "工厂",
+ "name": "零件名称",
"type": 1,
"value": "",
"fieldType": 1,
- "fieldName": "factory",
+ "fieldName": "materialDesc",
"setting": []
}
]
From c50847e2e05ec5ed3f47487b09d6c1de0d5e995e Mon Sep 17 00:00:00 2001
From: "yu.wu"
Date: Fri, 19 Nov 2021 09:08:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fis=E9=A1=B5=E9=9D=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pg-fis/basedate/assemblyCfg/index.vue | 50 ++++++-
.../views/pg-fis/basedate/m100BIll/index.vue | 137 +++++++++++++-----
.../pg-fis/basedate/m100Online/index.vue | 26 ++--
.../pg-fis/basedate/productLine/index.vue | 89 +++++++-----
.../pg-fis/basedate/r100Online/index.vue | 26 ++--
5 files changed, 224 insertions(+), 104 deletions(-)
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
index daa791cc..038670b9 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
@@ -41,8 +41,11 @@
style="margin-right: 15px"
@change="valueselectChange"
>
-
-
+
@@ -221,7 +224,7 @@
-
+
@@ -242,11 +245,17 @@
-
+ >
+
+
@@ -428,6 +437,9 @@ export default {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
+ vehicleModelQuery:{
+ dicTypeName:"派格车型",
+ },
form:{
details:[]
},
@@ -444,7 +456,8 @@ export default {
dialogFormVisible: false,
tableHeight: document.documentElement.clientHeight - 280,
detailTableHeight:250,
- details:[] //修改子表数据源
+ details:[], //修改子表数据源
+ vehicleModelList:[],//车型list
};
},
mounted() {
@@ -458,6 +471,7 @@ export default {
});
},
created() {
+ this.getvehicleModel();
this.getList();
},
computed: {
@@ -548,6 +562,7 @@ export default {
this.isEdit = false;
this.form = {};
this.details = [];
+ //this.getvehicleModel();
this.dialogFormVisible = true;
},
/** 修改 */
@@ -555,6 +570,7 @@ export default {
this.formTitle = "修改";
this.isEdit = true;
this.details = [];
+ //this.getvehicleModel();
if (this.multipleSelection.length != 1) {
this.$message({
message: "编辑必须选择单行",
@@ -661,7 +677,9 @@ export default {
this.listQuery.ErpAssemblyName = "";
this.listQuery.ErpAssemblyCode = "";
this.listQuery.vehicleModelCode = "";
+ this.getvehicleModel();
this.handleQuery();
+
},
/** 搜索按钮操作 */
handleQuery() {
@@ -690,7 +708,9 @@ export default {
}
},
+ /*添加明细空行*/
handleAddDetails() {
+ this.$forceUpdate();
if (this.form.details === undefined) {
this.form.details = [];
//console.log(679);
@@ -815,6 +835,20 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
+ getvehicleModel()
+ {
+ this.$axios
+ .gets(
+ "/api/newjit/dic/list",this.vehicleModelQuery
+ )
+ .then((response) => {
+ //console.log(response);
+ this.vehicleModelList = response.item;
+ //console.log()
+ })
+ .catch(() => {
+ });
+ },
},
};
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index c47eaffd..6121f3e8 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -19,9 +19,11 @@
style="margin-right: 15px"
@change="ptypeselectChange"
>
-
-
-
+
@@ -34,10 +36,10 @@
@change="valueselectChange"
>
+ :value="item.id"/>
@@ -269,10 +271,10 @@
>
-
+
@@ -282,19 +284,25 @@
-
+
+ >
+
+
-
+
@@ -303,10 +311,10 @@
-
+
@@ -341,7 +349,7 @@
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
- :data="form.details"
+ :data="form.leftdetails"
:height="detailTableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
@@ -353,15 +361,15 @@
@row-click="handleRowClick"
>
-
-
-
-
+
+
-
-
-
-
+
+
@@ -375,7 +383,7 @@
添加ERP总成
-
+
-
+
-
+
+ >
+
+
- 添加总成
+ 添加总成
@@ -423,7 +437,7 @@
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
- :data="form.details"
+ :data="form.rightdetails"
:height="detailTableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
@@ -462,27 +476,27 @@
添加ERP结算件
-
+
-
+
-
+
{
this.list = response.items;
this.totalCount = response.totalCount;
@@ -1080,6 +1103,7 @@ export default {
.then((response) => {
//console.log(response);
this.PLList = response.item;
+ this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList);
})
.catch(() => {
@@ -1088,10 +1112,43 @@ export default {
//产线类型变更
ptypeselectChange()
{
+ this.$forceUpdate();
+ this.listQuery.productLine = "";
//console.log(this.listQuery.productType);
- this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+ //console.log(this.PLChildList)
+ this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList)
+ //console.log(this.listQuery.productType)
+ //console.log(this.PLChildList)
+ },
+ getvehicleModel()
+ {
+ this.$axios
+ .gets(
+ "/api/newjit/dic/list",this.vehicleModelQuery
+ )
+ .then((response) => {
+ //console.log(response);
+ this.vehicleModelList = response.item;
+ //console.log()
+ })
+ .catch(() => {
+ });
+ },
+ leftclick()
+ {
+ this.$forceUpdate();
+ let obj = {};
+ obj.erpAssemblyCode = this.form.erpAssemblyCode;
+ obj.erpAssemblyName = this.form.erpAssemblyName;
+ obj.vehicleModel = this.form.vehicleModel;
+
+ if (this.form.leftdetails === undefined) {
+ this.form.leftdetails = [];
+ }
+ this.form.leftdetails.push(obj);
},
+ rightclick(){},
},
};
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index d22d3426..2246fc30 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -19,9 +19,11 @@
style="margin-right: 15px"
@change="ptypeselectChange"
>
-
-
-
+
@@ -34,10 +36,10 @@
@change="valueselectChange"
>
+ :value="item.id"/>
@@ -402,7 +404,7 @@ export default {
erpAssemblyName: undefined,
},
listPLQuery:{
- BillType: 1,
+ BillType: 2,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form:{
@@ -422,6 +424,8 @@ export default {
detailTableHeight:250,
details:[], //修改子表数据源
PLList:[],//产线下拉
+ PLChildList:[],//筛选后产线下拉
+ productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
};
},
mounted() {
@@ -436,6 +440,7 @@ export default {
},
created() {
this.getList();
+ this.getProductLine();
},
computed: {
getDefaultField() {
@@ -643,7 +648,7 @@ export default {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
this.$axios
- .gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
+ .gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@@ -739,6 +744,7 @@ export default {
.then((response) => {
//console.log(response);
this.PLList = response.item;
+ this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
//console.log(this.PLList)
})
.catch(() => {
@@ -747,8 +753,10 @@ export default {
//产线类型变更
ptypeselectChange()
{
+ this.$forceUpdate();
//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)
},
},
diff --git a/vue/src/views/pg-fis/basedate/productLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue
index e5ecc8b4..3d824d00 100644
--- a/vue/src/views/pg-fis/basedate/productLine/index.vue
+++ b/vue/src/views/pg-fis/basedate/productLine/index.vue
@@ -20,31 +20,31 @@
> -->
-
+
-
+
-
+
-
+
@@ -177,6 +177,9 @@
{{ scope.column.label }}
+
+ {{scope.row[item.prop]}}
+
@@ -233,6 +236,9 @@
{{ scope.column.label }}
+
+ {{scope.row[item.prop]}}
+
@@ -409,11 +415,11 @@ export default {
userId: "",
},
listPLQuery:{
- BillType: 1,
+ BillType: 0,
//UserId: "00000000-0000-0000-0000-000000000000",
},
saveQuery:{
- userId: 1,
+ userId: "",
productLineIdList:[],
},
showSearch: true,
@@ -467,30 +473,25 @@ export default {
prop: "name",
width: 140
});
- tempsTabs.push({
- label: "部门",
- prop: "dep",
- width: 120,
- });
+ // tempsTabs.push({
+ // label: "部门",
+ // prop: "dep",
+ // width: 120,
+ // });
return tempsTabs;
},
/** 列表字段 */
getChildDefaultField() {
var tempsTabs = [];
- tempsTabs.push({
- label: "序号",
- prop: "seq",
- width: 50,
- });
tempsTabs.push({
label: "生产线编码",
- prop: "workLineCode",
+ prop: "productLineCode",
width: 100,
});
tempsTabs.push({
label: "生产线名称",
- prop: "workLineName",
+ prop: "productLineName",
width: 170
});
return tempsTabs;
@@ -671,6 +672,7 @@ export default {
//大数据量加载时
this.listLoading = false;
}, 500);
+ this.detaillist = this.list.filter(u => u.id === this.multipleSelection[0].id)[0].productLineList;
})
.catch(() => {
this.listLoading = false;
@@ -834,6 +836,7 @@ export default {
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
+ console.log(row)
this.detaillist = row.productLineList;
//console.log(this.detaillist)
},
@@ -891,47 +894,57 @@ export default {
this.form.worklines = [];
var templist = this.PLList;
this.multipleSelection[0].productLineList.forEach(element => {
- templist = this.templist.filter(u => u.productLineCode !== element.productLineCode);
+ templist = templist.filter(u => u.id !== element.id);
});
- templist.forEach(element => {
- this.form.worklines.push(
- parseInt(element.productLineCode));
- });
- //console.log(this.form.worklines)
this.PLList.forEach(element => {
this.UsePLList.push(
{
- key:parseInt(element.productLineCode),
+ key:this.PLList.indexOf(element), //parseInt(element.productLineCode),
label:element.productLineName,
- id:"",
+ id:element.id,
+ productLineCode:element.productLineCode,
disabled:false,
}
);
});
+ templist.forEach(element => {
+ var key = this.UsePLList.filter(u => u.id === element.id)[0].key;//获取未分配的产线key
+ this.form.worklines.push(key);
+ });
+ console.log(this.form.worklines);
this.form.userName = this.multipleSelection[0].userName;
},
//窗口确认
save()
{
- console.log(this.form.worklines);
- console.log(this.UsePLList);
var templist = this.UsePLList;
this.form.worklines.forEach(element => {
templist = templist.filter(u => u.key !== element);
});
- console.log(918);
- console.log(templist);
+ //console.log(933);
+ //console.log(templist);
+ this.saveQuery.userId = [];
+ this.saveQuery.productLineIdList = [];
+ //console.log(this.multipleSelection[0]);
+ this.saveQuery.userId = this.multipleSelection[0].id;
+ templist.forEach(element => {
+ this.saveQuery.productLineIdList.push(element.id)
+ });
+ //console.log(this.saveQuery);
+
this.$axios
- .gets(
- "/api/newjit/product-line-authority/do-authority",this.listPLQuery
+ .puts(
+ "/api/newjit/product-line-authority/do-authority",this.saveQuery
)
.then((response) => {
console.log(response);
- this.PLList = response.item;
- //console.log()
+ this.dialogFormVisible = false;
+ this.getList();
+ console.log(948)
+ this.detaillist = this.list.filter(u => u.id === this.multipleSelection[0].id)[0].productLineList;
})
.catch(() => {
});
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 6786bed2..0fe9f3c3 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -19,9 +19,11 @@
style="margin-right: 15px"
@change="ptypeselectChange"
>
-
-
-
+
@@ -34,10 +36,10 @@
@change="valueselectChange"
>
+ :value="item.id"/>
@@ -385,6 +387,8 @@ export default {
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight:250,
details:[], //修改子表数据源
+ PLChildList:[],//筛选后产线下拉
+ productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
};
},
mounted() {
@@ -399,6 +403,7 @@ export default {
},
created() {
this.getList();
+ this.getProductLine();
},
computed: {
getDefaultField() {
@@ -600,7 +605,7 @@ export default {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
this.$axios
- .gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
+ .gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@@ -694,7 +699,8 @@ 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));
+ //console.log(this.PLList)
})
.catch(() => {
});
@@ -702,8 +708,10 @@ export default {
//产线类型变更
ptypeselectChange()
{
+ this.$forceUpdate();
//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)
},
},