From c4cbb29fd3dd2f43da4f9af9967936edb86d1dcc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 30 五月 2023 08:07:45 +0800
Subject: [PATCH] 1.生产入库实现30%
---
src/views/reportManager/logisticsCheck.vue | 118 +++--
src/views/produceManager/produceStartOrder.vue | 2
src/api/produceManager.js | 27 +
src/views/produceManager/productWarehouse.vue | 727 ++++++++++++++++++++++++++++++++++++++
src/views/qualityManager/processCheckRecord.vue | 206 +++++++---
src/router/index.js | 6
6 files changed, 972 insertions(+), 114 deletions(-)
diff --git a/src/api/produceManager.js b/src/api/produceManager.js
index 99d8ad9..78317fb 100644
--- a/src/api/produceManager.js
+++ b/src/api/produceManager.js
@@ -417,3 +417,30 @@
params: data
})
}
+
+// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+export function ProductInHouseOrderSearch(data) {
+ return request({
+ url: 'ProductionManagement/ProductInHouseOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+export function ProductInHouseOrderCodeSearch(data) {
+ return request({
+ url: 'ProductionManagement/ProductInHouseOrderCodeSearch',
+ method: 'post',
+ data
+ })
+}
+
+// 鎻愪氦
+export function ProductInHouseOrderSeave(data) {
+ return request({
+ url: 'ProductionManagement/ProductInHouseOrderSeave',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index dc81908..60e4598 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1096,6 +1096,12 @@
code: '1076',
component: () => import('@/views/produceManager/AutoScheduling'),
meta: { code: '1076', title: '鑷姩鎺掔▼', icon: '', keepAlive: true }
+ }, {
+ path: 'productWarehouse',
+ name: 'productWarehouseCancel',
+ code: '1077',
+ component: () => import('@/views/produceManager/productWarehouse'),
+ meta: { code: '1077', title: '鐢熶骇鍏ュ簱', icon: '', keepAlive: true }
}
]
},
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index deb0418..a500e1d 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -2170,7 +2170,7 @@
// 褰撲负鏈亾鐨勬椂鍊�
if (this.dialogForm.nextstepcode === '') {
const D = {
- rightcode: '2064',
+ rightcode: '1078',
partcode: this.dialogForm.partcode,
qty: this.dialogForm.sqty,
onelabqty: this.dialogForm.sqty
diff --git a/src/views/produceManager/productWarehouse.vue b/src/views/produceManager/productWarehouse.vue
new file mode 100644
index 0000000..c245cd1
--- /dev/null
+++ b/src/views/produceManager/productWarehouse.vue
@@ -0,0 +1,727 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <!-- <div class="bodyTopButtonGroup" style="justify-content: space-between">-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ <!-- </div>-->
+
+ <div
+ class="bodyTopFormGroup"
+ style="margin-top: 10px"
+ :style="{height:(mainHeight-20)+'px'}"
+ >
+ <div style="display: flex;align-items: center">
+ <i
+ class="el-icon-s-operation"
+ :style="{color:$store.state.settings.theme,fontSize:'14px'}"
+ />
+ <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
+ 鏌ヨ椤�
+ </div>
+ </div>
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm" style="display: flex;flex-direction: column">
+ <div style="display: flex">
+ <el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
+ <el-select
+ v-model="form.documentType"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="getProductInHouseOrderSearch"
+ >
+ <el-option
+ v-for="item in documentTypeArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="form.documentType==='Y'"
+ label="鐢熶骇璁㈠崟"
+ style=" display: flex;"
+ >
+ <el-input
+ v-model="form.erpordercode"
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ @input="getProductInHouseOrderSearch"
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇宸ュ崟" style=" display: flex;">
+ <el-input
+ v-model="form.mesordercode"
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ @input="getProductInHouseOrderSearch"
+ />
+ </el-form-item>
+ <el-form-item
+ v-if="form.documentType==='Y'"
+ label="閿�鍞鍗�"
+ style="display: flex;"
+ >
+ <el-input v-model="form.saleOrderCode" placeholder="璇疯緭鍏�" style="width: 200px" @input="getProductInHouseOrderSearch" />
+ </el-form-item>
+ </div>
+
+ <div style="display: flex">
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item
+ label="宸ュ崟鏃ユ湡"
+ style=" display: flex;font-size: 14px;margin-top: 3px;margin-bottom: -3px"
+ >
+ <el-date-picker
+ v-model="form.paystartdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ </el-form-item>
+ </div>
+
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <!-- <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>-->
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+
+ <div style="display: flex;align-items: center">
+ <i
+ class="el-icon-s-operation"
+ :style="{color:$store.state.settings.theme,fontSize:'14px'}"
+ />
+ <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
+ 閫夋嫨椤�
+ </div>
+ </div>
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="鍗曟嵁鏃ユ湡" style=" display: flex;">
+ <el-date-picker
+ v-model="form.lm_date"
+ style="width: 200px"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ /> </el-form-item>
+ <el-form-item label="鍗曟嵁缂栧彿" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select> </el-form-item>
+ <el-form-item label="鍏ュ簱浠撳簱" style=" display: flex;">
+ <el-select
+ v-model="form.stockcode"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in stockcodeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ </div>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-s-promotion" @click="search">鍏ュ簱鎻愪氦</el-button>
+ <!-- <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>-->
+ </div>
+ </el-form>
+ <div style="display: flex;align-items: center">
+ <i
+ class="el-icon-s-operation"
+ :style="{color:$store.state.settings.theme,fontSize:'14px'}"
+ />
+ <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
+ 淇℃伅鏍�
+ </div>
+ </div>
+ <div style="padding:0 10px;position: relative">
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- style="position: absolute;right: 10px;top: 10px;z-index: 10"-->
+ <!-- icon="el-icon-s-promotion"-->
+ <!-- @click=""-->
+ <!-- >鍏ュ簱鎻愪氦-->
+ <!-- </el-button>-->
+ <el-tabs style="margin-top: 10px;">
+ <el-tab-pane label="鏄庣粏">
+ <div class="elTableDiv" style="margin: 0 auto 10px;">
+ <el-table
+ v-show="form.documentType==='Y'"
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableDataDetail"
+ :height="(tableHeight-25)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column
+ type="selection"
+ width="50"
+ fixed
+ />
+ <el-table-column
+ type="index"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+
+ <el-table-column
+ prop="stockname"
+ label="浠撳簱"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stockname">{{ row.stockname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="inbarcode"
+ label="鍏ュ簱鏉＄爜"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="m_po"
+ label="璁㈠崟缂栧彿"
+ width="160"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.m_po">{{ row.m_po }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stockname">{{ row.stockname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="qty"
+ label="璁㈠崟鏁伴噺"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.qty">{{ row.qty }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_qty"
+ label="宸ュ崟鏁伴噺"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="inhouseqty"
+ label="宸插叆搴撴暟閲�"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="stinhouseqty"
+ label="鍙叆搴撴暟閲�"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ </el-table>
+ <el-table
+ v-show="form.documentType==='N'"
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableDataDetail"
+ :height="(tableHeight-25)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column
+ type="selection"
+ width="50"
+ fixed
+ />
+ <el-table-column
+ type="index"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+
+ <el-table-column
+ prop="stockname"
+ label="浠撳簱"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stockname">{{ row.stockname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="inbarcode"
+ label="鍏ュ簱鏉＄爜"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <!-- <el-table-column-->
+ <!-- prop="m_po"-->
+ <!-- label="璁㈠崟缂栧彿"-->
+ <!-- width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.m_po">{{ row.m_po }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stockname">{{ row.stockname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <!-- <el-table-column-->
+ <!-- prop="qty"-->
+ <!-- label="璁㈠崟鏁伴噺"-->
+ <!-- min-width="95"-->
+ <!-- fixed="right"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.qty">{{ row.qty }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column
+ prop="plan_qty"
+ label="宸ュ崟鏁伴噺"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="inhouseqty"
+ label="宸插叆搴撴暟閲�"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="stinhouseqty"
+ label="鍙叆搴撴暟閲�"
+ min-width="95"
+ fixed="right"
+ show-tooltip-when-overflow
+ />
+ </el-table>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="姹囨��">姹囨��</el-tab-pane>
+ </el-tabs>
+ </div>
+
+ </div>
+
+ </div>
+
+ </div>
+</template>
+
+<script>
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { WareHouseSelect } from '@/api/materialManager'
+import { ProductInHouseOrderSearch } from '@/api/produceManager'
+import { handleDatetime } from '@/utils/global'
+import { WorkShopSelect } from '@/api/deviceManager'
+
+export default {
+ name: 'Zzjg',
+ components: {},
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ documentType: 'Y', // 鍗曟嵁绫诲瀷
+
+ erpordercode: '', // 璁㈠崟缂栧彿
+ mesordercode: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 瑙勬牸鍨嬪彿
+ orderdate: '', // 宸ュ崟鏃ユ湡
+
+ saleOrderCode: '', // 閿�鍞鍗�
+ WorkShop: '', // 鐢熶骇杞﹂棿
+ lm_date: '', // 鍗曟嵁鏃ユ湡
+ stockcode: '', // 鍏ュ簱浠撳簱
+ xxx: ''
+ },
+ documentTypeArr: [
+ { label: '鏈夋簮鍗�', value: 'Y' },
+ { label: '鏃犳簮鍗�', value: 'N' }
+ ],
+ tableDataDetail: [],
+ multipleSelection: [],
+ stockcodeArr: [], // 鍏ュ簱浠撳簱鏁扮粍
+ WorkShopArr: [], // 鐢熶骇杞﹂棿鏁扮粍
+
+ xxx: ''
+
+ }
+ },
+ watch: {},
+ created() {
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ handleRequest() {
+ this.getProductInHouseOrderSearch().then(res => {
+ if (res.code === '200') {
+ this.getWareHouseSelect()
+ this.getWorkShopSelect()
+ }
+ })
+ },
+ async getProductInHouseOrderSearch() {
+ let tempDate = this.form.orderdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
+ mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
+ partcode: this.form.partcode, // 浜у搧缂栫爜
+ partname: this.form.partname, // 浜у搧鍚嶇О
+ partspec: this.form.partspec, // 瑙勬牸鍨嬪彿
+ orderdate: tempDate// 宸ュ崟鏃ユ湡
+ }
+ const res = await ProductInHouseOrderSearch(data)
+ // this.tableDataDetail = res.data
+
+ // 鏍规嵁鍘熷崟鍋氳繃婊�
+ this.tableDataDetail = res.data.filter(i => this.form.documentType === 'Y' ? i.m_po : !i.m_po)
+
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ })
+ return { code: res.code }
+ },
+ // 鑾峰彇浠撳簱鎺ュ彛
+ async getWareHouseSelect() {
+ const { data: res } = await WareHouseSelect()
+ this.stockcodeArr = res
+ },
+ // 鑾峰彇鎵�灞炶溅闂�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
+
+ // 閲嶇疆
+ reset() {
+ this.form.OrgCode = ''
+ this.form.OrgName = ''
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getOrganizationSearch()
+ },
+
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ },
+
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 255
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+
+::v-deep .el-tabs__item {
+ padding-right: 0;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/qualityManager/processCheckRecord.vue b/src/views/qualityManager/processCheckRecord.vue
index 5a437c8..f869827 100644
--- a/src/views/qualityManager/processCheckRecord.vue
+++ b/src/views/qualityManager/processCheckRecord.vue
@@ -178,6 +178,7 @@
>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef2"
:data="tableDataDialog"
:height="(tableHeight-100)+'px'"
border
@@ -199,63 +200,135 @@
fixed
/>
- <el-table-column
- prop="checkitem_code"
- show-tooltip-when-overflow
- label="妫�楠岄」鐩紪鍙�"
- width="120"
- />
+ <!-- <el-table-column-->
+ <!-- prop="checkitem_code"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="妫�楠岄」鐩紪鍙�"-->
+ <!-- width="120"-->
+ <!-- />-->
<el-table-column
prop="checkitem_name"
label="妫�楠岄」鐩悕绉�"
+ fixed
show-tooltip-when-overflow
- />
- <el-table-column
- prop="checkitem_descr"
- label="妫�楠岄」鐩弿杩�"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="check_result"
- label="妫�楠岀粨鏋�"
- show-tooltip-when-overflow
- width="120"
- >
- <template slot-scope="{row}">
- <div v-if="row.check_result==='NG'">
- <i class="el-icon-info" style="margin-right: 2px" />
- 涓嶈壇
- </div>
- <div v-if="row.check_result==='OK'">
- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 鍚堟牸
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="妫�楠屼汉鍛�"
- show-tooltip-when-overflow
- width="120"
- />
- <el-table-column
- prop="lm_date"
- label="妫�楠屾椂闂�"
- show-tooltip-when-overflow
- width="160"
/>
<!-- <el-table-column-->
- <!-- label="鎿嶄綔"-->
- <!-- fixed="right"-->
- <!-- width="120"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="operationClass">-->
- <!-- <el-button v-waves type="text" @click="check(row)">鏌ョ湅</el-button>-->
- <!-- <!– <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>–>-->
- <!-- </div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <!-- prop="checkitem_descr"-->
+ <!-- label="妫�楠岄」鐩弿杩�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <el-table-column
+ prop="standvalue"
+ label="鏍囧噯瑕佹眰"
+ fixed
+ min-width="120"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <!-- ~褰撲笁涓�奸兘鏈� -->
+ <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>
+
+ <el-table-column
+ v-for="(item,index) in dialogTableArrayCol"
+ :key="item"
+ :prop="(index+1)+'/'+ dialogTableNumberCol"
+ :label="'绗�'+(index+1)+'浠�'"
+ show-tooltip-when-overflow
+ min-width="100"
+ >
+ <template slot-scope="{row}">
+ <div style="display: flex;align-items: center">
+ <i
+ :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
+ :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
+ style="margin-right: 2px"
+ />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+ </div>
+
+ <!-- <!– ~褰撲笁涓�奸兘鏈� –>-->
+ <!-- <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>
</div>
<span slot="footer" class="dialog-footer">
@@ -471,7 +544,9 @@
tableDataDialog: [],
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
- shows: false
+ shows: false,
+ dialogTableNumberCol: 0, // 瀵硅瘽妗嗗姩鎬佺殑鍒楁暟
+ dialogTableArrayCol: []// 瀵硅瘽妗嗗姩鎬佺殑鏁扮粍
}
},
@@ -542,10 +617,29 @@
async check(row) {
// this.operation = operation
+
+ this.dialogVisible = true
console.log(row, 1)
const res = await StepCheckTableSubSearch({ id: row.id })
this.tableDataDialog = res.data
- this.dialogVisible = true
+
+ this.tableDataDialog.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()
+ })
},
// 鏂板鎸夐挳
@@ -586,11 +680,7 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
+ this.tableDataDialog = []
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
diff --git a/src/views/reportManager/logisticsCheck.vue b/src/views/reportManager/logisticsCheck.vue
index 52f5174..d733d02 100644
--- a/src/views/reportManager/logisticsCheck.vue
+++ b/src/views/reportManager/logisticsCheck.vue
@@ -341,66 +341,74 @@
min-width="100"
>
<template slot-scope="{row}">
-
- <!-- ~褰撲笁涓�奸兘鏈� -->
- <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 style="display: flex;align-items: center">
+ <i
+ :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
+ :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
+ style="margin-right: 2px"
+ />
+ {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
</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-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.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.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.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-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>
- <div style="display: flex;align-items: center">
- <i class="el-icon-error" style="color: red;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>
--
Gitblit v1.9.3