From 4ee759bd3226bb2f686c99b3d93e26b4128f07a4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 10 五月 2023 09:49:32 +0800
Subject: [PATCH] 1.物流检验报表提交
---
src/views/reportManager/logisticsCheck.vue | 179 +++++++++++++++++++++++++++++++-------------
src/views/produceManager/workOrderBatchClose.vue | 32 +++++++
src/views/kanbanManager/zhkb.vue | 3
src/router/index.js | 4
4 files changed, 159 insertions(+), 59 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 5141d87..cdcd9a5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -150,9 +150,9 @@
path: '/orderManager',
component: Layout,
redirect: '/orderManager/erpProduceOrder',
- name: '鐢熶骇绠＄悊',
+ name: '璁㈠崟绠＄悊',
code: '2004',
- meta: { code: '2004', title: '鐢熶骇绠＄悊', icon: 'production' },
+ meta: { code: '2004', title: '璁㈠崟绠＄悊', icon: 'production' },
alwaysShow: true,
children: [
{
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index 0abb904..ff39bfe 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -471,12 +471,13 @@
const timer = setInterval(() => {
startValue = startValue + scale
this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ nowLoop++ // 鏀惧湪杩欓噷鍙互浜嗭紝灏辩瓑寰呴浂鐐瑰嚑绉�
if (nowLoop === loop) {
clearInterval(timer)
this.getLeftBottomData()
}
- nowLoop++
+ // nowLoop++ //涔嬪墠鏀惧湪杩欓噷閫昏緫涓嶅锛岀浉宸簡涓�娆＄殑寰幆锛岀浉褰撲簬澶氱瓑寰呬簡10绉�
}, 1000 * 10)
})
},
diff --git a/src/views/produceManager/workOrderBatchClose.vue b/src/views/produceManager/workOrderBatchClose.vue
index cb0ad3a..6df9dc8 100644
--- a/src/views/produceManager/workOrderBatchClose.vue
+++ b/src/views/produceManager/workOrderBatchClose.vue
@@ -16,7 +16,22 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
- <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <!-- <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <el-select
+ v-model="form.mesorderstus"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="erporderstusChange"
+ >
+ <el-option
+ v-for="item in erporderstusArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -405,6 +420,17 @@
total: 10,
tableData: [],
+ erporderstusArr: [
+ { code: 'NEW', name: '鏂板伐鍗�' },
+ // { code: 'CREATING', name: '鎵ц涓�' },
+ // { code: 'CREATED', name: '宸插叧闂�' }
+ { code: 'ALLO', name: '宸叉淳鍙�' },
+ { code: 'START', name: '寮�宸�' },
+ { code: 'CLOSED', name: '瀹屽伐' },
+ { code: 'NOSCHED', name: '寰呮帓绋�' },
+ { code: 'SCHED', name: '宸叉帓绋�' }
+ ],
+
multipleSelection: [],
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
@@ -471,6 +497,10 @@
this.form.createdate = ''
this.getMesOrderBitchClosedSearch()
},
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
+ },
handleSelectionChange(val) {
this.multipleSelection = val
},
diff --git a/src/views/reportManager/logisticsCheck.vue b/src/views/reportManager/logisticsCheck.vue
index 8898259..52f5174 100644
--- a/src/views/reportManager/logisticsCheck.vue
+++ b/src/views/reportManager/logisticsCheck.vue
@@ -244,12 +244,6 @@
@click="edit('edit',row)"
/>
</el-tooltip>
- <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
- <!-- <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
- <!-- </el-tooltip>-->
- <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
- <!-- <i class="el-icon-delete" @click="del(row)" />-->
- <!-- </el-tooltip>-->
</div>
</template>
</el-table-column>
@@ -272,7 +266,7 @@
v-el-drag-dialog
:title="operation==='add'?'鏂板':'妫�楠屾槑缁�'"
:visible.sync="dialogVisible"
- width="800px"
+ width="1100px"
:close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@@ -292,73 +286,125 @@
:cell-style="this.$cellStyle"
>
<el-table-column
- type="index"
+ prop="checkitem_seq"
width="50"
fixed
label="搴忓彿"
/>
<el-table-column
- prop="stepcheckitem_code"
- width="150"
+ prop="checkitem_name"
+ min-width="120"
+ fixed
+ show-tooltip-when-overflow
label="妫�楠岄」鐩�"
- >
- <template slot-scope="{row}">
- <el-select
- v-if="row.isVisible===1"
- v-model="row.stepcheckitem_code"
- filterable
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <!-- @change="val=>tableChange(val,row)"-->
- <el-option
- v-for="item in CheckItemSelectArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div v-else>{{
- CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code).name
- }}
- </div>
- </template>
- </el-table-column>
+ />
<el-table-column
- prop="stepcheckitem_desc"
+ prop="standvalue"
label="鏍囧噯瑕佹眰"
+ fixed
+ min-width="120"
show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <el-input
- v-if="row.isVisible===1"
- v-model="row.stepcheckitem_desc"
- placeholder="璇疯緭鍏�"
- />
- <div v-else>{{ row.stepcheckitem_desc ? row.stepcheckitem_desc : '/' }}</div>
+ <!-- ~褰撲笁涓�奸兘鏈� -->
+ <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue">{{ row.standvalue }}({{
+ row.lowervalue
+ }}~{{ row.uppervalue }})
+ </div>
+ <!-- ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂 -->
+ <div v-else-if="row.standvalue&&row.uppervalue">{{ row.standvalue }}(~{{ row.uppervalue }})</div>
+ <!-- ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂-->
+ <div v-else-if="row.standvalue&&row.lowervalue">{{ row.standvalue }}({{ row.lowervalue }}~)</div>
+
+ <!-- ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂-->
+ <div v-else-if="row.uppervalue&&row.lowervalue">({{ row.lowervalue }}~{{ row.uppervalue }})</div>
+ <!-- ~褰撳彧鏈夋爣鍑嗗�兼椂 -->
+ <div v-else-if="row.standvalue">{{ row.standvalue }}</div>
+ <!-- ~褰撳彧鏈変笂闄愬�兼椂 -->
+ <div v-else-if="row.uppervalue">(~{{ row.uppervalue }})</div>
+ <!-- ~褰撳彧鏈変笅闄愬�兼椂 -->
+ <div v-else-if="row.lowervalue">({{ row.lowervalue }}~)</div>
+
+ <div v-else>/</div>
+
</template>
</el-table-column>
-
- <!-- 杩欓噷鍐檉or寰幆閬嶅巻璇彞-->
<el-table-column
- v-if="operation!=='check'"
- label="鎿嶄綔"
- width="120"
- fixed="right"
+ v-for="(item,index) in dialogTableArrayCol"
+ :key="index+dialogTableData"
+ :prop="(index+1)+'/'+ dialogTableNumberCol"
+ :label="'绗�'+(index+1)+'浠�'"
+ show-tooltip-when-overflow
+ min-width="100"
>
<template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">纭</el-button>
- <el-button v-if="row.isVisible===1&&isCancel" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷
- </el-button>
- <el-button v-if="row.isVisible!==1" v-waves type="text" @click="editZjlbRow(row)">缂栬緫</el-button>
- <el-button v-if="row.isVisible!==1" v-waves type="text" @click="delZjlbRow(row)">鍒犻櫎</el-button>
+
+ <!-- ~褰撲笁涓�奸兘鏈� -->
+ <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
+ <!-- <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">-->
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
</div>
+
+ <!-- ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂 -->
+ <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+ <!-- ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂-->
+ <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+
+ <!-- ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂-->
+ <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+ <!-- ~褰撳彧鏈夋爣鍑嗗�兼椂 -->
+ <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+ <!-- ~褰撳彧鏈変笂闄愬�兼椂 -->
+ <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+
+ <!-- ~褰撳彧鏈変笅闄愬�兼椂 -->
+ <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div></div>
+
+ <div v-else>
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-error" style="color: red;margin-right: 2px" />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+ </div>
+
</template>
</el-table-column>
+
</el-table>
<span slot="footer" class="dialog-footer">
@@ -379,7 +425,7 @@
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
import {
- MaintenanceDetailsReportExcelSearch, LogisticsCheckSearch
+ MaintenanceDetailsReportExcelSearch, LogisticsCheckSearch, LogisticsCheckSubSearch
} from '@/api/reportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
@@ -426,7 +472,9 @@
dialogVisible: false,
operation: '',
- dialogTableData: []
+ dialogTableData: [],
+ dialogTableNumberCol: 0, // 瀵硅瘽妗嗗姩鎬佺殑鍒楁暟
+ dialogTableArrayCol: []// 瀵硅瘽妗嗗姩鎬佺殑鏁扮粍
}
},
@@ -540,10 +588,30 @@
async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
+ const { data: res } = await LogisticsCheckSubSearch({ checkid: row.id })
+ this.dialogTableData = res
+
+ this.dialogTableData.forEach((item, index) => {
+ for (const it in item) {
+ if (it.indexOf('/') !== -1) {
+ const i = it.split('/')[1]
+ this.dialogTableNumberCol = i
+ }
+ }
+ })
+
+ this.dialogTableArrayCol = []
+ for (let i = 0; i < this.dialogTableNumberCol; i++) {
+ this.dialogTableArrayCol.push(i)
+ }
+
+ this.$nextTick(() => {
+ this.$refs.tableDataRef2.doLayout()
+ })
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
-
+ this.dialogTableData = []
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -655,6 +723,7 @@
::v-deep .el-table__body-wrapper {
background-color: #f8f8fa;
+ z-index:2
}
::v-deep .el-table__body .el-table__row.hover-row td {
--
Gitblit v1.9.3