PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

FoShanPG
刘云峰 2 days ago
parent
a665c0b6e8
commit
33fe2f5eb0
18 changed files with 7801 additions and 8487 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. 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
View File

@ -7,6 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title> <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="./css/style.css" type="text/css" />-->
<!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> --> <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->

5
vue/src/App.vue
View File

@ -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> </script>

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

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

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

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

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

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

@ -898,7 +898,7 @@ export default {
setTimeout(() => { setTimeout(() => {
//大数据量加载时 //大数据量加载时
this.listLoading = false; this.listLoading = false;
debugger //debugger
}, 500); }, 500);
}) })
.catch(() => { .catch(() => {

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

File diff suppressed because it is too large

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

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

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

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

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

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

36
vue/static/config.js
View File

@ -2,11 +2,17 @@ let configJSON
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
configJSON = { configJSON = {
base: { base: {
ip: 'http://127.0.0.1', //?? two // ip: 'http://127.0.0.1', //?? two
auth_port: '8066', // auth_port: '8066',
public_port: '8092', // public_port: '8092',
// backend_port: '8092', // // backend_port: '8092',
backend_port: '44344', //?? three // 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: {}, basic: {},
upload: { upload: {
@ -36,17 +42,21 @@ if (process.env.NODE_ENV === 'development') {
configJSON = { configJSON = {
base: { base: {
ip: 'http://192.168.7.21', // ip: 'http://192.168.7.21',
//ip: "http://222.169.228.163", // //ip: "http://222.169.228.163",
auth_port: '8066', // auth_port: '8066',
public_port: '8092', // public_port: '8092',
backend_port: '8092', // backend_port: '8092',
// auth_port: "7696", // // auth_port: "7696",
// public_port: "7692", // // public_port: "7692",
// backend_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: {}, basic: {},
upload: { upload: {

Write Preview
Loading…
Cancel
Save