PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fis页面联调

branch_ccpg_220107
yu.wu 3 years ago
parent
5b53adb69a
commit
c50847e2e0
5 changed files with 224 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  2. 137
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  3. 26
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  4. 89
      vue/src/views/pg-fis/basedate/productLine/index.vue
  5. 26
      vue/src/views/pg-fis/basedate/r100Online/index.vue

50
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
View File

@ -41,8 +41,11 @@
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option label="结算" value="R0003"></el-option>
<el-option label="二配" value="R0001"></el-option>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
@ -221,7 +224,7 @@
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="4">
<el-form-item label="总成类型：" required />
</el-col>
@ -234,7 +237,7 @@
/>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="4">
@ -242,11 +245,17 @@
</el-col>
<el-col :span="20">
<el-form-item prop="vehicleModel">
<el-input
<el-select
style="width: 200px"
v-model="form.model"
v-model="form.vehicleModel"
:disabled="isEdit"
/>
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -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(() => {
});
},
},
};
</script>

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

@ -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>
@ -269,10 +271,10 @@
>
<el-row>
<el-col :span="12">
<el-form-item label="KNR:" prop="erpAssemblyCode" required >
<el-form-item label="KNR:" prop="knr" required >
<el-input
style="width: 350px"
v-model="form.erpAssemblyCode"
v-model="form.knr"
:disabled="isEdit"
placeholder="请选择添加M100信息对应的KNR号"
/>
@ -282,19 +284,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="车型:" prop="vehicleModel" required >
<el-form-item label="车型:" prop="vehicleModelCode" required >
<el-select
style="width: 350px"
v-model="form.model"
v-model="form.vehicleModelCode"
:disabled="isEdit"
/>
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="底盘号:" prop="erpAssemblyCode" required >
<el-form-item label="底盘号:" prop="vin" required >
<el-input
style="width: 350px"
v-model="form.erpAssemblyCode"
v-model="form.vin"
:disabled="isEdit"
/>
</el-form-item>
@ -303,10 +311,10 @@
<el-row>
<el-col :span="12">
<el-form-item label="大众顺序号:" prop="vehicleModel" required >
<el-form-item label="大众顺序号:" prop="hostSN" required >
<el-input
style="width: 350px"
v-model="form.model"
v-model="form.hostSN"
:disabled="isEdit"
/>
</el-form-item>
@ -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"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column prop="partCode" label="ERP总成编号" width="150px" >
<template slot-scope="scope">
<el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
</template>
<el-table-column prop="erpAssemblyCode" label="ERP总成编号" width="150px" >
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.erpAssemblyCode" size="mini" style="width:135px"></el-input>
</template> -->
</el-table-column>
<el-table-column prop="partName" label="ERP总成名称">
<template slot-scope="scope">
<el-input v-model="scope.row.partName" size="mini"></el-input>
</template>
<el-table-column prop="erpAssemblyName" label="ERP总成名称">
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.erpAssemblyName" size="mini"></el-input>
</template> -->
</el-table-column>
<el-table-column prop="description" width="35px">
<template slot="header">
@ -375,7 +383,7 @@
</el-row>
<el-divider class="divider2" content-position="left">添加ERP总成</el-divider>
<el-row>
<el-form-item label="ERP总成编码:" prop="erpAssemblyCode" required >
<el-form-item label="ERP总成编码:" prop="erpAssemblyCode" >
<el-input
style="width: 315px"
v-model="form.erpAssemblyCode"
@ -385,7 +393,7 @@
</el-form-item>
</el-row>
<el-row>
<el-form-item label="ERP总成名称:" prop="erpAssemblyName" required >
<el-form-item label="ERP总成名称:" prop="erpAssemblyName" >
<el-input
style="width: 315px"
v-model="form.erpAssemblyName"
@ -395,17 +403,23 @@
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车型:" prop="erpAssemblyName" required >
<el-form-item label="车型:" prop="vehicleModel" >
<el-select
style="width: 315px"
v-model="form.erpAssemblyName"
v-model="form.vehicleModel"
:disabled="isEdit"
placeholder="请输入总成名称"
/>
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
</el-row>
<div style="text-align:center;margin: 0px;margin-bottom: 15px;">
<el-button type="primary">添加总成</el-button>
<el-button type="primary" @click="leftclick">添加总成</el-button>
</div>
</div>
</el-col>
@ -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 @@
</el-row>
<el-divider class="divider2" content-position="left">添加ERP结算件</el-divider>
<el-row>
<el-form-item label="客户零件代码:" prop="customerPartCode" required >
<el-form-item label="客户零件代码:" prop="customerPartCode" >
<el-input
style="width: 315px"
v-model="form.erpAssemblyCode"
v-model="form.customerPartCode"
:disabled="isEdit"
placeholder="请输入客户零件代码"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="客户零件名称:" prop="customerPartName" required >
<el-form-item label="客户零件名称:" prop="customerPartName" >
<el-input
style="width: 315px"
v-model="form.erpAssemblyName"
v-model="form.customerPartName"
:disabled="isEdit"
placeholder="请输入总成名称"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="数量:" prop="partQty" required >
<el-form-item label="数量:" prop="partQty" >
<el-input-number
style="width: 315px"
v-model="form.partQty"
@ -634,11 +648,12 @@ export default {
erpAssemblyName: undefined,
},
listPLQuery:{
BillType: 1,
BillType: 2,
//UserId: "00000000-0000-0000-0000-000000000000",
},
form:{
details:[]
leftdetails:[],
rightdetails:[],
},
page: 1,
// 显示搜索条件
@ -654,6 +669,12 @@ export default {
detailTableHeight:250,
details:[], //修改子表数据源
PLList:[],//产线下拉
PLChildList:[],//筛选后产线下拉
vehicleModelQuery:{
dicTypeName:"派格车型",
},
vehicleModelList:[],//车型list
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
};
},
mounted() {
@ -790,6 +811,7 @@ export default {
this.isEdit = false;
this.form = {};
this.details = [];
this.getvehicleModel();
this.dialogFormVisible = true;
},
/** 修改 */
@ -797,6 +819,7 @@ export default {
this.formTitle = "修改";
this.isEdit = true;
this.details = [];
this.getvehicleModel();
if (this.multipleSelection.length != 1) {
this.$message({
message: "编辑必须选择单行",
@ -987,7 +1010,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-r100/list", this.listQuery)
.then((response) => {
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(){},
},
};
</script>

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

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

89
vue/src/views/pg-fis/basedate/productLine/index.vue
View File

@ -20,31 +20,31 @@
></XhJSSelect> -->
<el-form-item label="操作员登录名:" prop="userName">
<el-form-item label="操作员登录名" prop="userName">
<el-input
v-model="listQuery.userName"
clearable
size="small"
placeholder=""
style="width: 200px"
style="width: 180px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="操作员真实名称:" prop="name">
<el-form-item label="操作员真实名称" prop="name">
<el-input
v-model="listQuery.name"
clearable
size="small"
placeholder=""
style="width: 200px"
style="width: 180px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="部门:" prop="dep">
<!-- <el-form-item label="部门:" prop="dep">
<el-select
v-model="listQuery.dep"
clearable
@ -56,9 +56,9 @@
<el-option label="结算" value="R0003"></el-option>
<el-option label="二配" value="R0001"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="生产线:" prop="productLineCode">
<el-form-item label="生产线" prop="productLineCode">
<el-select
v-model="listQuery.productLineCode"
clearable
@ -69,7 +69,7 @@
>
<el-option
v-for="item in PLList"
:key="item.productLineCode"
:key="item.id"
:label="item.productLineName"
:value="item.productLineCode"/>
</el-select>
@ -177,6 +177,9 @@
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
<template slot-scope="scope">
{{scope.row[item.prop]}}
</template>
</el-table-column>
</el-table>
</el-col>
@ -233,6 +236,9 @@
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
<template slot-scope="scope">
{{scope.row[item.prop]}}
</template>
</el-table-column>
</el-table>
</el-col>
@ -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(() => {
});

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

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

Write Preview
Loading…
Cancel
Save