Administrator 3 years ago
parent
commit
1cb326289b
  1. 2
      vue/src/router/modules/fis.js
  2. 29
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  3. 30
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  4. 18
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  5. 24
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  6. 20
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

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

@ -79,7 +79,7 @@ const pgfis = {
{
path: '/pg-R100Online',
component: () => import('@/views/pg-fis/basedate/r100Online'),
name: 'pg-M100Online',//命名路由
name: 'pg-R100Online',//命名路由
meta: {
title: 'R100上线信息',
roles: ['SettleAccount.Reports'],

29
vue/src/views/pg-fis/basedate/m100BIll/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>
@ -568,6 +568,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import moment from "moment";
import { mapGetters } from 'vuex';
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -741,8 +742,9 @@ export default {
},
created() {
//this.getKNRList();
this.getList();
this.getProductLine();
//this.getList();
//console.log(this.userInfo);
},
computed: {
getDefaultField() {
@ -753,7 +755,7 @@ export default {
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 120,
width: 130,
});
// tempsTabs.push({
// label: "",
@ -790,8 +792,14 @@ export default {
prop: "fileName",
width: 120,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
},
methods: {
//
@ -812,9 +820,10 @@ export default {
//
var _this = this;
let yy = new Date().getFullYear();
let mm = new Date().getMonth()+1;
let dd = new Date().getDate();
let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();;
let month = new Date().getMonth()+1;
let mm = month<10 ? '0'+month : month;
let dd = new Date().getDate()<10 ? '0'+new Date().getDate() : new Date().getDate();
let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();
let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
_this.gettime = yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
@ -1114,7 +1123,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//
@ -1308,7 +1317,7 @@ export default {
this.$forceUpdate();
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -1403,6 +1412,7 @@ export default {
//线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -1411,6 +1421,9 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList);
})
.catch(() => {

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

@ -165,7 +165,7 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State">
<el-form-item label="单据状态" prop="State" v-show="isShowState">
<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 }}
@ -385,6 +385,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -488,7 +489,7 @@ export default {
},
listPLQuery:{
BillType: 2,
//UserId: "00000000-0000-0000-0000-000000000000",
//UserId: this.userinfo.UserId,
},
hostSNQuery:{
productLine:undefined,
@ -541,6 +542,7 @@ export default {
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
isShowHostSN : false,
isShowVin : false,
isShowState:true,
};
@ -562,7 +564,6 @@ export default {
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
computed: {
@ -623,13 +624,14 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
},
methods: {
//
handleDrawerOpen(param) {
this.drawer = true;
console.log(510)
console.log(param)
//console.log(510)
//console.log(param)
var parentId = param.assemblyID; //id
this.customerInfos = [
{
@ -700,7 +702,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//
@ -736,7 +738,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -801,7 +803,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -823,7 +825,10 @@ export default {
});
},
valueselectChange(){this.$forceUpdate();},
valueselectChange(){
this.$forceUpdate();
},
handleImportSAP(){},
handleFilter() {
@ -1351,6 +1356,7 @@ export default {
//线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -1359,6 +1365,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList)
})
.catch(() => {
@ -1378,12 +1386,16 @@ export default {
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id);
this.isShowState = true;
}
else if(this.listQuery.productType === 2)
{
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
this.listQuery.state = [];
this.isShowState = false;
}
},

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

@ -277,6 +277,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
@ -295,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
}, {});
export default {
name: "M100Online",
name: "R100Online",
components: { Pagination, CRMTableHead, importExcel , Detail},
directives: { permission },
filters: {
@ -318,7 +319,7 @@ export default {
}
};
return {
crmType: "M100Online",
crmType: "R100Online",
rules: {
erpAssemblyName: [
{ required: true, message: "必须输入!", trigger: "blur" },
@ -416,7 +417,6 @@ export default {
this.listQuery.state.push(element.id);
}
});
this.getList();
this.getProductLine();
},
computed: {
@ -481,6 +481,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
},
methods: {
//
@ -546,7 +547,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//
@ -582,7 +583,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -647,7 +648,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -669,7 +670,7 @@ export default {
});
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -713,6 +714,7 @@ export default {
//线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -721,6 +723,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
//console.log(this.PLList)
})
.catch(() => {

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

@ -1,6 +1,7 @@
<!--未知总成管理页-->
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
@ -167,6 +168,7 @@
</el-form-item>
</el-form>
</flexbox>
</div>
<div class="l-table">
<!--表格渲染-->
<el-table
@ -193,7 +195,6 @@
prop="vin"
sortable
align="center"
fixed
width="180px"
>
<template slot-scope="scope">
@ -254,6 +255,7 @@
></Detail>
</div>
</el-drawer>
</div>
<!--添加总成-->
<el-dialog
@ -395,7 +397,6 @@
<el-button type="text" @click="dialogNumVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
@ -406,6 +407,7 @@ import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
//
const bomUnit = [
@ -562,11 +564,12 @@ export default {
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 220;
};
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
});
},
created() {
this.getvehicleModel();
@ -741,9 +744,9 @@ export default {
handleDownload() {
this.listLoading = true;
this.$axios
.gets("/api/newjit/unknown-assembly/export", this.listQuery)
.posts("/api/newjit/unknown-assembly/export", this.listQuery)
.then((res) => {
let filename = res;
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
@ -856,6 +859,7 @@ export default {
.gets("/api/newjit/unknown-assembly/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
@ -1026,7 +1030,7 @@ export default {
.gets(
"/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
).then((response) => {
this.data2 = response.item.unknownAssemblyParts;
this.data2 = response.item.unknownAssemblyParts.filter(u => u.partType === "1" || u.partType === null);
setTimeout(() => {
//
this.listLoading = false;

20
vue/src/views/pg-fis/basedate/weldingAssembly/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>
@ -293,6 +293,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment";
import { downloadFile } from "@/utils/crmindex.js";
@ -433,7 +434,6 @@ export default {
this.listQuery.cstate.push(element.id);
});
this.getProductLine();
this.getList();
},
computed: {
getDefaultField() {
@ -512,6 +512,7 @@ export default {
});
return tempsTabs;
},
...mapGetters(['userInfo'])//
},
methods: {
//
@ -630,7 +631,7 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
},
selectValue(params) {
//
@ -666,7 +667,7 @@ export default {
obj.isKey = false;
obj.description = "";
console.log(this.form.details);
//console.log(this.form.details);
this.form.details.push(obj);
//console.log(688);
},
@ -712,9 +713,9 @@ export default {
if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
{
console.log(this.listQuery.cstate)
//console.log(this.listQuery.cstate)
this.listQuery.cstate.forEach(element => {
console.log(element)
//console.log(element)
if(element === 0)
{
this.listQuery.HasR100NotHasM100 = true;
@ -748,7 +749,7 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
//console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
//console.log(partCode)
@ -770,7 +771,7 @@ export default {
});
},
valueselectChange(){},
valueselectChange(){this.$forceUpdate();},
handleImportSAP(){},
handleFilter() {
@ -814,6 +815,7 @@ export default {
//线
getProductLine()
{
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets(
"/api/newjit/product-line/list",this.listPLQuery
@ -822,6 +824,8 @@ export default {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
})
.catch(() => {
});

Loading…
Cancel
Save