From d7c86ef866b5443c9f1408d64cd2ac511b262e92 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 23 十二月 2025 12:45:17 +0800
Subject: [PATCH] 1.sop 平板端的 初步实现
---
src/permission.js | 2
src/views/sopManager/sopRoute.vue | 3
src/api/SopManager.js | 26 ++
src/views/systemHome/index.vue | 21 -
src/router/index.js | 5
src/views/sopManager/sop.vue | 660 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/views/workOrder/workOrderList.vue | 54 +--
7 files changed, 713 insertions(+), 58 deletions(-)
diff --git a/src/api/SopManager.js b/src/api/SopManager.js
index 0209670..1a1656b 100644
--- a/src/api/SopManager.js
+++ b/src/api/SopManager.js
@@ -99,3 +99,29 @@
})
}
+// MES宸ュ崟鏌ヨ
+export function SopSearchMesOrderSearch(data) {
+ return request({
+ url: 'SopSearch/MesOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES宸ュ崟缂栬緫鑾峰彇宸ュ簭鏁版嵁
+export function SopSearchUpdateMesOrderStepSearch(data) {
+ return request({
+ url: 'SopSearch/UpdateMesOrderStepSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES宸ュ崟鏌ョ湅宸ヨ壓SOP
+export function SopSearchMesOrderProcessSopSearch(data) {
+ return request({
+ url: 'SopSearch/MesOrderProcessSopSearch',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/permission.js b/src/permission.js
index 110ebfb..e092db5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/login', '/zhkb', '/cj', '/ckgl'] // no redirect whitelist
+const whiteList = ['/login', '/zhkb', '/cj', '/ckgl', '/sop'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index a8aa4a4..9b82fe3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,6 +48,11 @@
component: () => import('@/views/kanbanManager/ckgl'),
hidden: true
},
+ {
+ path: '/sop',
+ component: () => import('@/views/sopManager/sop'),
+ hidden: true
+ },
{
path: '/login',
diff --git a/src/views/sopManager/sop.vue b/src/views/sopManager/sop.vue
new file mode 100644
index 0000000..284fd4d
--- /dev/null
+++ b/src/views/sopManager/sop.vue
@@ -0,0 +1,660 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+
+ <div class="headTitle">
+ 娴欐睙浼樻浣撹偛鐢ㄥ搧鑲′唤鏈夐檺鍏徃宸ュ簭SOP
+ </div>
+
+ <div class="bodyTopFormGroup" style="margin-top: 0px;">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
+ <el-select
+ v-model="form.mesorderstus"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <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" />
+ </el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
+ <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="閿�鍞鍗�" style="display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="form.ordertype"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in ordertypeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <DateType
+ ref="DateTypeRef"
+ :is-expand-form="isExpandForm"
+ style="display:flex;justify-content: center;align-items: center;position: relative"
+ :datatype-list="datatypeList"
+ @DateTypeChange="DateTypeChange"
+ @cycleTimeChange="cycleTimeChange"
+ />
+ </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="getMesOrderSearch">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ @row-click="rowClick"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="80"
+ label="搴忓彿"
+ fixed
+ />
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="m_po"
+ label="婧愬崟鍗曞彿"
+ sortable="custom"
+ 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="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+
+ label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ sortable="custom"
+
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="route_name"
+ label="宸ヨ壓璺嚎"
+ sortable="custom"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.route_name">{{ row.route_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="plan_qty"
+ label="宸ュ崟鏁�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ />
+
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getMesOrderSearch"
+ />
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef2"
+ :data="tableDataDetail"
+ border
+ height="310px"
+ :row-class-name="tableRowClassName"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ width="50"
+ type="index"
+ prop="搴忓彿"
+ fixed
+ />
+
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- label="浜у搧缂栫爜"-->
+ <!-- width="150"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partname"-->
+ <!-- label="浜у搧鍚嶇О"-->
+ <!-- width="200"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+
+ <el-table-column
+ label="宸ュ簭缂栫爜"
+ prop="step_code"
+ show-tooltip-when-overflow
+ width="150"
+ />
+ <el-table-column
+ label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
+ prop="stepname"
+ width="150"
+ />
+
+ <el-table-column
+ label="宸茬敓浜ф暟閲�"
+ show-tooltip-when-overflow
+ prop="produceq_qty"
+ />
+ <el-table-column
+ label="鍚堟牸鏁伴噺"
+ show-tooltip-when-overflow
+ prop="good_qty"
+ />
+ <el-table-column
+ label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
+ prop="ng_qty"
+ />
+ <el-table-column
+ label="宸ュ簾鏁伴噺"
+ show-tooltip-when-overflow
+ prop="laborbad_qty"
+ />
+ <el-table-column
+ label="鏂欏簾鏁伴噺"
+ show-tooltip-when-overflow
+ prop="materielbad_qty"
+ />
+ <el-table-column
+ label="鎬诲彲鎶ユ暟閲�"
+ show-tooltip-when-overflow
+ prop="plan_qty"
+ />
+ <el-table-column
+ label="寰呬骇鏁伴噺"
+ show-tooltip-when-overflow
+ prop="delive_qty"
+ />
+ <el-table-column
+ label="sop棰勮"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="SOP棰勮" placement="top">
+ <i
+ class="el-icon-files"
+ style="cursor: pointer;color:#42b983;margin-right: 15px"
+ @click="view(row)"
+ />
+ </el-tooltip>
+
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ <!-- sop-->
+ <el-dialog
+ title="娴欐睙浼樻浣撹偛鐢ㄥ搧鑲′唤鏈夐檺鍏徃SOP棰勮"
+ :visible.sync="SopDialogVisible"
+ fullscreen
+ :close-on-click-modal="false"
+ @closed="handleSopClose"
+ @close="handleSopClose"
+ >
+
+ <el-form inline label-width="110px" style="display:flex">
+
+ <el-form-item label="宸ュ崟鍙�">
+ <el-input v-model="rowData.wo_code" disabled style="width: 200px" />
+ </el-form-item>
+
+ <el-form-item label="浜у搧鍚嶇О">
+ <el-input v-model="rowData.partname" disabled style="width: 200px" />
+ </el-form-item>
+
+ <el-form-item label="宸ュ簭SOP">
+ <el-select
+ v-model="dialogSopForm.sop"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="sopChange"
+ >
+ <el-option
+ v-for="item in sopArr"
+ :key="item.filepath"
+ :label="item.filename"
+ :value="item.filepath"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="Sop鐗堟湰">
+ <el-input v-model="dialogSopForm.v" disabled style="width: 200px" />
+ </el-form-item>
+ </el-form>
+
+ <div style="border: 5px solid #ccc;">
+ <iframe
+ :src="baseUrl+dialogSopForm.sop"
+ style="width: 100%;height: 80vh"
+ frameborder="0"
+ />
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves style="width: 100px;" type="primary" @click="handleSopClose">杩� 鍥�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+import DateType from '@/components/DateType'
+import {
+ SopSearchMesOrderProcessSopSearch,
+ SopSearchMesOrderSearch,
+ SopSearchUpdateMesOrderStepSearch
+} from '@/api/SopManager'
+
+export default {
+ name: 'WorkOrderList',
+ components: {
+ Pagination, DateType
+ },
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mouseHoverType: 'mouseout',
+ mouseHoverTypeDialog: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ mesorderstus: '', // 宸ュ崟鐘舵�佺爜
+ mesordercode: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ ordertype: '', // ordertype
+ sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗�
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ creatuser: '', // 鍒涘缓浜哄憳
+ // createdate: '', // 鍒涘缓鏃堕棿
+ datatype: 'ED', // 鏃ユ湡绫诲瀷(璁″垝寮�宸�(PS)銆佽鍒掑畬宸�(PE)銆侀璁′氦浠�(ED)銆佸垱寤烘棩鏈�(CT))
+ timeValue: [], // 鏌ヨ鏃ユ湡
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ 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: '宸叉帓绋�' }
+ ],
+ wkshopcodeArr: [],
+ total: 10,
+ tableData: [],
+ ordertypeArr: [// 宸ュ崟绫诲瀷
+ { code: 'PO', name: '鏍囧噯宸ュ崟' },
+ { code: 'FO', name: '鎶ュ簾琛ュ崟' }
+ ],
+ datatypeList: [
+ { code: 'PS', name: '棰勮寮�宸ユ棩鏈�' },
+ { code: 'PE', name: '棰勮瀹屽伐鏃ユ湡' },
+ { code: 'ED', name: '棰勮浜や粯鏃ユ湡' },
+ { code: 'CT', name: '宸ュ崟鍒涘缓鏃ユ湡' }
+ ],
+ tableDataDetail: [],
+ rowData: {}, // 琛岀偣鍑讳簨浠跺瓨鍌ㄥ��
+ SopDialogVisible: false,
+ dialogSopForm: { // 璁惧SOP琛ㄥ崟
+ sop: '',
+ v: ''
+ },
+ sopArr: [],
+ baseUrl: process.env.VUE_APP_BASE_API_FILE
+
+ }
+ },
+ activated() {
+ window.addEventListener('resize', this.getHeight)
+
+ this.getHeight()
+ this.handleRequest()
+ },
+ created() {
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ // 寮瑰嚭妗嗗叧闂�
+ handleSopClose() {
+ this.SopDialogVisible = false
+ this.dialogSopForm = { // 璁惧SOP琛ㄥ崟
+ sop: '',
+ v: ''
+ }
+ },
+ sopChange(val) {
+ this.dialogSopForm.v = this.sopArr.find(i => i.filepath === val).version
+ },
+ async view(row) {
+ const data = {
+ materielcode: this.rowData.partcode,
+ routecode: this.rowData.route_code,
+ stepcode: row.step_code
+ }
+ const { data: res } = await SopSearchMesOrderProcessSopSearch(data)
+ console.log(res)
+ if (res.length === 0) {
+ return this.$message.error('姝ゅ伐搴忔湭涓婁紶sop锛岃鍏堜笂浼�!')
+ }
+ this.sopArr = res
+ this.dialogSopForm.sop = res[0].filepath
+ this.dialogSopForm.v = res[0].version
+ this.SopDialogVisible = true
+ },
+
+ DateTypeChange(value) {
+ this.form.datatype = value
+ },
+ cycleTimeChange(val) {
+ this.form.timeValue = val
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
+ handleRequest() {
+ this.getMesOrderSearch().then(res => {
+ if (res.code === '200') {
+ this.getPrentOrganizationNoCompany()
+ }
+ })
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
+ async getMesOrderSearch() {
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
+
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
+ mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
+ partcode: this.form.partcode, // 浜у搧缂栫爜
+ partname: this.form.partname, // 浜у搧鍚嶇О
+ partspec: this.form.partspec, // 浜у搧瑙勬牸
+ creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
+ ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
+ datatype: this.form.datatype,
+ searchdate: this.form.timeValue.join('~'),
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
+ }
+ const res = await SopSearchMesOrderSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+
+ // this.form.createdate = tempDate
+ return { code: res.code }
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getMesOrderSearch()
+ },
+ // 閲嶇疆
+ reset(val) {
+ this.form.wkshopcode = ''
+ this.form.mesorderstus = ''
+ this.form.mesordercode = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.paydate = ''
+ this.form.creatuser = ''
+ this.form.sourceorder = ''
+ this.form.ordertype = ''
+ // this.form.createdate = ''
+
+ this.form.timeValue = []
+ this.cycleTime = null
+ this.$refs.DateTypeRef.clearValue()
+
+ this.getMesOrderSearch()
+ },
+
+ // 琛岀偣鍑讳簨浠�
+ async rowClick(row, event, column) {
+ this.rowData = row
+ const data = {
+ sourceid: row.sourceid,
+ sourcewo: row.m_po,
+ wocode: row.wo_code,
+ data_sources: row.data_sources
+ }
+ const { data: res } = await SopSearchUpdateMesOrderStepSearch(data)
+ this.tableDataDetail = res.stepdata
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight
+ this.tableHeight = this.mainHeight - 600
+ this.$refs.tableDataRef.doLayout()
+ this.$refs.tableDataRef2.doLayout()
+ })
+ }
+ }
+}
+
+</script>
+
+<style scoped lang="scss">
+.footerButton{
+ position: absolute;
+ bottom: 15px;
+ margin-left: calc(50% - 50px);
+}
+
+::v-deep .el-dialog__body{
+ padding: 0 20px !important;
+}
+
+.headTitle{
+ height: 70px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 36px;
+ font-weight: bolder;
+ font-family: Arial;
+ //font-family: "Avenir", Helvetica, Arial, sans-serif;
+
+}
+</style>
diff --git a/src/views/sopManager/sopRoute.vue b/src/views/sopManager/sopRoute.vue
index 327c0f1..1736b34 100644
--- a/src/views/sopManager/sopRoute.vue
+++ b/src/views/sopManager/sopRoute.vue
@@ -279,9 +279,8 @@
:on-exceed="handleExceed"
:auto-upload="false"
:multiple="false"
- accept=".mp4,.pdf,.png,.jpeg,.jpg,.svg,.txt,.xlsx,.xls"
+ accept=".mp4,.pdf,.png,.jpeg,.jpg"
>
- <!-- accept=".mp4,.pdf"-->
<el-button
v-waves
type="primary"
diff --git a/src/views/systemHome/index.vue b/src/views/systemHome/index.vue
index afb40ef..952fe03 100644
--- a/src/views/systemHome/index.vue
+++ b/src/views/systemHome/index.vue
@@ -284,20 +284,7 @@
<div slot="header" class="clearfix">
搴撳瓨淇℃伅
</div>
-
- <el-tabs
- style="height: 420px;width: 100%;"
- type="card"
- @tab-click="getHomeIndexBottomSearch"
- >
- <el-tab-pane label="姣涘澂" name="">
- <div id="echarts3" class="flex_c_c" style="width: 100%;height:420px;" />
-
- </el-tab-pane>
- <el-tab-pane label="浜ф垚鍝�" name="">
- <div id="echarts4" class="flex_c_c" style="width: 100%;height:420px;" />
- </el-tab-pane>
- </el-tabs>
+ <div id="echarts3" class="flex_c_c" style="width: 100%;height:450px;" />
</el-card>
</el-col>
</el-row>
@@ -739,11 +726,7 @@
//
async getHomeIndexBottomSearch(val) {
const { data: res } = await HomeIndexBottomSearch()
- if (val && val.label === '浜ф垚鍝�') {
- loadEcharts('echarts4', echarts3(res.BottomTwo))
- } else {
- loadEcharts('echarts3', echarts3(res.BottomOne))
- }
+ loadEcharts('echarts3', echarts3(res.BottomOne))
}
}
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 9ff67f5..c2b0780 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -598,42 +598,24 @@
show-tooltip-when-overflow
prop="delive_qty"
/>
- <el-table-column
- label="鎿嶄綔"
- width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-tooltip v-del-tab-index class="item" effect="dark" content="SOP棰勮" placement="top">
- <i
- v-if="mesSetting.tech"
- class="el-icon-files"
- style="cursor: pointer;color:#42b983;margin-right: 15px"
- @click="pre(row,2)"
- />
- </el-tooltip>
- <!-- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">-->
- <!-- <i-->
- <!-- v-if="tableDataDetail.length!==row.seq"-->
- <!-- class="el-icon-printer"-->
- <!-- :style="{color:$store.state.settings.theme}"-->
- <!-- style="cursor: pointer;margin-right: 15px"-->
- <!-- @click="supplementSmallClick(row)"-->
- <!-- />-->
- <!-- </el-tooltip>-->
- <!-- <el-tooltip class="item" effect="dark" content="琛ユ墦鐢熶骇鍏ュ簱鏉＄爜" placement="top">-->
- <!-- <i-->
- <!-- v-if="tableDataDetail.length===row.seq"-->
- <!-- class=" el-icon-camera"-->
- <!-- :style="{color:$store.state.settings.theme}"-->
- <!-- style="cursor: pointer;margin-right: 15px"-->
- <!-- @click="getProductInHouseLabCode(row.wo_code)"-->
- <!-- />-->
- <!-- </el-tooltip>-->
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="120"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="SOP棰勮" placement="top">-->
+ <!-- <i-->
+ <!-- v-if="mesSetting.tech"-->
+ <!-- class="el-icon-files"-->
+ <!-- style="cursor: pointer;color:#42b983;margin-right: 15px"-->
+ <!-- @click="pre(row,2)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
</div>
--
Gitblit v1.9.3