Browse Source

public/index.html添加全局变量,正常打印格式化

FoShanPG
刘云峰 2 days ago
parent
commit
33fe2f5eb0
  1. 5
      vue/public/index.html
  2. 5
      vue/src/App.vue
  3. 10
      vue/src/views/newJit/baseData/excludePartCfgs/index.vue
  4. 1436
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  5. 1517
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  6. 1606
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  7. 1607
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  8. 1357
      vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
  9. 1426
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  10. 647
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  11. 1400
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  12. 1380
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  13. 2
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  14. 3804
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  15. 2
      vue/src/views/pg-fis/basedate/partSwitch/index.vue
  16. 2
      vue/src/views/pg-fis/basedate/productLine/index.vue
  17. 2
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  18. 36
      vue/static/config.js

5
vue/public/index.html

@ -7,6 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title>
<script>
// 初始化
window.SITE_CONFIG = {};
</script>
<script src="./config.js"></script>
<!-- <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
<!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->

5
vue/src/App.vue

@ -42,5 +42,10 @@
},
}
localStorage.setItem('config_ip',window.SITE_CONFIG['config_ip'])
localStorage.setItem('config_auth_port',window.SITE_CONFIG['config_auth_port'])
localStorage.setItem('config_public_port',window.SITE_CONFIG['config_public_port'])
localStorage.setItem('config_backend_port',window.SITE_CONFIG['config_backend_port'])
</script>

10
vue/src/views/newJit/baseData/excludePartCfgs/index.vue

@ -151,7 +151,7 @@ export default {
};
},
created() {
debugger
//debugger
console.log("进入excludePartCfgs模块");
this.getList();
@ -193,7 +193,7 @@ export default {
//debugger
this.isLoading = true;
console.log(JSON.stringify(this.inputParam))
debugger
//debugger
this.$axios
.gets("/api/newjit/exclude-part-cfg/getlist", this.inputParam)
//.posts("/api/newjit/exclude-part-cfg/get-list", this.inputParam)
@ -301,12 +301,12 @@ export default {
type: "warning",
})
.then(() => {
debugger
//debugger
var arrStr = params.join();
this.$axios
.deletes("/api/newjit/exclude-part-cfg/delete/" + arrStr)
.then((response) => {
debugger
//debugger
if (response.status)
{
this.$notify({
@ -336,7 +336,7 @@ export default {
*/
async handleExport() {
this.isLoading = true;
debugger
//debugger
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/export", this.inputParam)
.then((res) => {

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

File diff suppressed because it is too large

1517
vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue

File diff suppressed because it is too large

1606
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

File diff suppressed because it is too large

1607
vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

File diff suppressed because it is too large

1357
vue/src/views/pg-fis/basedate/m100Online/budaMB.vue

File diff suppressed because it is too large

1426
vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue

File diff suppressed because it is too large

647
vue/src/views/pg-fis/basedate/m100Online/detail.vue

@ -1,31 +1,13 @@
<!--M100上线信息-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
<div class="cr-body-content">
<!--表格渲染-->
<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
class="cr-table" :data="list" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle" size="small"
stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
prop="总成名称"
label="erpAssemblyName"
sortable
@ -42,316 +24,325 @@
class="two-list"
</el-table-column> -->
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column
prop="partCode"
label="客户零件代码"
></el-table-column>
<el-table-column
prop="partNum"
label="客户零件数量"
></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="360"
>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
</div>
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column prop="partCode" label="客户零件代码"></el-table-column>
<el-table-column prop="partNum" label="客户零件数量"></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
:min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column prop="erpAssemblyVersion" label="总成版本号" sortable width="360">
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.MaxResultCount"
@pagination="getList" />
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import {
downloadFile
} from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 30,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 30;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
debugger
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 160,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
export default {
name: "sendUnsettledDiffReport",
components: {
Pagination,
CRMTableHead,
Detail
},
directives: {
permission
},
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [{
required: true,
message: "必须输入!",
trigger: "blur"
}, ],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 30,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function() {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 30;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
//debugger
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 160,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = {
vehicleAssemblyId: this.customerInfo.parentId,
billId: this.customerInfo.billId
};
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
//this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
sortChange(data) {
const {
prop,
order
} = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({
row,
column,
rowIndex,
columnIndex
}) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return {
textAlign: "right"
};
} else {
return {
textAlign: "left"
};
}
},
/** 通过回调控制表头style */
headerRowStyle({
row,
column,
rowIndex,
columnIndex
}) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return {
textAlign: "right",
background: "#FAFAFA"
};
} else {
return {
textAlign: "left",
background: "#FAFAFA"
};
}
},
handleRowClick(row, column, event) {
//this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
@import "../../../pg-fis/styles/crmtable.scss";
</style>

1400
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

File diff suppressed because it is too large

1380
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

File diff suppressed because it is too large

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

@ -898,7 +898,7 @@ export default {
setTimeout(() => {
//
this.listLoading = false;
debugger
//debugger
}, 500);
})
.catch(() => {

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

File diff suppressed because it is too large

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

@ -186,7 +186,7 @@
});
},
created() {
debugger
//debugger
this.getList();
},

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

@ -936,7 +936,7 @@ export default {
"/api/newjit/product-line-authority/do-authority",this.saveQuery
)
.then((response) => {
debugger
//debugger
console.log(response);
this.dialogFormVisible = false;
this.getList();

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

@ -811,7 +811,7 @@ this.$axios
},
//线
ptypeselectChange() {
debugger
//debugger
this.$forceUpdate();
//console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
this.listQuery.productLine = "";

36
vue/static/config.js

@ -2,11 +2,17 @@ let configJSON
if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://127.0.0.1', //?? two
auth_port: '8066',
public_port: '8092',
// backend_port: '8092',
backend_port: '44344', //?? three
// ip: 'http://127.0.0.1', //?? two
// auth_port: '8066',
// public_port: '8092',
// // backend_port: '8092',
// backend_port: '44344', //?? three
ip: localStorage.getItem('config_ip'),
auth_port: localStorage.getItem('config_auth_port'),
public_port: localStorage.getItem('config_public_port'),
backend_port: localStorage.getItem('config_backend_port'),
},
basic: {},
upload: {
@ -36,17 +42,21 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://192.168.7.21',
//ip: "http://222.169.228.163",
// ip: 'http://192.168.7.21',
// //ip: "http://222.169.228.163",
auth_port: '8066',
public_port: '8092',
backend_port: '8092',
// auth_port: '8066',
// public_port: '8092',
// backend_port: '8092',
// auth_port: "7696",
// public_port: "7692",
// backend_port: "7692",
// // auth_port: "7696",
// // public_port: "7692",
// // backend_port: "7692",
ip: localStorage.getItem('config_ip'),
auth_port: localStorage.getItem('config_auth_port'),
public_port: localStorage.getItem('config_public_port'),
backend_port: localStorage.getItem('config_backend_port'),
},
basic: {},
upload: {

Loading…
Cancel
Save