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

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

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

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

@ -165,7 +165,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </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-group v-model="listQuery.state">
<el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id" @change="checkedListChange(index)"> <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id" @change="checkedListChange(index)">
{{ item.name }} {{ item.name }}
@ -385,6 +385,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw"; import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr"; import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment"; import moment from "moment";
import Detail from "./detail.vue"; import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
@ -488,7 +489,7 @@ export default {
}, },
listPLQuery:{ listPLQuery:{
BillType: 2, BillType: 2,
//UserId: "00000000-0000-0000-0000-000000000000", //UserId: this.userinfo.UserId,
}, },
hostSNQuery:{ hostSNQuery:{
productLine:undefined, productLine:undefined,
@ -541,6 +542,7 @@ export default {
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}], productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
isShowHostSN : false, isShowHostSN : false,
isShowVin : false, isShowVin : false,
isShowState:true,
}; };
@ -562,7 +564,6 @@ export default {
this.listQuery.state.push(element.id); this.listQuery.state.push(element.id);
} }
}); });
this.getList();
this.getProductLine(); this.getProductLine();
}, },
computed: { computed: {
@ -623,13 +624,14 @@ export default {
}); });
return tempsTabs; return tempsTabs;
}, },
...mapGetters(['userInfo'])//
}, },
methods: { methods: {
// //
handleDrawerOpen(param) { handleDrawerOpen(param) {
this.drawer = true; this.drawer = true;
console.log(510) //console.log(510)
console.log(param) //console.log(param)
var parentId = param.assemblyID; //id var parentId = param.assemblyID; //id
this.customerInfos = [ this.customerInfos = [
{ {
@ -700,7 +702,7 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.listQuery.SkipCount = 1; this.listQuery.SkipCount = 1;
this.getList(); //this.getList();
}, },
selectValue(params) { selectValue(params) {
// //
@ -736,7 +738,7 @@ export default {
obj.isKey = false; obj.isKey = false;
obj.description = ""; obj.description = "";
console.log(this.form.details); //console.log(this.form.details);
this.form.details.push(obj); this.form.details.push(obj);
//console.log(688); //console.log(688);
}, },
@ -801,7 +803,7 @@ export default {
this.$axios this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId) .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => { .then((response) => {
console.log(partCode) //console.log(partCode)
if(partCode !== "" && partCode !== undefined) if(partCode !== "" && partCode !== undefined)
{ {
//console.log(partCode) //console.log(partCode)
@ -823,7 +825,10 @@ export default {
}); });
}, },
valueselectChange(){this.$forceUpdate();}, valueselectChange(){
this.$forceUpdate();
},
handleImportSAP(){}, handleImportSAP(){},
handleFilter() { handleFilter() {
@ -1351,6 +1356,7 @@ export default {
//线 //线
getProductLine() getProductLine()
{ {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios this.$axios
.gets( .gets(
"/api/newjit/product-line/list",this.listPLQuery "/api/newjit/product-line/list",this.listPLQuery
@ -1359,6 +1365,8 @@ export default {
//console.log(response); //console.log(response);
this.PLList = response.item; 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.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) //console.log(this.PLList)
}) })
.catch(() => { .catch(() => {
@ -1378,12 +1386,16 @@ export default {
this.$refs.btn1.$el.innerText = "打印门板发货排序单"; this.$refs.btn1.$el.innerText = "打印门板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印门板发货排序单"; this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
this.$refs.btn3.$el.innerText = "补打门板发货排序单"; this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id);
this.isShowState = true;
} }
else if(this.listQuery.productType === 2) else if(this.listQuery.productType === 2)
{ {
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单"; this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单"; this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
this.$refs.btn3.$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 CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw"; import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr"; import Lockr from "lockr";
import { mapGetters } from 'vuex';
import moment from "moment"; import moment from "moment";
import Detail from "./detail.vue"; import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
@ -295,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
}, {}); }, {});
export default { export default {
name: "M100Online", name: "R100Online",
components: { Pagination, CRMTableHead, importExcel , Detail}, components: { Pagination, CRMTableHead, importExcel , Detail},
directives: { permission }, directives: { permission },
filters: { filters: {
@ -318,7 +319,7 @@ export default {
} }
}; };
return { return {
crmType: "M100Online", crmType: "R100Online",
rules: { rules: {
erpAssemblyName: [ erpAssemblyName: [
{ required: true, message: "必须输入!", trigger: "blur" }, { required: true, message: "必须输入!", trigger: "blur" },
@ -416,7 +417,6 @@ export default {
this.listQuery.state.push(element.id); this.listQuery.state.push(element.id);
} }
}); });
this.getList();
this.getProductLine(); this.getProductLine();
}, },
computed: { computed: {
@ -481,6 +481,7 @@ export default {
}); });
return tempsTabs; return tempsTabs;
}, },
...mapGetters(['userInfo'])//
}, },
methods: { methods: {
// //
@ -546,7 +547,7 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.listQuery.SkipCount = 1; this.listQuery.SkipCount = 1;
this.getList(); //this.getList();
}, },
selectValue(params) { selectValue(params) {
// //
@ -582,7 +583,7 @@ export default {
obj.isKey = false; obj.isKey = false;
obj.description = ""; obj.description = "";
console.log(this.form.details); //console.log(this.form.details);
this.form.details.push(obj); this.form.details.push(obj);
//console.log(688); //console.log(688);
}, },
@ -647,7 +648,7 @@ export default {
this.$axios this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId) .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => { .then((response) => {
console.log(partCode) //console.log(partCode)
if(partCode !== "" && partCode !== undefined) if(partCode !== "" && partCode !== undefined)
{ {
//console.log(partCode) //console.log(partCode)
@ -669,7 +670,7 @@ export default {
}); });
}, },
valueselectChange(){}, valueselectChange(){this.$forceUpdate();},
handleImportSAP(){}, handleImportSAP(){},
handleFilter() { handleFilter() {
@ -713,6 +714,7 @@ export default {
//线 //线
getProductLine() getProductLine()
{ {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios this.$axios
.gets( .gets(
"/api/newjit/product-line/list",this.listPLQuery "/api/newjit/product-line/list",this.listPLQuery
@ -721,6 +723,8 @@ export default {
//console.log(response); //console.log(response);
this.PLList = response.item; 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.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) //console.log(this.PLList)
}) })
.catch(() => { .catch(() => {

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

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

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

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

Loading…
Cancel
Save