Merge remote-tracking branch 'origin/master'

master
陈恒杰 9 months ago
commit f3dc264b62

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 榄菊管理系统
VUE_APP_TITLE = 榄菊生产管理系统
# 开发环境配置
ENV = 'development'

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 榄菊管理系统
VUE_APP_TITLE = 榄菊生产管理系统
NODE_ENV = production

@ -6,7 +6,7 @@
"license": "MIT",
"scripts": {
"###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"dev": "vue-cli-service serve",
"dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
@ -46,14 +46,12 @@
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsbarcode": "^3.11.6",
"jsencrypt": "3.0.0-rc.1",
"less": "^3.9.0",
"less-loader": "^5.0.0",
"moment": "^2.29.4",
"nprogress": "0.2.0",
"print-js": "^1.6.0",
"qrcode": "^1.5.4",
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
@ -64,7 +62,6 @@
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
"xlsx": "^0.17.0"

@ -91,3 +91,11 @@ export function getCkeckProjectList(query) {
params: query
});
}
// 仓库质量巡查记录
export function printXJRecordList(query) {
return request({
url: '/quality/qcInventoryReport/printXJRecordList',
method: 'get',
params: query
});
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 915 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 829 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 KiB

@ -35,8 +35,8 @@ export default {
},
data() {
return {
title: '管理系统',
logo: logoImg
title: '榄菊生产管理系统',
// logo: logoImg
}
}
}

@ -30,6 +30,8 @@ import Layout from '@/layout'
// 公共路由
export const constantRoutes = [
{path: '/cs', component: () => import('@/views/cs/index.vue')},
{path: '/cs2', component: () => import('@/views/cs/index2.vue')},
{
path: '/redirect',
component: Layout,

@ -0,0 +1,694 @@
<template>
<div>
<div class="bg">
<div class="title1">白坯车间生产监控看板</div>
<div class="floorNum floorNum1">1F</div>
<div class="floorNum floorNum2">2F</div>
<div class="floorNum floorNum3">3F</div>
<div class="floorNum floorNum4" @click="$router.push('/cs2')">4F</div>
<div class="floorNum floorNum5">5F</div>
<div class="floorNum floorNum6">6F</div>
<div class="output" v-for="i in outputData" :style="`left:${i.left}%`"><span>产量10</span></div>
<div v-for="i in equipmentData" class="equipment" :style="`left: ${i.left}%`">
<div :class="i.isRight?'equipmentName1':'equipmentName'"><span>设备名称</span></div>
</div>
<div class="arrows" v-for="i in arrowData" v-if="false">
<div class="oneAnR" :style="`left:${i.left-3}%`">
<div class="oneAn">
<div class="wx" :style="`top: -1%;left:49.5%`"></div>
<div class="arrow" :style="`top: 7%;left:49.5%`"></div>
<div class="wx" :style="`top: 29%;left:49.5%`"></div>
<div class="arrow" :style="`top: 37%;left:49.5%`"></div>
<div class="wx" :style="`top: 59%;left:49.5%`"></div>
<div class="arrow" :style="`top: 67%;left:49.5%`"></div>
<div class="wx" :style="`top: 89%;left:49.5%`"></div>
</div>
</div>
<div class="twoAnR" :style="`left:${i.left-3}%`">
<div class="twoAn">
<div class="wxh" :style="`top: -0.9%;left:49%`"></div>
<div class="arrow" :style="`top: 6%;left:49%`"></div>
<div class="wxh" :style="`top: 15.2%;left:49%`"></div>
<div class="arrow" :style="`top: 22.1%;left:49%`"></div>
<div class="wxh" :style="`top: 31.3%;left:49%`"></div>
<div class="arrow" :style="`top:38.2%;left:49%`"></div>
<div class="wxh" :style="`top: 47.4%;left:49%`"></div>
<div class="arrow" :style="`top: 54.3%;left:49%`"></div>
<div class="wxh" :style="`top: 63.5%;left:49%`"></div>
<div class="arrow" :style="`top: 70.4%;left:49%`"></div>
<div class="wxh" :style="`top: 79.6%;left:49%`"></div>
<div class="arrow" :style="`top: 86.5%;left:49%`"></div>
<div class="wxh" :style="`top: 95.7%;left:49%`"></div>
</div>
</div>
<div class="box" :style="`top: 74.5%;left:${i.left}%`"></div>
<div class="box" :style="`top: 78.8%;left:${i.left}%`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(1)">
<div class="arrow" :style="`top: 38.5%;left: 35.2%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 42%;left: 35%;transform: rotate(0deg)`"></div>
<div class="arrow" :style="`top: 48%;left: 34.5%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 52%;left: 34.2%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 57%;left: 34%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 62%;left: 33.8%;transform: rotate(0)`"></div>
<div class="arrow" :style="`top: 66%;left: 33.1%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(2)">
<div class="arrow" :style="`top: 38.5%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 39%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 39.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 39%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 38.7%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 39%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(3)">
<div class="arrow" :style="`top: 38.5%;left: 46.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 46.3%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 46.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 45.8%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 45.8%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 45.9%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 45.4%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(4)">
<div class="arrow" :style="`top: 38.5%;left: 50.5%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 50.5%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 50.9%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 51.1%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 51.1%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 51.2%;transform: rotate(0deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 51.7%;transform: rotate(0deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(5)">
<div class="arrow" :style="`top: 38.5%;left: 57.2%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 57.5%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 57.8%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 58%;transform: rotate(358deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 57.7%;transform: rotate(358deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(6)">
<div class="arrow" :style="`top: 38.5%;left: 61.2%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 61.5%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 62.2%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 62.5%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 62.8%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 63.1%;transform: rotate(355deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 63.9%;transform: rotate(355deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(7)">
<div class="arrow" :style="`top: 38.5%;l;left: 68%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 68.5%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 68.8%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 69%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 69.5%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 70%;transform: rotate(350deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 70%;transform: rotate(350deg);`"></div>
</div>
<div class="arrows1" v-if="isRun.includes(8)">
<div class="arrow" :style="`top: 38.5%;left: 72.2%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 42%;left: 72.7%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 48%;left: 73.5%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 52%;left: 74.1%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 57%;left: 74.8%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 62%;left: 75.3%;transform: rotate(345deg);`"></div>
<div class="arrow" :style="`top: 66%;left: 76.1%;transform: rotate(345deg);`"></div>
</div>
<div class="bottomArrows" v-for="(i,k) in 9">
<div class="arrow" :style="`top: 72.5%;left: ${31.9 + 5.2*k}%;`"></div>
</div>
<div class="bottomArrows" v-for="(i,k) in 5">
<div class="arrow" :style="`top: 73.7%;left: ${50.5 - 5.2*k}%;`"></div>
</div>
<div v-for="i in infoData " class="info"
:style="`top: ${i.top}%;left: ${i.left}%;transform: rotate(${i.rotate}deg);`">
<div :class="i.isRight?'infoModel':'infoModel'" :style="`transform: rotate(${360 -i.rotate}deg);`">
<div class="title">设备名称</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
isRun: [1, 2, 3, 4, 5, 6, 7, 8],
infoData: [
{
top: 28,
left: 32.7,
rotate: 7,
isRight: false
},
{
top: 27,
left: 37.1,
rotate: 3,
isRight: true
},
{
top: 26.5,
left: 44.1,
rotate: 2,
isRight: false
},
{
top: 26,
left: 48.8,
rotate: 358,
isRight: true
},
{
top: 25,
left: 55.8,
rotate: 355,
isRight: false
},
{
top: 24,
left: 60.2,
rotate: 351,
isRight: true
},
{
top: 24,
left: 66.8,
rotate: 351,
isRight: false
},
{
top: 22.5,
left: 71.6,
rotate: 346,
isRight: false
},
],
equipmentData: [
// {
// left: 16,
// isRight: false,
// },
// {
// left: 23.5,
// isRight: true,
// },
// {
// left: 38,
// isRight: false,
// },
// {
// left: 45.3,
// isRight: true,
// },
// {
// left: 59.3,
// isRight: false,
// },
// {
// left: 66.6,
// isRight: true,
// },
// {
// left: 81.2,
// isRight: false,
// },
// {
// left: 88.5,
// isRight: false,
// },
],
outputData: [
{
left: 33.3,
},
{
left: 37.7,
},
{
left: 43.9,
},
{
left: 48.5,
},
{
left: 54.5,
},
{
left: 59,
},
{
left: 65,
},
{
left: 69.5,
},
],
arrowData: [
{
left: 17.93,
},
{
left: 25.23,
},
{
left: 39.8,
},
{
left: 47.13,
},
{
left: 61.13,
},
{
left: 68.43,
},
{
left: 83.03,
},
{
left: 90.33,
},
]
}
},
methods: {},
mounted() {
}
}
</script>
<style lang="less" scoped>
.bg {
background-image: url("~@/assets/board/车间监控系统 - 02.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;
}
.title1 {
position: absolute;
top: 1%;
left: 50%;
font-weight: 700;
letter-spacing: 0.1vw;
font-size: 2.1vw;
color: #fff;
transform: translateX(-50%);
}
.floorNum {
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
top: 96.2%;
width: 4.6%;
height: 2.4%;
color: #fff6;
text-align: center;
line-height: 2.4vh;
font-size: 1.5vh;
}
.floorNum1 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 35.5%;
}
.floorNum2 {
background-image: url("~@/assets/board/楼层-左背景 选中.png");
left: 39.9%;
color: #fff;
}
.floorNum3 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 44.3%;
}
.floorNum4 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 51%;
}
.floorNum5 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 55.4%;
}
.floorNum6 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 59.8%;
}
@keyframes example {
from {
bottom: 7%
}
to {
bottom: -30%
}
}
@keyframes example1 {
from {
bottom: 0%;
}
to {
bottom: -18.5%
}
}
.arrows {
.oneAnR {
position: absolute;
width: 6%;
height: 10.5%;
top: 25.6%;
left: 15%;
overflow: hidden;
.oneAn {
position: absolute;
width: 100%;
height: 13vh;
bottom: 7%;
animation-name: example;
animation-duration: 4s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.twoAnR {
position: absolute;
width: 6%;
height: 34.5%;
top: 37.5%;
left: 15%;
overflow: hidden;
.twoAn {
position: absolute;
width: 100%;
height: 40vh;
bottom: 0;
animation-name: example1;
animation-duration: 4s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.arrow, .wx, .wxh, .box {
position: absolute;
background-repeat: no-repeat;
background-size: 100% 100%;
width: 0.5vw;
}
.wxh {
width: 0.6vw;
}
.arrow {
background-image: url("~@/assets/board/箭头 下2.png");
height: 2.5vh;
}
.wx {
background-image: url("~@/assets/board/蚊香1.png");
height: 0.5vw;
}
.wxh {
background-image: url("~@/assets/board/蚊香盒.png");
height: 0.6vw;
}
.box {
background-image: url("~@/assets/board/箱子.png");
transform: translateX(-0.15vw);
width: 0.82%;
height: 0.82vw;
}
}
.output {
background-image: url("~@/assets/board/弹窗3-产量2.png");
position: absolute;
background-repeat: no-repeat;
background-size: 100% 100%;
width: 4.3%;
height: 3.1%;
top: 27%;
span {
display: inline-block;
width: 100%;
height: 2.4vh;
color: #fff;
text-align: center;
line-height: 2.4vh;
font-size: 0.7vw;
}
}
.info {
position: absolute;
width: 4%;
height: 50%;
&:hover .infoModel, &:hover .infoModel1 {
display: inline-block;
}
.infoModel, .infoModel1 {
position: absolute;
top: 0%;
left: -295%;
width: 14.1vw;
height: 14.7vh;
color: #fff;
display: none;
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗1-设备信息.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.title {
position: absolute;
top: 7%;
font-size: 1vw;
letter-spacing: 3px;
}
.equipmentOutput {
color: #fff;
position: absolute;
top: 45%;
font-size: 0.9vw;
letter-spacing: 3px;
}
.equipmentInfo {
color: #fff;
position: absolute;
top: 70%;
font-size: 0.9vw;
letter-spacing: 3px;
}
}
.infoModel {
.title {
left: 7%;
}
.equipmentOutput {
left: 7%;
}
.equipmentInfo {
left: 7%;
}
}
.infoModel1 {
left: 60%;
.title {
right: 7%;
}
.equipmentOutput {
left: 25%;
}
.equipmentInfo {
left: 25%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
.equipment {
position: absolute;
top: 72%;
width: 4%;
height: 6%;
&:hover .equipmentName, &:hover .equipmentName1 {
display: inline-block;
}
.equipmentName, .equipmentName1 {
position: absolute;
width: 12.7vw;
height: 4.4vh;
display: none;
span {
position: absolute;
line-height: 4.4vh;
color: #fff;
font-size: 1vw;
letter-spacing: 3px;
}
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗2-名称.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
}
.equipmentName {
top: -10%;
left: -255%;
span {
left: 5%;
}
}
.equipmentName1 {
top: -10%;
left: 45%;
span {
right: 5%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
@keyframes arrowAn1 {
from {
top: -100%;
}
to {
top: 100%;
}
}
.arrows1 {
.arrow {
position: absolute;
width: 0.5vw;
height: 2.5vh;
overflow: hidden;
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url("~@/assets/board/箭头 下2.png");
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
}
.bottomArrows {
.arrow {
position: absolute;
width: 0.5vw;
height: 2.5vh;
overflow: hidden;
transform: rotate(90deg);
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url("~@/assets/board/箭头 下2.png");
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
}
</style>

@ -0,0 +1,472 @@
<template>
<div>
<div class="bg">
<div class="title1">白坯车间生产监控看板</div>
<div class="subTitle" style="left: 27%">成型区</div>
<div class="subTitle" style="left: 48.9%;">烘房区</div>
<div class="subTitle" style="left: 70.8%;">收坯区</div>
<div class="floorNum floorNum1">1F</div>
<div class="floorNum floorNum2" @click="$router.push('/cs')">2F</div>
<div class="floorNum floorNum3">3F</div>
<div class="floorNum floorNum4">4F</div>
<div class="floorNum floorNum5">5F</div>
<div class="floorNum floorNum6">6F</div>
<div v-if="isRun.includes(1)">
<div class="arrow" style="top: 34%;left: 22.1%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 39.6%;left: 21.3%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 39.6%;left: 14.1%;transform: rotate(15deg);"></div>
</div>
<div v-if="isRun.includes(2)">
<div class="arrow" style="top: 57.4%;left: 18.6%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 57.4%;left: 10.9%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 66.4%;left: 17.3%;transform: rotate(15deg);"></div>
<div class="arrow" style="top: 66.4%;left: 9.2%;transform: rotate(15deg);"></div>
</div>
<div v-if="isRun.includes(3)">
<div class="arrow" style="top: 36.3%;left: 68.2%;transform: rotate(348deg);"></div>
<div class="arrow" style="top: 36.6%;left: 74.2%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 42%;left: 68.7%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 41.7%;left: 74.8%;transform: rotate(348deg);"></div>
</div>
<div v-if="isRun.includes(4)">
<div class="arrow" style="top: 54.9%;left: 70.1%;transform: rotate(348deg);"></div>
<div class="arrow" style="top: 54.7%;left: 76.6%;transform: rotate(348deg);"></div>
<div class="arrow1" style="top: 61.5%;left: 70.7%;transform: rotate(348deg);"></div>
</div>
<div class="box" style="top: 24.3%;left: 7.7%;"></div>
<div class="box" style="top: 30.6%;left: 7.7%;"></div>
<div class="box" style="top: 39.1%;left: 7.7%;"></div>
<div class="box" style="top: 45.4%;left: 7.7%;"></div>
<div class="box" style="top: 24.3%;left: 16.8%;"></div>
<div class="box" style="top: 30.6%;left: 16.8%;"></div>
<div class="box" style="top: 39.1%;left: 16.8%;"></div>
<div class="box" style="top: 45.4%;left: 16.8%;"></div>
<div class="box" style="top: 64%;left: 7.7%;"></div>
<div class="box" style="top: 70.3%;left: 7.7%;"></div>
<div class="box" style="top: 78.8%;left: 7.7%;"></div>
<div class="box" style="top: 85.1%;left: 7.7%;;"></div>
<div class="box" style="top: 64%;left: 16.8%;"></div>
<div class="box" style="top: 70.3%;left: 16.8%;"></div>
<div class="box" style="top: 78.8%;left: 16.8%;"></div>
<div class="box" style="top: 85.1%;left: 16.8%;"></div>
<div class="box" style="top: 26.8%;left: 78.5%;"></div>
<div class="box" style="top: 33.1%;left: 78.5%;"></div>
<div class="box" style="top: 38.8%;left: 78.5%;"></div>
<div class="box" style="top: 45.1%;left: 78.5%;"></div>
<div class="box" style="top: 26.8%;left: 85.3%;"></div>
<div class="box" style="top: 33.1%;left: 85.3%;"></div>
<div class="box" style="top: 38.8%;left: 85.3%;"></div>
<div class="box" style="top: 45.1%;left: 85.3%;"></div>
<div class="box" style="top: 64.3%;left: 78.5%;"></div>
<div class="box" style="top: 70.6%;left: 78.5%;"></div>
<div class="box" style="top: 76.3%;left: 78.5%;"></div>
<div class="box" style="top: 82.6%;left: 78.5%;"></div>
<div class="box" style="top: 64.3%;left: 85.3%;"></div>
<div class="box" style="top: 70.6%;left: 85.3%;"></div>
<div v-for="(i,k) in hfData" :class="i.isProd? 'hf1':'hf'" :style="`top: ${i.top}%;`">{{ k + 1 }} 10
<div v-if="i.isProd" class="inProd">
<svg t="1723106843182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
p-id="1501">
<path
d="M148.361503 873.076215a33.27639 33.27639 0 0 1 0.204778-47.150084 33.583556 33.583556 0 0 1 47.354862 0.204778A444.316592 444.316592 0 0 0 511.944454 957.291078c104.436669 0 203.293143-35.938501 280.852728-99.317224l35.580139-32.81564a33.583556 33.583556 0 0 1 47.303668 1.791806 33.27639 33.27639 0 0 1-1.791806 47.09889l-37.064778 34.146695A511.176537 511.176537 0 0 1 511.944454 1023.99744a511.43251 511.43251 0 0 1-363.582951-150.921225z m863.49671-248.497838a33.481167 33.481167 0 0 1-65.426501-14.385639 443.139119 443.139119 0 0 0-299.129144-518.394954A33.327584 33.327584 0 1 1 667.575568 28.265477a509.58951 509.58951 0 0 1 344.180256 596.3129zM275.374922 138.640701a443.036731 443.036731 0 0 0-198.788032 467.456481 33.481167 33.481167 0 0 1-65.52889 13.771306A509.999065 509.999065 0 0 1 279.624061 59.596478C328.821923 31.439533 431.415591-4.191801 507.336954 0.620477c8.549472-1.689417 17.96925 0 25.597223 5.938555 6.4505 5.119445 9.982917 12.081889 11.109194 20.273001 0.255972 2.713306-0.409556 5.221833-1.023889 8.037528a22.832723 22.832723 0 0 1-7.781555 12.133083L341.262173 263.759926a28.208139 28.208139 0 0 1-29.999945 6.91125 30.204723 30.204723 0 0 1-20.836139-23.703028l-15.051167-108.378641z m-4.965861 785.322793c-2.969278-0.46075-7.269611 31.740556-34.402668 17.918056-48.225168-24.624528-138.225003-97.781391-174.93142-168.736892a31.331001 31.331001 0 0 1-8.037528-24.931695c1.023889-8.191111 5.221833-14.846389 11.62114-19.965834 2.201361-1.638222 4.658695-2.354944 7.423194-3.276444a22.832723 22.832723 0 0 1 14.385639 0.409555l285.7162 54.675668c10.392472 1.945389 18.839556 10.750834 21.399278 22.116a30.204723 30.204723 0 0 1-9.573361 30.102334l-113.651669 91.689252z m716.671041-436.688619c1.126278 2.815694 30.921445-10.085306 33.020417 20.273 3.737195 54.061334-12.542639 168.890475-54.522084 236.825504a31.331001 31.331001 0 0 1-17.201334 19.812251 29.999945 29.999945 0 0 1-23.139889 0.307167c-2.559722-1.023889-4.402722-2.815694-6.655278-4.709889a22.832723 22.832723 0 0 1-7.013639-12.54264l-100.341113-273.071171a28.208139 28.208139 0 0 1 7.986333-29.692779 30.204723 30.204723 0 0 1 30.716668-7.320805l137.149919 50.170556z"
fill="#fff" p-id="1502">
</path>
</svg>
生产中
</div>
<div class="infoModel">
<div class="title">设备名称</div>
<div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
<div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
</div>
</div>
<div class="equipment" v-for="i in equipmentData" :style="`top: ${i.top}%;left: ${i.left}%;`">
<div :class="i.isRight?`equipmentName1`:`equipmentName`"><span>设备名称</span></div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
hfData: [
{
top: 27.5,
isProd: false
},
{
top: 29.1,
isProd: false
},
{
top: 30.6,
isProd: false
},
{
top: 33.6,
isProd: false
},
{
top: 35.1,
isProd: false
},
{
top: 36.8,
isProd: false
},
{
top: 40.1,
isProd: false
},
{
top: 41.8,
isProd: false
},
{
top: 45.3,
isProd: true
},
{
top: 48.9,
isProd: true
},
{
top: 50.8,
isProd: false
},
{
top: 54.7,
isProd: false
},
{
top: 58.7,
isProd: false
},
{
top: 60.7,
isProd: false
},
{
top: 62.7,
isProd: false
},
{
top: 67.1,
isProd: false
},
],
isRun: [1, 2, 3, 4],
equipmentData: [
{
top: 25.5,
left: 8.4,
isRight: true
},
{
top: 50,
left: 5.5,
isRight: true
},
{
top: 29,
left: 62.5,
isRight: false
},
{
top: 49,
left: 64,
isRight: false
},
]
}
},
methods: {},
mounted() {
}
}
</script>
<style scoped lang="less">
.bg {
background-image: url("~@/assets/board/车间监控系统 - 04.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
width: 100%;
height: 100%;
}
.title1 {
position: absolute;
top: 1%;
left: 50%;
font-weight: 700;
letter-spacing: 0.1vw;
font-size: 2.1vw;
color: #fff;
transform: translateX(-50%);
}
.subTitle {
position: absolute;
top: 14%;
letter-spacing: 0.1vw;
font-size: 1.1vw;
color: #fff;
transform: translateX(-50%);
}
.floorNum {
background-size: 100% 100%;
background-repeat: no-repeat;
position: absolute;
top: 96.2%;
width: 4.6%;
height: 2.4%;
color: #fff6;
text-align: center;
line-height: 2.4vh;
font-size: 1.5vh;
}
.floorNum1 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 35.5%;
}
.floorNum2 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 39.9%;
}
.floorNum3 {
background-image: url("~@/assets/board/楼层-左背景.png");
left: 44.3%;
}
.floorNum4 {
background-image: url("~@/assets/board/楼层-右背景 选中.png");
left: 51%;
color: #fff;
}
.floorNum5 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 55.4%;
}
.floorNum6 {
background-image: url("~@/assets/board/楼层-右背景.png");
left: 59.8%;
}
@keyframes arrowAn1 {
from {
top: -100%;
}
to {
top: 100%;
}
}
.arrow, .arrow1 {
position: absolute;
width: 0.5%;
height: 2.5%;
overflow: hidden;
&::after {
content: "";
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-repeat: no-repeat;
background-size: 100% 100%;
animation-name: arrowAn1;
animation-duration: 2s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
}
.arrow {
&::after {
background-image: url("~@/assets/board/箭头 下.png");
}
}
.arrow1 {
&::after {
animation-direction: reverse;
background-image: url("~@/assets/board/箭头 上.png");
}
}
.box {
position: absolute;
background-image: url("~@/assets/board/货架.png");
background-repeat: no-repeat;
background-size: 100% 100%;
width: 1.2%;
height: 2.3%;
display: none;
}
.hf, .hf1 {
position: absolute;
left: 48%;
transform: translateX(-50%);
width: 30.6%;
height: 1%;
text-align: center;
font-size: 0.5vw;
line-height: 1vh;
&:hover .infoModel {
display: inline-block;
}
.infoModel {
position: absolute;
width: 14.1vw;
height: 14.7vh;
left: -10%;
top: -365%;
color: #fff;
display: none;
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗1-设备信息.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.title {
position: absolute;
top: 7%;
left: 7%;
font-size: 1vw;
letter-spacing: 3px;
}
.equipmentOutput {
color: #fff;
position: absolute;
top: 45%;
left: 7%;
font-size: 0.9vw;
letter-spacing: 3px;
}
.equipmentInfo {
color: #fff;
position: absolute;
top: 70%;
left: 7%;
font-size: 0.9vw;
letter-spacing: 3px;
}
//display: none;
}
}
.hf {
color: #000;
}
.hf1 {
color: #4e9b6d;
.inProd {
svg {
width: 0.4vw;
height: 0.4vw;
}
position: absolute;
left: 33%;
height: 100%;
top: 0%;
color: #fff;
padding: 0 0.2vw;
font-size: 0.4vw;
line-height: 1vh;
background-color: #559e70;
border-radius: 0.5vh;
}
}
.equipment {
position: absolute;
width: 25%;
height: 35%;
&:hover .equipmentName, &:hover .equipmentName1 {
display: inline-block;
}
.equipmentName, .equipmentName1 {
position: absolute;
width: 12.7vw;
height: 4.4vh;
display: none;
span {
position: absolute;
left: 5%;
line-height: 4.4vh;
color: #fff;
font-size: 0.9vw;
letter-spacing: 3px;
}
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url("~@/assets/board/弹窗2-名称.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
}
.equipmentName {
top: 4%;
left: -37%;
}
.equipmentName1 {
top: 9%;
left: 73%;
span {
text-align: right;
right: 5%;
}
&::before {
transform-style: preserve-3d;
transform: rotateY(180deg)
}
}
}
</style>

@ -77,7 +77,6 @@ export default {
height: 100%;
margin: 0 -5px;
.border-box-content {
padding: 20px;
box-sizing: border-box;

@ -161,7 +161,7 @@ export default {
justify-content: end;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-background.jpg");
background-image: url("../assets/images/login-background-none.jpg");
background-size: cover;
}
.title {

@ -13,7 +13,19 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:scrap:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-tabs type="border-card" @tab-click="handleTabClick">
<el-tab-pane label="当月产线产量汇总" >
<el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
@ -326,6 +338,12 @@ export default {
handleQuery() {
this.getList();
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/reportWork/getmonthProductionSut/export', {
...this.queryParams
}, `汇总报表_${new Date().getTime()}.xlsx`)
}
}
};

@ -313,7 +313,7 @@ export default {
data() {
return {
fenyeNumber:5,
fenyeNumberTwo:5,
fenyeNumberTwo:7,
shengchan:true,
newWorkerLoading: false,
refreshNewWorkerTable:true,
@ -595,14 +595,6 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
/**单选**/
handleCurrentChange(selection) {
this.ids = selection.prepareId
this.single = selection==null
this.selectPrepare = []
this.selectPrepare.push(selection)
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.prepareId)

@ -0,0 +1,34 @@
<template>
<div>
<!-- <u-action-sheet :actions="list" :title="title" :show="show"></u-action-sheet>-->
<!-- <u-button @click="show = true">打开ActionSheet</u-button>-->
<el-button>默认按钮</el-button>
</div>
</template>
<script>
export default {
data() {
return {
title:'标题',
list: [
{
name:'选项一',
subname:"选项一描述",
color:'#ffaa7f',
fontSize:'20'
},
{
name: '选项二禁用',
disabled:true
},
{
name: '开启load加载', //
loading:true
}
],
show: false
};
}
};
</script>

@ -76,6 +76,16 @@
v-hasPermi="['quality:inventoryReport:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-printer"
size="mini"
@click="showPrintX"
v-hasPermi="['quality:inventoryReport:export']"
>巡检记录</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -242,11 +252,66 @@
</div>
</el-dialog>
<!-- 打印预览弹出层 -->
<el-dialog
title="仓库质量巡查记录"
:visible.sync="printDialogVisible"
width="871px"
>
<div id="printFrom" class="my-print-box">
<el-form :model="form">
<!-- 主数据 -->
<div v-for="(item,index) in printData.workTable" :key="index">
<el-row>
<el-col :span="7">
<img src="@/assets/logo/lanjv.png" class="report-logo"/>
</el-col>
<el-col :span="10" class="center-text">
<h1>中山榄菊日化实业有限公司</h1>
</el-col>
</el-row>
<!-- 表头- -->
<el-row>
<el-col :offset="8" :span="8" class="center-text">
<h2>仓库质量巡查记录</h2>
</el-col>
</el-row>
<!-- 导航栏 -->
<el-row class="my-print-nav">
<el-col :span="6">巡检日期:{{printData.incomeTime}}</el-col>
<el-col :span="6">条数:{{printData.pageNo}}</el-col>
<el-col :span="6">编码:{{printData.fileNo}}</el-col>
</el-row>
<el-table v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table"
:data="item" border style="width: 100%;padding-bottom: 1px;">
<el-table-column label="序号" prop="xh" width="55"></el-table-column>
<el-table-column prop="materialName" label="产品/物料名称" width="120"></el-table-column>
<el-table-column prop="modelType" width="80" label="型号规格"></el-table-column>
<!--<el-table-column prop="workorderCode" width="105" label="生产订单" :formatter="orderCodeFormate"></el-table-column>-->
<el-table-column prop="incomeBatchNo" width="225" label="生产批号(日期)"></el-table-column>
<el-table-column prop="checkResult" label="质量状况(包括堆放是否合理)" width="190"></el-table-column>
<el-table-column prop="routeCode" width="140" label="处理方式"></el-table-column>
</el-table>
<!-- 底部 -->
<el-row class="my-print-foot">
<el-col :offset="1" :span="6">审核:</el-col>
<el-col :offset="1" :span="6">品管员:{{printData.checkManName}}</el-col>
</el-row>
<div class="fy" v-if="index!=printData.workTable.length-1"></div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handlePrint(printData)"> </el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { listInventory, getInventory, delInventory, addInventory, updateInventory,getCkeckProjectList} from "@/api/quality/inventoryReport";
import { listInventory, getInventory, delInventory, addInventory, updateInventory,getCkeckProjectList,printXJRecordList} from "@/api/quality/inventoryReport";
import { getCheckTypes } from "@/api/quality/qcProduce";
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
import moment from 'moment';
@ -344,7 +409,12 @@ export default {
/* incomeBatchNo: [
{ required: true, message: "库存批次号不能为空", trigger: "blur" }
], */
}
},
fenyeNumber:5,
fenyeNumberTwo:5,
shengchan:true,
newWorkerLoading: false,
refreshNewWorkerTable:true
};
},
created() {
@ -518,7 +588,6 @@ export default {
},
// -
handlePrint(params) {
console.log(this.form);
printJS({
printable: params.printable, // 'printFrom', // id
type: params.type || 'html',
@ -541,6 +610,54 @@ export default {
const foundDefect = this.defectList.find(defect => defect.defectCode === defectCode);
return foundDefect.defectSubclass;
},
//
showPrintX() {
var startQuery = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD');
var endQuery = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD');
if(this.queryParams.checkTimeArray.length<0){
this.$modal.msgError("检验时间筛选条件不能为空")
return
}
if(startQuery != endQuery){
this.$modal.msgError("检验时间筛选条件必须是同一天")
return
}
this.printData.workCenter = "暂无数据";
this.printData.printDate = null;
this.printData.workTable = [];
this.printData.factory = null;
this.printData.productDate = null;
this.printData.pageNo =0 ;
//
this.printDialogVisible = true;
this.newWorkerLoading = true // true
this.refreshNewWorkerTable = false // refreshProTablefalse
printXJRecordList(this.queryParams).then(response => {
this.showWorkorderCode = false;
this.printData.incomeTime = startQuery;
this.printData.fileNo = response[0].fileNo;
this.printData.checkManName = response[0].checkManName;
//this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
this.printData.workTable = response
this.printData.pageNo = response.length;
let chunkedArray = [];
// this.printData.workTable
for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
// 使slicei1010
let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
// chunkedArray
chunkedArray.push(chunk);
}
this.printData.workTable = chunkedArray;
this.refreshNewWorkerTable = true // refreshProTabletrue
this.newWorkerLoading = false // false
})
},
/**
* 1. 若是objectSpanMethod不返回任何东西表格不会变化
* 2. 最外层的判断一般是先从第几列开始合并
@ -587,7 +704,7 @@ export default {
};
}
}
}
},
};
</script>
<style scoped>
@ -617,4 +734,9 @@ export default {
border: 1px solid #d3dce6; /* 边框颜色可以根据需要自定义 */
text-align:center;
}
.my-print-head {
margin-top: 5px;
font-weight: bold;
text-align: center;
}
</style>

@ -43,6 +43,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportTable"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"></el-button>
</el-form-item>
</el-row>
@ -499,6 +500,11 @@ export default {
...this.queryParams
}, `incomeNoOkList_${new Date().getTime()}.xlsx`)
},
handleExportTable() {
this.download('quality/staticTable/exportIncomeTable', {
...this.queryParams
}, `LLList_${new Date().getTime()}.xlsx`)
},
}
};
</script>

@ -9,6 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="workorderCodeSap">
<el-input
v-model="queryParams.workorderCodeSap"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="任务编号" prop="checkNo">
<el-input
v-model="queryParams.checkNo"
@ -36,6 +36,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库编码" prop="supplierCode">
<el-input
v-model="queryParams.supplierCode"
placeholder="请输入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库名称" prop="supplierName">
<el-input
v-model="queryParams.supplierName"
placeholder="请输入仓库名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -203,12 +219,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="仓库名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
<el-input v-model="form.supplierName" placeholder="请选择仓库名称" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库编码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
<el-input v-model="form.supplierCode" placeholder="请输入仓库编码" disabled/>
</el-form-item>
</el-col>
</el-row>
@ -259,7 +275,7 @@ import ItemSelectProject from "../qcIncome/checkProjectType.vue";
import moment from 'moment';
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
export default {
name: "Inventory",
name: "QcInventory",
components: {ItemPutInOrder,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"],
data() {
@ -336,7 +352,7 @@ export default {
{ required: true, message: "单位不能为空", trigger: "blur" }
],
supplierName: [
{ required: true, message: "供应商不能为空", trigger: "blur" }
{ required: true, message: "仓库不能为空", trigger: "blur" }
],
incomeTime: [
{ required: true, message: "来料时间不能为空", trigger: "blur" }

@ -43,6 +43,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportTable"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"></el-button>
</el-form-item>
</el-form>
@ -495,6 +496,12 @@ export default {
handleExport() {
this.download('quality/staticTable/exportXJDetail', {
...this.queryParams
}, `XJDetialList_${new Date().getTime()}.xlsx`)
},
handleExportTable() {
this.download('quality/staticTable/exportXJTable', {
...this.queryParams
}, `XJList_${new Date().getTime()}.xlsx`)
},
}

@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编号" prop="materialCode">
<el-form-item label="产品编号/名称" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入产品编号"
placeholder="请输入产品编号/名称"
clearable
@keyup.enter.native="handleQuery"
/>

@ -47,6 +47,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!--
<el-form-item label="物料名称" prop="materialName">
<el-input

@ -43,6 +43,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportTable"></el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"></el-button>
</el-form-item>
</el-form>
@ -496,6 +497,11 @@ export default {
...this.queryParams
}, `scNoOkList_${new Date().getTime()}.xlsx`)
},
handleExportTable() {
this.download('quality/staticTable/exportSCTable', {
...this.queryParams
}, `SCList_${new Date().getTime()}.xlsx`)
},
}
};
</script>

@ -480,10 +480,13 @@ export default {
});
},
getCheckTypeList(val){
if(val != ""){
this.queryParams.checkType = null;
//
getCheckTypeList(val).then(response => {
this.checkTypeList = response
});
}
},
//
productCodeFormate(row, column, cellValue){

@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="出库单" prop="userDefined4">
<el-input v-model="queryParams.produceCode" placeholder="请输入出库单" clearable
<el-input v-model="queryParams.userDefined4" placeholder="请输入出库单" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生产订单" prop="produceCode">

@ -35,6 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.202.20:8080`,
target: `http://localhost:8080`,
// target: `http://192.168.3.93:8080`,
// target: `http://192.168.3.158:8080`,

Loading…
Cancel
Save