zhibinlv
/
FIS1.5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【长春派格1.5】需求更改0118

HQ
安虹睿 10 months ago
parent
0facf74942
commit
6580fd9440
10 changed files with 129 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      vue/src/components/ImportExcel-normal/index.vue
  2. 4
      vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
  3. 4
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  4. 19
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  5. 8
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  6. 51
      vue/src/views/pg-fis/basedate/planControl/index.vue
  7. 6
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  8. 14
      vue/src/views/pg-fis/basedate/select/detail.vue
  9. 40
      vue/src/views/pg-fis/basedate/select/index.vue
  10. 24
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

9
vue/src/components/ImportExcel-normal/index.vue
View File

@ -146,22 +146,19 @@ export default {
.then(async (res) => { .then(async (res) => {
this.loading = false; this.loading = false;
if (res.status) { if (res.status) {
this.$message({ this.$parent.importNormalCallback(res,fileuploadList,fd)
message: "导入成功！",
type: "success",
});
this.$parent.importNormalCallback()
} else { } else {
this.$message({ this.$message({
message: res.message, message: res.message,
type: "error", type: "error",
showClose:true
}); });
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.$message({ this.$message({
message: "导入失败！", message: "导入失败！2222",
type: "error", type: "error",
}); });
}); });

4
vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
View File

@ -459,14 +459,14 @@ export default {
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
//tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); //tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 });
// tempsTabs.push({ // tempsTabs.push({
// label: "底盘号", // label: "底盘号",
// prop: "vin", // prop: "vin",
// width: 130, // width: 130,
// }); // });
tempsTabs.push({ tempsTabs.push({
label: "KNR", label: "车身号",
prop: "knr", prop: "knr",
width: 150, width: 150,
}); });

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

@ -411,6 +411,10 @@
}, },
// 导入后回调 // 导入后回调
importNormalCallback(){ importNormalCallback(){
this.$message({
message: "导入成功！",
type: "success",
});
this.importCloseNormal() this.importCloseNormal()
this.getList(); this.getList();
}, },

19
vue/src/views/pg-fis/basedate/m100Online/detail.vue
View File

@ -21,9 +21,10 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick" @row-click="handleRowClick"
:row-key="getRowKeys" :row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
> >
<!-- @expand-change="exChange" -->
<!-- :expand-row-keys="expands" -->
<!-- <el-table-column type="selection" width="44px"></el-table-column> --> <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column <!-- <el-table-column
prop="总成名称" prop="总成名称"
@ -42,7 +43,7 @@
class="two-list" class="two-list"
</el-table-column> --> </el-table-column> -->
<el-table-column type="expand" prop="details"> <!-- <el-table-column type="expand" prop="details">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="scope.row.details"> <el-table :data="scope.row.details">
<el-table-column <el-table-column
@ -66,7 +67,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -219,6 +220,16 @@ export default {
/** 列表字段 */ /** 列表字段 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "规格说明",
prop: "specExplain",
width: 160,
});
tempsTabs.push({
label: "颜色说明",
prop: "colorExplain",
width: 160,
});
tempsTabs.push({ tempsTabs.push({
label: "总成编号", label: "总成编号",
prop: "erpAssemblyCode", prop: "erpAssemblyCode",

8
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
View File

@ -358,7 +358,7 @@
</el-row> </el-row>
</el-row> </el-row>
<el-form-item <el-form-item
label="大众顺序号:" label="流水号:"
prop="beginHostSN" prop="beginHostSN"
v-show="isShowHostSN" v-show="isShowHostSN"
> >
@ -692,14 +692,14 @@ export default {
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
//tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); //tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 });
// tempsTabs.push({ // tempsTabs.push({
// label: "底盘号", // label: "底盘号",
// prop: "vin", // prop: "vin",
// width: 130, // width: 130,
// }); // });
tempsTabs.push({ tempsTabs.push({
label: "KNR", label: "车身号",
prop: "knr", prop: "knr",
width: 150, width: 150,
}); });
@ -1537,7 +1537,7 @@ export default {
//门板 //门板
if ( if (
parseInt(this.form.endHostSN) - parseInt(this.form.endHostSN) -
parseInt(this.form.beginHostSN) <= parseInt(this.form.beginHostSN) <
0 0
) { ) {
this.$message({ this.$message({

51
vue/src/views/pg-fis/basedate/planControl/index.vue
View File

@ -232,7 +232,7 @@
<importExcel <importExcel
ref="importexcel" ref="importexcel"
:show="showExcelImport" :show="showExcelImport"
:importURL="'/api/newjit/import-record/import'" :importURL="importExcelURL"
@close="importClose" @close="importClose"
/> />
</div> </div>
@ -268,6 +268,7 @@
mixins: [message_table], mixins: [message_table],
data() { data() {
return { return {
importExcelURL:'/api/newjit/import-record/import',
tipper:"", tipper:"",
showExcelImport: false, showExcelImport: false,
form: {}, form: {},
@ -403,9 +404,51 @@
this.showExcelImport = false; this.showExcelImport = false;
}, },
// 导入后回调 // 导入后回调
importNormalCallback(){ importNormalCallback(res,fileuploadList){
this.importClose() // 导入功能，第一次调用时 ret.Status = true 并且 ret.Message 不为空时， 弹出确认对话框，显示ret.Message,
this.getList(); // 如果选择是， 调用api/newjit/import-record/import，并且第二个参数forceExecute 传入true，选择否关闭
if(res.status && res.message && res.message.length > 0){
this.$confirm(`${res.message}, 是否确定继续导入`, '提示', {
confirmButtonText: '继续导入',
cancelButtonText: '取消导入',
type: 'warning'
})
.then(() => {
this.listLoading = true
let fd = new FormData();
fileuploadList.forEach((file) => {
fd.append("files", file); // 添加文件
});
fd.append("forceExecute", true);
this.$axios.posts(this.importExcelURL, fd)
.then(async (res) => {
this.listLoading = false
this.$message({
message: "导入成功！",
type: "success",
});
this.importClose()
this.getList();
})
.catch(() => {
this.listLoading = false
this.$message({
message: res.message,
type: "error",
showClose:true
});
this.importClose()
this.getList();
});
})
.catch(() => {
this.importClose()
this.getList();
})
}else{
this.importClose()
this.getList();
}
}, },
/** 刷新列表 */ /** 刷新列表 */
handleHandle(data) { handleHandle(data) {

6
vue/src/views/pg-fis/basedate/repeatR100/index.vue
View File

@ -460,10 +460,10 @@ export default {
computed: { computed: {
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); // tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 });
tempsTabs.push({ tempsTabs.push({
label: "KNR", label: "车身号",
prop: "knr", prop: "knr",
width: 120, width: 120,
}); });

14
vue/src/views/pg-fis/basedate/select/detail.vue
View File

@ -42,7 +42,7 @@
class="two-list" class="two-list"
</el-table-column> --> </el-table-column> -->
<el-table-column type="expand" prop="details"> <!-- <el-table-column type="expand" prop="details">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="scope.row.details"> <el-table :data="scope.row.details">
<el-table-column <el-table-column
@ -66,7 +66,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -219,6 +219,16 @@ export default {
/** 列表字段 */ /** 列表字段 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "规格说明",
prop: "specExplain",
width: 160,
});
tempsTabs.push({
label: "颜色说明",
prop: "colorExplain",
width: 160,
});
tempsTabs.push({ tempsTabs.push({
label: "总成编号", label: "总成编号",
prop: "erpAssemblyCode", prop: "erpAssemblyCode",

40
vue/src/views/pg-fis/basedate/select/index.vue
View File

@ -99,7 +99,7 @@
<el-form-item label="流水号:" prop="hostSN"> <el-form-item label="流水号:" prop="hostSN">
<!-- <el-form-item label="大众顺序号:" prop="hostSN"> --> <!-- <el-form-item label="大众顺序号:" prop="hostSN"> -->
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.hostSN"
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
@ -189,7 +189,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="单据状态" prop="State" v-show="isShowState"> <!-- <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 <el-checkbox
v-for="(item, index) in billState" v-for="(item, index) in billState"
@ -200,7 +200,7 @@
{{ item.name }} {{ item.name }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item> -->
<el-form-item > <el-form-item >
<el-button <el-button
@ -475,11 +475,11 @@ export default {
{ required: true, message: "必须输入！", trigger: "blur" }, { required: true, message: "必须输入！", trigger: "blur" },
], ],
}, },
billState: [ // billState: [
{ id: 2, name: "未打印" }, // { id: 2, name: "未打印" },
{ id: 3, name: "已打印" }, // { id: 3, name: "已打印" },
// { id: 4, name: "不可打印" }, // // { id: 4, name: "不可打印" },
], // ],
valueSelect: "", valueSelect: "",
customerInfos: [], customerInfos: [],
customerInfosMB: [], customerInfosMB: [],
@ -610,25 +610,25 @@ export default {
this.getPLChildGroupList() this.getPLChildGroupList()
}, },
created() { created() {
this.billState.forEach((element, index) => { // this.billState.forEach((element, index) => {
if (index === 0) { // if (index === 0) {
this.listQuery.state.push(element.id); // this.listQuery.state.push(element.id);
} // }
}); // });
this.getProductLine(); this.getProductLine();
}, },
computed: { computed: {
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); // tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 });
// tempsTabs.push({ // tempsTabs.push({
// label: "底盘号", // label: "底盘号",
// prop: "vin", // prop: "vin",
// width: 130, // width: 130,
// }); // });
tempsTabs.push({ tempsTabs.push({
label: "KNR", label: "车身号",
prop: "knr", prop: "knr",
width: 150, width: 150,
}); });
@ -886,9 +886,9 @@ export default {
this.listQuery.ZHBBillStatus = null; this.listQuery.ZHBBillStatus = null;
} else { } else {
this.listQuery.canNotPrint = null; this.listQuery.canNotPrint = null;
if (this.listQuery.state !== undefined) { // if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0]; // this.listQuery.billStatus = this.listQuery.state[0];
} // }
if (this.listQuery.productType === 2) { if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = this.listQuery.billStatus; this.listQuery.ZHBBillStatus = this.listQuery.billStatus;
@ -1573,7 +1573,7 @@ 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.listQuery.state.push(this.billState[0].id);
this.isShowState = true; this.isShowState = true;
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
this.listQuery.GroupName = this.PLChildGroupList[0] this.listQuery.GroupName = this.PLChildGroupList[0]

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

@ -9,13 +9,22 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<el-form-item label="流水号:" prop="HostSN2"> <el-form-item label="流水号:">
<el-input <el-input
v-model="listQuery.HostSN2" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 100px"
@keyup.enter.native="handleQuery"
/>
-
<el-input
v-model="listQuery.HostSNEnd"
placeholder=""
clearable
size="small"
style="width: 100px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -213,7 +222,7 @@
> >
<el-table-column type="selection" width="44px"></el-table-column> <el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
label="大众顺序号" label="流水号"
prop="hostSN" prop="hostSN"
sortable sortable
align="center" align="center"
@ -731,13 +740,18 @@ export default {
// prop: "hostSN", // prop: "hostSN",
// width: 150, // width: 150,
// }); // });
// tempsTabs.push({
// label: "流水号",
// prop: "hostSN2",
// width: 180,
// });
tempsTabs.push({ tempsTabs.push({
label: "底盘号", label: "底盘号",
prop: "vin", prop: "vin",
width: 180, width: 180,
}); });
tempsTabs.push({ tempsTabs.push({
label: "KNR", label: "车身号",
prop: "knr", prop: "knr",
width: 120, width: 120,
}); });

Write Preview
Loading…
Cancel
Save