Browse Source

缺陷修改

master
安虹睿 2 days ago
parent
commit
bb97abdb1a
  1. 2
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  2. 18
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  3. 191
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  4. 4
      vue/src/views/pg-fis/basedate/m110Search/index.vue
  5. 14
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  6. 340
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  7. 4
      vue/src/views/pg-fis/basedate/select/index.vue

2
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@ -371,7 +371,7 @@ export default {
prop: "description", prop: "description",
}); });
tempsTabs.push({ tempsTabs.push({
label: "厂内零代码", label: "厂内零代码",
prop: "relationKey", prop: "relationKey",
}); });
return tempsTabs; return tempsTabs;

18
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@ -167,6 +167,22 @@
label="车型代码" label="车型代码"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="partCode1"
label="零件1"
></el-table-column>
<el-table-column
prop="partCode2"
label="零件2"
></el-table-column>
<el-table-column
prop="partCode3"
label="零件3"
></el-table-column>
<el-table-column
prop="partCode4"
label="零件4"
></el-table-column>
<!-- <el-table-column
prop="topBoxPositionNum" prop="topBoxPositionNum"
label="上箱位号" label="上箱位号"
></el-table-column> ></el-table-column>
@ -189,7 +205,7 @@
<el-table-column <el-table-column
prop="belowMaterialDescription " prop="belowMaterialDescription "
label="下箱位 物料描述" label="下箱位 物料描述"
></el-table-column> ></el-table-column> -->
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>

191
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@ -38,7 +38,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
style="margin-left: 15px" style="margin-left: 15px"
@click="downloadPopShow = true" @click="downloadForm.time=null;downloadPopShow=true;"
>导出(Excel) >导出(Excel)
</el-button> </el-button>
<el-button <el-button
@ -52,19 +52,19 @@
<el-button <el-button
@click="drawerMBPrint = true" @click="drawerMBPrint = true"
size="mini" size="mini"
type="warning" type="success"
plain plain
> >
<strong>重新打印</strong> <strong>重新打印</strong>
</el-button> </el-button>
<el-button <!-- <el-button
@click="drawerMBDelete = true" @click="drawerMBDelete = true"
size="mini" size="mini"
type="danger" type="danger"
plain plain
> >
<strong>作废</strong> <strong>作废</strong>
</el-button> </el-button> -->
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="tipper" v-if="tipper != ''" v-html="tipper"></div> <div class="tipper" v-if="tipper != ''" v-html="tipper"></div>
@ -142,30 +142,6 @@
{{ scope.column.label }} {{ scope.column.label }}
</template> </template>
</el-table-column> </el-table-column>
<!-- 明细 -->
<!-- <el-table-column
label="明细—id"
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
{{scope.row.billM100Parts[0].id }}
</template>
</el-table-column> -->
<!-- <el-table-column
v-for="(item, index) in tableColums_detail"
:key="'detal-'+index"
:label="item.label"
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
{{scope.row[item.index].prop }}
</template>
</el-table-column> -->
</el-table> </el-table>
</div> </div>
<div> <div>
@ -219,6 +195,7 @@
v-model.number="form.beginHostSN" v-model.number="form.beginHostSN"
placeholder="" placeholder=""
clearable clearable
:disabled="true"
type="number" type="number"
size="small" size="small"
style="width: 240px" style="width: 240px"
@ -308,14 +285,18 @@
:visible.sync="downloadPopShow" :visible.sync="downloadPopShow"
width="60%" width="60%"
> >
<el-date-picker <el-form :model="downloadForm" :rules="downloadRules" ref="downloadForm">
v-model="downloadTime" <el-form-item label="M100上线时间" prop="time">
type="datetimerange" <el-date-picker
range-separator="至" v-model="downloadForm.time"
start-placeholder="开始时间" type="datetimerange"
end-placeholder="结束时间" range-separator="至"
value-format="yyyy-MM-ddTHH:mm:ss" start-placeholder="开始时间"
></el-date-picker> end-placeholder="结束时间"
value-format="yyyy-MM-ddTHH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="downloadPopShow = false"> </el-button> <el-button @click="downloadPopShow = false"> </el-button>
<el-button type="primary" @click="handleDownload()"> </el-button> <el-button type="primary" @click="handleDownload()"> </el-button>
@ -374,7 +355,7 @@ export default {
drawerMBPrint: false, drawerMBPrint: false,
drawerMBDelete: false, drawerMBDelete: false,
activeNames: ["1"], activeNames: ["1"],
printNum: "12", printNum: null,
rules: { rules: {
erpAssemblyName: [ erpAssemblyName: [
{ required: true, message: "必须输入!", trigger: "blur" }, { required: true, message: "必须输入!", trigger: "blur" },
@ -499,7 +480,12 @@ export default {
], ],
// //
downloadPopShow:false, downloadPopShow:false,
downloadTime:null, downloadForm:{
time:null,
},
downloadRules:{
time: [ { required: true, message: '请输入时间', trigger: 'blur' }],
},
timer:null, timer:null,
timerList:null timerList:null
}; };
@ -653,47 +639,56 @@ export default {
}, },
/** 导出功能 assembly-cfg-erp/export */ /** 导出功能 assembly-cfg-erp/export */
handleDownload() { handleDownload() {
console.log(this.downloadTime) console.log(this.downloadForm.time)
this.listLoading = true; this.$refs.downloadForm.validate((valid) => {
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode; if (valid) {
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName; this.listLoading = true;
let _data = { this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
onlineTimeBegin: this.downloadTime[0], this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
onlineTimeEnd: this.downloadTime[1], let _data = {
productLine: this.listQuery.productLine, onlineTimeBegin: this.downloadForm.time[0],
} onlineTimeEnd: this.downloadForm.time[1],
this.$axios productLine: this.listQuery.productLine,
.posts("/api/newjit/bill-m100/export", _data) }
.then((res) => {
let filename = res.item;
this.$axios this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename) .posts("/api/newjit/bill-m100/export", _data)
.then((response) => { .then((res) => {
if (filename.indexOf("_") != -1) { let filename = res.item;
let downName = this.$axios
filename.slice(0, filename.lastIndexOf("_")) + .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
filename.slice(filename.lastIndexOf(".")); .then((response) => {
downloadFile(response, downName); if (filename.indexOf("_") != -1) {
this.$notify({ let downName =
title: "成功", filename.slice(0, filename.lastIndexOf("_")) +
message: "数据-导出成功!", filename.slice(filename.lastIndexOf("."));
type: "success", downloadFile(response, downName);
duration: 2000, this.$notify({
}); title: "成功",
} else { message: "数据-导出成功!",
downloadFile(response, filename); type: "success",
this.$notify({ duration: 2000,
title: "成功", });
message: "数据-导出成功!", } else {
type: "success", downloadFile(response, filename);
duration: 2000, this.$notify({
}); title: "成功",
} message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
this.downloadPopShow = false
})
.catch(err=>{
this.listLoading = false;
})
})
.catch(err=>{
this.listLoading = false; this.listLoading = false;
this.downloadPopShow = false })
}); }
}); })
this.listLoading = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
@ -779,10 +774,13 @@ export default {
) )
}) })
} }
this.tableColums = [ // 5(M100线)
...this.tableColums_main, this.tableColums = JSON.parse(JSON.stringify(this.tableColums_main))
..._tableColums_detail this.tableColums.splice(4, 0, ..._tableColums_detail);
] // this.tableColums = [
// ...this.tableColums_main,
// ..._tableColums_detail,
// ]
this.list = response.m100Dtos; this.list = response.m100Dtos;
let _M110Row = response.m110_Dtos[0] let _M110Row = response.m110_Dtos[0]
_M110Row.isM110Data = true _M110Row.isM110Data = true
@ -924,7 +922,11 @@ export default {
.then(res=>{ .then(res=>{
let _currentLines = res.item.filter(item=>item.dicItemSort2 == this.listQuery.productLine) let _currentLines = res.item.filter(item=>item.dicItemSort2 == this.listQuery.productLine)
if(_currentLines && _currentLines.length > 0){ if(_currentLines && _currentLines.length > 0){
this.printNum = _currentLines[0].dicItemSort9 // dicItemSort9
const maxItem = _currentLines.reduce((prev, current) => {
return Number(current.dicItemSort9) > Number(prev.dicItemSort9) ? current : prev;
}, _currentLines[0]);
this.printNum = maxItem.dicItemSort9
} }
// //
this.hostSNQuery.isZhuHuBan = "0"; this.hostSNQuery.isZhuHuBan = "0";
@ -1040,19 +1042,20 @@ export default {
type: "error", type: "error",
}); });
return; return;
} else {
if (
parseInt(this.form.endHostSN) -
parseInt(this.form.beginHostSN) <=
0
) {
this.$message({
message: "起止大众顺序号相减不能为零!",
type: "error",
});
return;
}
} }
// else {
// if (
// parseInt(this.form.endHostSN) -
// parseInt(this.form.beginHostSN) <=
// 0
// ) {
// this.$message({
// message: "",
// type: "error",
// });
// return;
// }
// }
} }
if (this.isShowVin === true) { if (this.isShowVin === true) {
if (this.form.beginVin === "" || this.form.endVin === "") { if (this.form.beginVin === "" || this.form.endVin === "") {

4
vue/src/views/pg-fis/basedate/m110Search/index.vue

@ -55,7 +55,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="大众顺序号:" prop="hostSN"> <el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
@ -333,7 +333,7 @@ export default {
listQuery: { listQuery: {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
ProductLine: undefined, productLine: undefined,
Version: undefined, Version: undefined,
printBillNum: undefined, printBillNum: undefined,
serialNumBegin: undefined, serialNumBegin: undefined,

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

@ -129,7 +129,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">
<el-checkbox-group v-model="listQuery.state"> <el-checkbox-group v-model="listQuery.state">
<el-checkbox <el-checkbox
v-for="(item, index) in billState" v-for="(item, index) in billState"
@ -140,7 +140,7 @@
{{ item.name }} {{ item.name }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item> -->
<el-form-item style="margin:0"> <el-form-item style="margin:0">
<el-button <el-button
@ -416,11 +416,11 @@ export default {
// prop: "knr", // prop: "knr",
// width: 150, // width: 150,
// }); // });
tempsTabs.push({ // tempsTabs.push({
label: "单据状态", // label: "",
prop: "billStatus", // prop: "billStatus",
width: 150, // width: 150,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "上线时间", label: "上线时间",
prop: "onlineTime", prop: "onlineTime",

340
vue/src/views/pg-fis/basedate/repeatR100/index.vue

@ -9,7 +9,7 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<el-form-item label="数据采集点" prop="State" > <el-form-item label="数据采集点" prop="state" style="margin-right:35px">
<el-checkbox-group v-model="listQuery.state"> <el-checkbox-group v-model="listQuery.state">
<el-checkbox <el-checkbox
v-for="(item, index) in billState" v-for="(item, index) in billState"
@ -21,7 +21,7 @@
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="生产线:" prop="productLine"> <!-- <el-form-item label="生产线:" prop="productLine">
<el-select <el-select
v-model="listQuery.productLine" v-model="listQuery.productLine"
clearable clearable
@ -37,7 +37,7 @@
:value="item.productLineCode" :value="item.productLineCode"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="起始顺序号" prop="HostSNBegin"> <el-form-item label="起始顺序号" prop="HostSNBegin">
<el-input <el-input
@ -80,45 +80,46 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="底盘号:" prop="VINBegin"> <el-form-item label="底盘号:" prop="VINBegin">
<el-input <el-input
v-model="listQuery.VINBegin" v-model="listQuery.VINBegin"
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 200px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="-" prop="VINEnd"> <el-form-item label="-" prop="VINEnd">
<el-input <el-input
v-model="listQuery.VINEnd" v-model="listQuery.VINEnd"
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 200px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="车型代码" prop="vehicleModelCode"> <el-form-item label="车型代码" prop="vehicleModelCode">
<el-select <el-select
v-model="listQuery.vehicleModelCode" v-model="listQuery.vehicleModelCode"
clearable clearable
placeholder="请选择" placeholder="请选择"
size="medium" size="medium"
style="margin-right: 15px" style="margin-right: 15px"
@change="valueselectChange1" @change="valueselectChange1"
> >
<el-option <el-option
v-for="item in vehicleModelList" v-for="item in vehicleModelList"
:key="item.id" :key="item.id"
:label="item.dicItemName" :label="item.dicItemName"
:value="item.dicItemCode"/> :value="item.dicItemCode"
</el-select> />
</el-form-item> </el-select>
</el-form-item>
<!-- <el-select <!-- <el-select
v-model="listQuery.VehicleModelCode" v-model="listQuery.VehicleModelCode"
placeholder="请输入总成名称" placeholder="请输入总成名称"
clearable clearable
@ -335,13 +336,14 @@ export default {
billState: [ billState: [
{ id: 2, name: "R100" }, { id: 2, name: "R100" },
{ id: 3, name: "M100" }, { id: 3, name: "M100" },
{ id: 4, name: "M110" },
], ],
isVINShowState:false, isVINShowState: false,
OnlineTimeValue: [], OnlineTimeValue: [],
ReceiveTimeValue: [], ReceiveTimeValue: [],
versionValue: "", versionValue: "",
customerInfosMB:[], customerInfosMB: [],
customerInfosZHB:[], customerInfosZHB: [],
versionList: [], // versionList: [], //
searchContent: "", // searchContent: "", //
showExcelImport: false, showExcelImport: false,
@ -362,8 +364,8 @@ export default {
}, },
listQuery: { listQuery: {
ProductLine: undefined, ProductLine: undefined,
checked1:true, checked1: true,
checked2:true, checked2: true,
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
HostSNBegin: undefined, HostSNBegin: undefined,
@ -379,25 +381,24 @@ export default {
Version: undefined, Version: undefined,
KNR: undefined, KNR: undefined,
state: [], state: [],
}, },
listPLQuery: { listPLQuery: {
BillType: 2, BillType: 2,
//UserId: this.userinfo.UserId, //UserId: this.userinfo.UserId,
}, },
vehicleModelQuery:{ vehicleModelQuery: {
dicTypeName:"车型", dicTypeName: "车型",
}, },
page: 1, page: 1,
// //
// VehicleModelCodelist:[ // VehicleModelCodelist:[
// {id: 1, name: "C8"}, // {id: 1, name: "C8"},
// {id: 2, name: "B8L"}, // {id: 2, name: "B8L"},
// {id: 3, name: "CC"}, // {id: 3, name: "CC"},
// {id: 4, name: "BSMV"}, // {id: 4, name: "BSMV"},
// {id: 5, name: "B9"}, // {id: 5, name: "B9"},
// {id: 6, name: "Q5"}, // {id: 6, name: "Q5"},
// ], // ],
showSearch: true, showSearch: true,
bomUnit, bomUnit,
PLList: [], PLList: [],
@ -406,16 +407,16 @@ export default {
drawer: false, drawer: false,
isShowState: true, isShowState: true,
dialogTableVisible: false, dialogTableVisible: false,
vehicleModelList:[],//list vehicleModelList: [], //list
//tableHeight: document.documentElement.clientHeight - 260, //tableHeight: document.documentElement.clientHeight - 260,
}; };
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei); //console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight; let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79 this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
}); });
}, },
created() { created() {
@ -485,7 +486,7 @@ export default {
...mapGetters(["userInfo"]), // ...mapGetters(["userInfo"]), //
}, },
methods: { methods: {
ss(data) { ss(data) {
//alert(data); //alert(data);
// //
this.valueSelect = data; this.valueSelect = data;
@ -536,7 +537,7 @@ export default {
this.$axios this.$axios
.posts("/api/newjit/repeat-m100/export", this.listQuery) .posts("/api/newjit/repeat-m100/export", this.listQuery)
.then((res) => { .then((res) => {
this.handleFilter() this.handleFilter();
let filename = res.item; let filename = res.item;
this.$axios this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename) .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -567,24 +568,21 @@ export default {
this.listLoading = false; this.listLoading = false;
}); });
}) })
.catch(err=>{ .catch((err) => {
this.handleFilter() this.handleFilter();
}) });
}, },
/*单据状态变更 */ /*单据状态变更 */
checkedListChange(index) { checkedListChange(index) {
if (this.listQuery.state.length <= 1) { if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id); this.listQuery.state.push(this.billState[index].id);
} else { } else {
this.listQuery.state = []; this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id); this.listQuery.state.push(this.billState[index].id);
} }
if(this.listQuery.state[0]=="3") if (this.listQuery.state[0] == "3") {
{
this.isVINShowState = true; this.isVINShowState = true;
} } else {
else
{
this.isVINShowState = false; this.isVINShowState = false;
} }
}, },
@ -648,13 +646,11 @@ export default {
}, },
roleFilter(type) { roleFilter(type) {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
getList(data){ getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit; this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else { } else {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
@ -673,77 +669,90 @@ export default {
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1]; this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
} }
if(this.listQuery.state[0] == "2") if (this.listQuery.state[0] == "2") {
{ this.dialogTableVisible = false;
this.dialogTableVisible = false; console.log(
console.log("555555555555555555555555555555"+JSON.stringify(this.listQuery)); "555555555555555555555555555555" + JSON.stringify(this.listQuery)
this.$axios );
.gets("/api/newjit/repeat-r100/list", this.listQuery) this.$axios
.then((response) => { .gets("/api/newjit/repeat-r100/list", this.listQuery)
this.list = response.items; .then((response) => {
this.totalCount = response.totalCount; this.list = response.items;
setTimeout(() => { this.totalCount = response.totalCount;
// setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false; this.listLoading = false;
}, 500); });
}) }
.catch(() => { else if (this.listQuery.state[0] == "3") {
this.listLoading = false; this.dialogTableVisible = true;
}); this.$axios
} .gets("/api/newjit/repeat-m100/list", this.listQuery)
else .then((response) => {
{ this.list = response.items;
this.dialogTableVisible = true; this.totalCount = response.totalCount;
this.$axios setTimeout(() => {
.gets("/api/newjit/repeat-m100/list", this.listQuery) //
.then((response) => { this.listLoading = false;
this.list = response.items; }, 500);
this.totalCount = response.totalCount; })
setTimeout(() => { .catch(() => {
//
this.listLoading = false; this.listLoading = false;
}, 500); });
}) }
.catch(() => { else if (this.listQuery.state[0] == "4") {
this.listLoading = false; this.dialogTableVisible = true;
}); this.$axios
} .gets("/api/newjit/repeat-m110/list", this.listQuery)
.then((response) => {
// if (this.billState=== 2) { this.list = response.items;
this.totalCount = response.totalCount;
// this.$axios setTimeout(() => {
// .gets("/api/newjit/repeat-r100/list", this.listQuery) //
// .then((response) => { this.listLoading = false;
// this.list = response.items; }, 500);
// this.totalCount = response.totalCount; })
// setTimeout(() => { .catch(() => {
// // this.listLoading = false;
// this.listLoading = false; });
// }, 500); }
// }) // if (this.billState=== 2) {
// .catch(() => {
// this.listLoading = false; // this.$axios
// }); // .gets("/api/newjit/repeat-r100/list", this.listQuery)
// } // .then((response) => {
// else if(this.billState === 3){ // this.list = response.items;
// this.totalCount = response.totalCount;
// this.$axios // setTimeout(() => {
// .gets("/api/newjit/repeat-m100/list", this.listQuery) // //
// .then((response) => { // this.listLoading = false;
// this.list = response.items; // }, 500);
// this.totalCount = response.totalCount; // })
// setTimeout(() => { // .catch(() => {
// // // this.listLoading = false;
// this.listLoading = false; // });
// }, 500); // }
// }) // else if(this.billState === 3){
// .catch(() => {
// this.listLoading = false; // this.$axios
// }); // .gets("/api/newjit/repeat-m100/list", this.listQuery)
// } // .then((response) => {
//} // this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// }
//}
}, },
// getList(data) { // getList(data) {
// this.listLoading = true; // this.listLoading = true;
@ -779,7 +788,7 @@ this.$axios
// }); // });
// }, // },
handleFilter() { handleFilter() {
this.dialogTableVisible = false; this.dialogTableVisible = false;
this.page = 1; this.page = 1;
this.getList(); this.getList();
// this.getListM100(); // this.getListM100();
@ -798,18 +807,22 @@ this.$axios
//debugger //debugger
//console.log(JSON.stringify(this.userInfo)); //console.log(JSON.stringify(this.userInfo));
this.listPLQuery.UserId = this.userInfo.userId; this.listPLQuery.UserId = this.userInfo.userId;
console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId); console.log(
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
this.listPLQuery.UserId
);
this.$axios this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery) .gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => { .then((response) => {
//console.log("线"+JSON.stringify(response.item)); //console.log("线"+JSON.stringify(response.item));
this.PLList = response.item; this.PLList = response.item;
this.PLChildList = this.PLList.sort((a, b) => { this.PLChildList = this.PLList.sort((a, b) => {
return a.productLineCode - b.productLineCode; return a.productLineCode - b.productLineCode;
}); });
console.log("2222222获取产线数据:"+JSON.stringify(this.PLChildList)); console.log(
"2222222获取产线数据:" + JSON.stringify(this.PLChildList)
);
this.listQuery.productLine = this.PLChildList[0].productLineCode; this.listQuery.productLine = this.PLChildList[0].productLineCode;
if (this.listQuery.productLine != "") { if (this.listQuery.productLine != "") {
//线 //线
@ -820,16 +833,16 @@ this.$axios
}, },
]; ];
} }
this.getList(); this.getList();
// this.getListM100(); // this.getListM100();
// this.getListR100(); // this.getListR100();
//console.log(this.PLList) //console.log(this.PLList)
}) })
.catch(() => {}); .catch(() => {});
}, },
valueselectChange1(){}, valueselectChange1() {},
valueselectChange(val) { valueselectChange(val) {
this.$forceUpdate(); this.$forceUpdate();
this.customerInfosMB = []; this.customerInfosMB = [];
this.customerInfosZHB = []; this.customerInfosZHB = [];
@ -840,26 +853,21 @@ this.$axios
ProductLine: val, ProductLine: val,
}, },
]; ];
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
getvehicleModel() getvehicleModel() {
{
this.$axios this.$axios
.gets( .gets("/api/newjit/dic/list", this.vehicleModelQuery)
"/api/newjit/dic/list",this.vehicleModelQuery .then((response) => {
) //console.log(response);
.then((response) => { this.vehicleModelList = response.item;
//console.log(response); //console.log()
this.vehicleModelList = response.item; })
//console.log() .catch(() => {});
})
.catch(() => {
});
}, },
/** 通过回调控制style */ /** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) { cellStyle({ row, column, rowIndex, columnIndex }) {
@ -885,8 +893,6 @@ this.$axios
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

4
vue/src/views/pg-fis/basedate/select/index.vue

@ -54,7 +54,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="大众顺序号:" prop="hostSN"> <el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
@ -333,7 +333,7 @@ export default {
listQuery: { listQuery: {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
ProductLine: undefined, productLine: undefined,
Version: undefined, Version: undefined,
printBillNum: undefined, printBillNum: undefined,
serialNumBegin: undefined, serialNumBegin: undefined,

Loading…
Cancel
Save