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

修改客户端

FoShanPG
刘云峰 4 months ago
parent
33fe2f5eb0
commit
5b793997ef
14 changed files with 113 additions and 91 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. 11
      vue/public/config.js
  2. 86
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  3. 2
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  4. 2
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  5. 2
      vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
  6. 2
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  7. 75
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  8. 0
      vue/src/views/pg-fis/basedate/m100Online/~old/detailMB.vue
  9. 0
      vue/src/views/pg-fis/basedate/m100Online/~old/detailZHB.vue
  10. 0
      vue/src/views/pg-fis/basedate/m100Online/~old/index-old.vue
  11. 0
      vue/src/views/pg-fis/basedate/m100Online/~old/index.vue
  12. 22
      vue/src/views/pg-fis/basedate/select/index.vue
  13. 0
      vue/src/views/pg-fis/basedate/select/~old/detailMB.vue
  14. 0
      vue/src/views/pg-fis/basedate/select/~old/detailZHB.vue

11
vue/public/config.js
View File

@ -0,0 +1,11 @@
// 开发
window.SITE_CONFIG['config_ip'] = 'http://192.168.1.228'
window.SITE_CONFIG['config_auth_port'] = '8066'
window.SITE_CONFIG['config_public_port'] = '8092'
window.SITE_CONFIG['config_backend_port'] = '8092'
// 发布
// window.SITE_CONFIG['config_ip'] = 'http://192.168.0.68'
// window.SITE_CONFIG['config_auth_port'] = '8066'
// window.SITE_CONFIG['config_public_port'] = '8092'
// window.SITE_CONFIG['config_backend_port'] = '8092'

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页--> <!--重新打印柱护板模块-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">
@ -582,48 +582,48 @@
} }
}, },
//作废操作，支持批量操作-门板 //作废操作，支持批量操作-门板
handleDelete(row) { // handleDelete(row) {
//批量删除 // //批量删除
var params = []; // var params = [];
let myalert = ""; //声明变量，其变量必须在此声明后使用 // let myalert = ""; //声明变量，其变量必须在此声明后使用
if (row) { // if (row) {
//单行 // //单行
params.push(row.id); // params.push(row.id);
myalert = row.name; // myalert = row.name;
} else { // } else {
//多选 // //多选
this.multipleSelection.forEach((element) => { // this.multipleSelection.forEach((element) => {
let id = element.id; // let id = element.id;
params.push(id); // params.push(id);
}); // });
myalert = "选中项"; // myalert = "选中项";
} // }
this.$confirm("是否作废" + myalert + "?", "提示", { // this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定", // confirmButtonText: "确定",
cancelButtonText: "取消", // cancelButtonText: "取消",
type: "warning", // type: "warning",
}) // })
.then(() => { // .then(() => {
this.$axios // this.$axios
.posts("/api/newjit/ZhuHuBanPackingList/delete", params) // .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
.then((response) => { // .then((response) => {
const index = this.list.indexOf(row); // const index = this.list.indexOf(row);
this.$notify({ // this.$notify({
title: "成功", // title: "成功",
message: "作废成功", // message: "作废成功",
type: "success", // type: "success",
duration: 2000, // duration: 2000,
}); // });
this.getList(); // this.getList();
}); // });
}) // })
.catch(() => { // .catch(() => {
this.$message({ // this.$message({
type: "info", // type: "info",
message: "已取消操作", // message: "已取消操作",
}); // });
}); // });
}, // },
fetchData(id) { fetchData(id) {
//循环动态 //循环动态
this.$axios this.$axios

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页--> <!--报废门板-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页--> <!--报废柱护板-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页--> <!--补打门板模块-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">

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

@ -1,4 +1,4 @@
<!--补打柱护板--> <!--补打柱护板模块-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<div ref="box"> <div ref="box">

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

@ -34,22 +34,19 @@
<el-button ref="btn1" type="primary" size="mini" style="margin-left: 15px" @click="print()">打印门板发货排序单 <el-button ref="btn1" type="primary" size="mini" style="margin-left: 15px" @click="print()">打印门板发货排序单
</el-button> </el-button>
<el-button v-show="false" @click="drawerMBPrint = true" size="mini" type="warning" plain> <el-button v-show="this.listQuery.productType !== 2" @click="drawerMBReprint = true" size="mini" type="warning" plain>
<strong>重新打印门板</strong></el-button> <strong>重新打印门板</strong></el-button>
<el-button v-show="false" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain> <el-button v-show="this.listQuery.productType !== 2" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain>
<strong>门板补打</strong></el-button> <strong>门板补打</strong></el-button>
<el-button v-show="false" @click="drawerMBDelete = true" size="mini" type="danger" plain><strong>门板作废</strong></el-button> <el-button v-show="this.listQuery.productType !== 2" @click="drawerMBDelete = true" size="mini" type="danger" plain>
<strong>门板作废</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBPrint = true" size="mini" type="warning" <el-button v-show="this.listQuery.productType === 2" @click="drawerZHBReprint = true" size="mini" type="warning"
plain> plain>
<strong>重新打印柱护板</strong></el-button> <strong>重新打印柱护板</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerbudaZHBPrint = true" size="mini" type="warning" <el-button v-show="this.listQuery.productType === 2" @click="drawerbudaZHBPrint = true" size="mini" type="warning"
plain> plain>
<strong>柱护板补打</strong></el-button> <strong>柱护板补打</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBDelete = true" size="mini" type="danger" <el-button v-show="this.listQuery.productType === 2" @click="drawerZHBDelete = true" size="mini" type="danger"
plain><strong>柱护板作废</strong></el-button> plain><strong>柱护板作废</strong></el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="open()" <!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
@ -81,31 +78,28 @@
</flexbox> </flexbox>
</div> </div>
<!--门板重打--> <!--门板重打-->
<el-drawer title="门板重新打印" :visible.sync="drawerMBPrint" direction="rtl" size="65%"> <el-drawer title="门板重新打印" :visible.sync="drawerMBReprint" direction="rtl" size="65%">
<RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB> <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
</el-drawer> </el-drawer>
<!--门板补打-->
<el-drawer title="门板补打" :visible.sync="drawerbudaMBPrint" direction="rtl" size="65%">
<budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
</el-drawer>
<!--门板作废-->
<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
</el-drawer>
<!--柱护板重打--> <!--柱护板重打-->
<el-drawer title="柱护板重新打印" :visible.sync="drawerZHBPrint" direction="rtl" size="65%"> <el-drawer title="柱护板重新打印" :visible.sync="drawerZHBReprint" direction="rtl" size="65%">
<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB> <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
</el-drawer> </el-drawer>
<!--门板补打-->
<el-drawer title="门板补打" :visible.sync="drawerbudaMBPrint" direction="rtl" size="65%">
<budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
</el-drawer>
<!--柱护板补打--> <!--柱护板补打-->
<el-drawer title="柱护板补打" :visible.sync="drawerbudaZHBPrint" direction="rtl" size="65%"> <el-drawer title="柱护板补打" :visible.sync="drawerbudaZHBPrint" direction="rtl" size="65%">
<budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB> <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
</el-drawer> </el-drawer>
<!--门板作废-->
<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
<!--柱护板重打和作废--> <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
</el-drawer>
<!--柱护板作废-->
<el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%"> <el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%">
<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB> <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
</el-drawer> </el-drawer>
@ -213,16 +207,18 @@
} from "vuex"; } from "vuex";
import moment from "moment"; import moment from "moment";
import Detail from "./detail.vue"; import Detail from "./detail.vue";
import MBDetail from "./detailMB.vue"; // import MBDetail from "./detailMB.vue";
import ZHBDetail from "./detailZHB.vue"; // import ZHBDetail from "./detailZHB.vue";
import { import {
downloadFile downloadFile
} from "@/utils/crmindex.js"; } from "@/utils/crmindex.js";
import qs from "qs"; import qs from "qs";
import RepetitionMB from "./RepetitionMB.vue"; import RepetitionMB from "./RepetitionMB.vue";
import RepetitionZHB from "./RepetitionZHB.vue";
import budaMB from "./budaMB.vue"; import budaMB from "./budaMB.vue";
import budaZHB from "./budaZHB.vue"; import budaZHB from "./budaZHB.vue";
import RepetitionZHB from "./RepetitionZHB.vue";
import ScrapMB from "./ScrapMB.vue"; import ScrapMB from "./ScrapMB.vue";
import ScrapZHB from "./ScrapZHB.vue"; import ScrapZHB from "./ScrapZHB.vue";
import { import {
@ -236,8 +232,8 @@
CRMTableHead, CRMTableHead,
importExcel, importExcel,
Detail, Detail,
MBDetail, // MBDetail,
ZHBDetail, // ZHBDetail,
RepetitionMB, RepetitionMB,
RepetitionZHB, RepetitionZHB,
ScrapMB, ScrapMB,
@ -279,11 +275,13 @@
crmType: "M100Online", crmType: "M100Online",
//productLineList:null, //productLineList:null,
isDisable: false, isDisable: false,
drawerMBPrint: false, drawerMBReprint: false, //显示门板重新打印
drawerZHBReprint: false,
drawerbudaMBPrint: false, drawerbudaMBPrint: false,
drawerbudaZHBPrint: false, //显示补打柱护板 drawerbudaZHBPrint: false, //显示补打柱护板
drawerMBDelete: false,
drawerZHBPrint: false, drawerMBDelete: false, //显示门板报废
drawerZHBDelete: false, drawerZHBDelete: false,
activeNames: ["1"], activeNames: ["1"],
printNum: "12", printNum: "12",
@ -446,9 +444,10 @@
}, },
mounted() { mounted() {
this.setTableHeight() this.setTableHeight()
let _this = this;
let timer = setInterval(() => { let timer = setInterval(() => {
this.open(); this.open(_this);
}, 5000); }, 5000);
}, },
created() { created() {
@ -552,7 +551,7 @@
this.getList(); this.getList();
}, },
open() { open(self) {
// let productLineList = []; // let productLineList = [];
// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" ); // //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
// productLineList.forEach(element => { // productLineList.forEach(element => {
@ -599,7 +598,11 @@
if (response.item !== null) { if (response.item !== null) {
response.item.forEach((JKITEM) => { response.item.forEach((JKITEM) => {
if (JKITEM.productLine == "01") { if (JKITEM.productLine == "01") {
this.$refs.sp01.Visible = true;
if (self.$refs && self.$refs.sp01) {
self.$refs.sp01.Visible = true;
}
this.content01 = this.content01 =
"大众一厂已经" + "大众一厂已经" +
JKITEM.timeoutMinutes + JKITEM.timeoutMinutes +
@ -957,6 +960,8 @@
roleFilter(type) { roleFilter(type) {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
/*取M100列表*/
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
@ -979,6 +984,9 @@
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 this.listQueryList.ProductLine = this.listQuery.productLine; //产线
this.listQueryList.CanNotPrint = false; //不可打印 this.listQueryList.CanNotPrint = false; //不可打印
this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5 this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
this.listQueryList.productType = this.listQuery.productType;
console.log( console.log(
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) "日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
); );
@ -1710,6 +1718,7 @@
this.$forceUpdate(); this.$forceUpdate();
//console.log(this.listQuery.productType); //console.log(this.listQuery.productType);
this.listQuery.productLine = ""; this.listQuery.productLine = "";
debugger
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType) (u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => { ).sort((a, b) => {

0
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue → vue/src/views/pg-fis/basedate/m100Online/~old/detailMB.vue
View File

0
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue → vue/src/views/pg-fis/basedate/m100Online/~old/detailZHB.vue
View File

0
vue/src/views/pg-fis/basedate/m100Online/index-old.vue → vue/src/views/pg-fis/basedate/m100Online/~old/index-old.vue
View File

0
vue/src/views/pg-fis/basedate/m100Online/index.vue → vue/src/views/pg-fis/basedate/m100Online/~old/index.vue
View File

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

@ -211,23 +211,23 @@
</flexbox> </flexbox>
</div> </div>
<!--门板重打和作废--> <!--门板重打和作废-->
<el-drawer <!-- <el-drawer
title="门板作废和重打" title="门板作废和重打"
:visible.sync="drawerMB" :visible.sync="drawerMB"
direction="rtl" direction="rtl"
size="65%" size="65%"
> >
<MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail> <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
</el-drawer> </el-drawer> -->
<!--柱护板重打和作废--> <!--柱护板重打和作废-->
<el-drawer <!-- <el-drawer
title="柱护板作废和重打" title="柱护板作废和重打"
:visible.sync="drawerZHB" :visible.sync="drawerZHB"
direction="rtl" direction="rtl"
size="65%" size="65%"
> >
<ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail> <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
</el-drawer> </el-drawer> -->
<div class="l-table" style="margin-top: -30px"> <div class="l-table" style="margin-top: -30px">
<!--表格渲染--> <!--表格渲染-->
@ -392,8 +392,8 @@ 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 Detail from "./detail.vue"; import Detail from "./detail.vue";
import MBDetail from "./detailMB.vue"; //import MBDetail from "./detailMB.vue";
import ZHBDetail from "./detailZHB.vue"; //import ZHBDetail from "./detailZHB.vue";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import moment from "moment"; import moment from "moment";
@ -419,8 +419,8 @@ export default {
CRMTableHead, CRMTableHead,
importExcel, importExcel,
Detail, Detail,
MBDetail, //MBDetail,
ZHBDetail, //ZHBDetail,
}, },
directives: { permission }, directives: { permission },
filters: { filters: {
@ -445,8 +445,8 @@ export default {
return { return {
chkindex: 0, //复选按钮选择索引 chkindex: 0, //复选按钮选择索引
crmType: "select", crmType: "select",
drawerZHB: false, //drawerZHB: false,
drawerMB: false, //drawerMB: false,
activeNames: ["1"], activeNames: ["1"],
rules: { rules: {
erpAssemblyName: [ erpAssemblyName: [
@ -826,6 +826,8 @@ 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) {

0
vue/src/views/pg-fis/basedate/select/detailMB.vue → vue/src/views/pg-fis/basedate/select/~old/detailMB.vue
View File

0
vue/src/views/pg-fis/basedate/select/detailZHB.vue → vue/src/views/pg-fis/basedate/select/~old/detailZHB.vue
View File

Write Preview
Loading…
Cancel
Save