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)
},
},