From ae4bd8e2b6fbdb7a2e351f2bbc62a5512c161046 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 06 六月 2024 10:09:05 +0800
Subject: [PATCH] 1.新增SOP管理菜单
---
src/icons/svg/sop.svg | 1
src/views/basicSettings/powerDivider.vue | 1
src/views/sopManager/sopRoute.vue | 11 +
src/views/sopManager/sopWorkOrder.vue | 11 +
src/router/index.js | 33 +++
src/views/workOrder/workOrderList.vue | 4
src/views/sopManager/sopDevice.vue | 520 ++++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 579 insertions(+), 2 deletions(-)
diff --git a/src/icons/svg/sop.svg b/src/icons/svg/sop.svg
new file mode 100644
index 0000000..0851154
--- /dev/null
+++ b/src/icons/svg/sop.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1717638733444" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5219" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 64C265.6 64 64 265.6 64 512s201.6 448 448 448 448-201.6 448-448S758.4 64 512 64z m0 742.4c-76.8 0-153.6-28.8-208-83.2l64-76.8c41.6 38.4 96 64 144 64 57.6 0 89.6-25.6 89.6-64 0-41.6-35.2-54.4-86.4-76.8l-76.8-32c-57.6-22.4-115.2-70.4-115.2-153.6 0-92.8 80-163.2 195.2-163.2 67.2 0 131.2 25.6 179.2 73.6L640 364.8c-35.2-28.8-73.6-48-121.6-48-51.2 0-83.2 22.4-83.2 60.8 0 41.6 41.6 54.4 89.6 73.6l73.6 32c70.4 28.8 115.2 73.6 115.2 153.6 6.4 89.6-70.4 169.6-201.6 169.6z" fill="#00A79D" p-id="5220"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0b45293..79b99ff 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -572,6 +572,39 @@
},
{
+ path: '/sopManager',
+ component: Layout,
+ redirect: '/sopManager/sopDevice',
+ name: 'SOP绠＄悊',
+ code: '10',
+ meta: { code: '10', title: 'SOP绠＄悊', icon: 'sop' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ children: [
+ {
+ path: 'sopDevice',
+ name: 'sopDeviceCancel',
+ code: '1001',
+ component: () => import('@/views/sopManager/sopDevice'),
+ meta: { code: '1001', title: '璁惧SOP', icon: '', keepAlive: true }
+ },
+ {
+ path: 'sopRoute',
+ name: 'sopRouteCancel',
+ code: '1002',
+ component: () => import('@/views/sopManager/sopRoute'),
+ meta: { code: '1002', title: '宸ヨ壓SOP', icon: '', keepAlive: true }
+ }, {
+ path: 'sopWorkOrder',
+ name: 'sopWorkOrderCancel',
+ code: '1003',
+ component: () => import('@/views/sopManager/sopWorkOrder'),
+ meta: { code: '1003', title: '鍗曟嵁SOP', icon: '', keepAlive: true }
+ }
+
+ ]
+ },
+
+ {
path: '/systemSetting',
component: Layout,
redirect: '/systemSetting/encodingRules',
diff --git a/src/views/basicSettings/powerDivider.vue b/src/views/basicSettings/powerDivider.vue
index d092c31..f1aab8c 100644
--- a/src/views/basicSettings/powerDivider.vue
+++ b/src/views/basicSettings/powerDivider.vue
@@ -275,6 +275,7 @@
{ menucode: '-1', menuname: '鍏ㄩ儴', children: result }
]
+ this.treeCenter[0].children.sort((a, b) => a.menu_seq - b.menu_seq)
this.treeCenter[0].children.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach(it => {
diff --git a/src/views/sopManager/sopDevice.vue b/src/views/sopManager/sopDevice.vue
new file mode 100644
index 0000000..33b13f2
--- /dev/null
+++ b/src/views/sopManager/sopDevice.vue
@@ -0,0 +1,520 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between;align-items: center">
+ <el-button icon="el-icon-circle-plus-outline" type="primary" @click="add">鏂囦欢涓婁紶</el-button>
+ <div style="display: flex;align-items: center">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ >
+ <div class="elForm" style="justify-content: flex-start">
+ <el-form-item style="margin-right: 30px">
+ <el-checkbox v-model="checked" @change="checkedChange">鏈�鏂扮増鏈�</el-checkbox>
+ </el-form-item>
+ <el-form-item>
+ <el-input v-model="form.search" placeholder="璇疯緭鍏ュ叧閿瓧" style="width: 260px" />
+ </el-form-item>
+ </div>
+ </el-form>
+ <el-button type="primary" style="margin-left: 30px" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </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+40)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="define_name"
+ label="鏂囦欢鍚嶇О"
+ min-width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.define_name">{{ row.define_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="filetype_name"
+ label="鏂囦欢绫诲瀷"
+ min-width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.filetype_name">{{ row.filetype_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="file_version"
+ label="鐗堟湰鍙�"
+ min-width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.file_version">{{ row.file_version }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="partcode"
+ label="鐗╂枡缂栫爜"
+ min-width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partcode">{{ row.partcode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="partname"
+ label="鐗╂枡鍚嶇О"
+ min-width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="eqptype_name"
+ label="璁惧绫诲瀷"
+ min-width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.eqptype_name">{{ row.eqptype_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="username"
+ min-width="110"
+ label="涓婁紶浜哄憳"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.username">{{ row.username }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="涓婁紶鏃堕棿"
+ min-width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.lm_date">{{ row.lm_date }}</div>
+ <div v-else>/</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="棰勮" placement="top">
+ <i
+ class="el-icon-files"
+ style="cursor: pointer;color:#42b983;margin-right: 15px"
+ @click="check(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>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getSystemSopSearch"
+ />
+ </div>
+
+ <el-dialog
+ title="鏂囦欢涓婁紶"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="璁惧绫诲瀷" prop="devicetvpecode">
+ <el-select
+ v-model="dialogForm.devicetvpecode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="val=>fileversionChange(val,'devicetvpecode')"
+ >
+ <el-option
+ v-for="item in devicetvpeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="partcode">
+ <el-select
+ v-model="dialogForm.partcode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="val=>fileversionChange(val,'partcode')"
+ >
+ <el-option
+ v-for="item in partArr"
+ :key="item.partcode"
+ :label="item.partname"
+ :value="item.partcode"
+ />
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="鏂囦欢鍚嶇О" prop="defilename">-->
+ <!-- <el-form-item label="鏂囦欢鍚嶇О">-->
+ <!-- <el-input v-model="dialogForm.defilename" disabled style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="鏂囦欢绫诲瀷" prop="filetypecode">
+ <el-select
+ v-model="dialogForm.filetypecode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="val=>fileversionChange(val,'filetypecode')"
+ >
+ <el-option
+ v-for="item in filetypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐗堟湰鍙�">
+ <el-input v-model="dialogForm.fileversion" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏂囦欢涓婁紶" prop="Files">
+ <div style="width: 200px;">
+ <el-upload
+ ref="uploadFileRef"
+ style="display: inline-block;"
+ action="#"
+ :limit="1"
+ :show-file-list="true"
+ :on-exceed="handleExceed"
+ :auto-upload="false"
+ :multiple="false"
+ accept=".mp4,.pdf"
+ >
+ <el-button
+ type="primary"
+ style="width: 200px;display: flex;justify-content: center"
+ icon="el-icon-upload2"
+ >閫夋嫨鏂囦欢
+ </el-button>
+ </el-upload>
+ </div>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+// import {
+// SystemSopDelete,
+// SystemSopDeviceSearch,
+// SystemSopMaxVersion,
+// SystemSopSava,
+// SystemSopSearch,
+// SystemSopView
+// } from '@/api/xtsz'
+// import { PartSelect } from '@/api/zzmx'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ check: 'N', // 鏄惁閫変腑鏈�楂樼増鏈�
+ search: '', // 鎼滅储鍏抽敭瀛�
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ checked: false,
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ devicetvpecode: '', // 璁惧绫诲瀷缂栫爜
+ partcode: '', // 鐗╂枡缂栫爜
+ defilename: '',
+ filetypecode: '', // 鏂囦欢绫诲瀷缂栫爜
+ Files: '', // 鏂囦欢
+ fileversion: ''// 鏂囦欢鐗堟湰鍙�
+ },
+ dialogFormRules: {
+ devicetvpecode: [
+ { required: true, message: '璇烽�夋嫨璁惧绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ partcode: [
+ { required: true, message: '璇烽�夋嫨鐗╂枡鍚嶇О', trigger: ['blur', 'change'] }
+ ],
+ defilename: [
+ { required: true, message: '璇疯緭鍏ュ悕鏂囦欢绉�', trigger: ['blur', 'change'] }
+ ],
+ filetypecode: [
+ { required: true, message: '璇烽�夋嫨鏂囦欢绫诲瀷', trigger: ['blur', 'change'] }
+ ]
+ },
+ devicetvpeArr: [], // 璁惧绫诲瀷涓嬫媺鍒楄〃
+ partArr: [], // 鐗╂枡涓嬫媺鍒楄〃
+ filetypeArr: [// 鏂囦欢绫诲瀷涓嬫媺鏁扮粍
+ { code: 'P001', name: '浣滀笟鎸囧涔�' },
+ { code: 'P002', name: '妫�楠屾寚瀵间功' },
+ { code: 'P003', name: '鍥剧焊' }
+ ]
+
+ }
+ },
+
+ created() {
+ // this.getSystemSopSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getSystemSopSearch() {
+ const res = await SystemSopSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ 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.getSystemSopSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getSystemSopSearch()
+ },
+ // 鏈�鏂扮増鏈敼鍙樻椂瑙﹀彂
+ checkedChange(val) {
+ this.form.check = val ? 'Y' : 'N'
+ this.getSystemSopSearch()
+ },
+ // 鏂囦欢鏁伴噺瓒呰繃闄愬畾瑙﹀彂
+ handleExceed() {
+ this.$message.info('鏆備笉鏀寔澶氭枃浠朵笂浼狅紒')
+ },
+
+ // 閲嶇疆
+ reset() {
+ this.form.search = ''
+ this.getSystemSopSearch()
+ },
+ // 鏂板鎸夐挳
+ add() {
+ this.dialogVisible = true
+ this.getSystemSopDeviceSearch()
+ this.getPartSelect()
+ },
+ // 鑾峰彇璁惧绫诲瀷
+ async getSystemSopDeviceSearch() {
+ const { data: res } = await SystemSopDeviceSearch()
+ this.devicetvpeArr = res
+ },
+ // 鑾峰彇鐗╂枡鍚嶇О
+ async getPartSelect() {
+ const { data: res } = await PartSelect()
+ this.partArr = res
+ },
+ // 鏂囦欢绫诲瀷鍊兼敼鍙樻椂
+ async fileversionChange(val, type) {
+ const data = {
+ devicetypecode: type === 'devicetvpecode' ? val : this.dialogForm.devicetvpecode,
+ filetypecode: type === 'filetypecode' ? val : this.dialogForm.filetypecode,
+ partcode: type === 'partcode' ? val : this.dialogForm.partcode
+ }
+ const { data: res } = await SystemSopMaxVersion(data)
+
+ this.dialogForm.fileversion = res
+ },
+ // 棰勮
+ async check(row) {
+ const { data: res } = await SystemSopView({ id: row.id, filepath: row.file_path })
+ window.open(res)
+ },
+
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const data = {
+ id: row.id,
+ filepath: row.file_path
+ }
+ SystemSopDelete(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getSystemSopSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.devicetvpecode = ''
+ this.dialogForm.partcode = ''
+ this.dialogForm.defilename = ''
+ this.dialogForm.filetypecode = ''
+ this.dialogForm.fileversion = ''
+ this.dialogForm.Files = ''
+ this.$refs.uploadFileRef.clearFiles()
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ console.log(this.$refs.uploadFileRef.uploadFiles[0])
+ if (!this.$refs.uploadFileRef.uploadFiles[0]) {
+ this.$message.info('璇烽�夋嫨鏂囦欢涓婁紶锛�')
+ }
+
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const formData = new FormData()
+ formData.append('devicetypecode', this.dialogForm.devicetvpecode)
+ formData.append('partcode', this.dialogForm.partcode)
+ formData.append('defilename', this.$refs.uploadFileRef.uploadFiles[0].name)
+ formData.append('filetypecode', this.dialogForm.filetypecode)
+ formData.append('fileversion', this.dialogForm.fileversion)
+ formData.append('Files', this.$refs.uploadFileRef.uploadFiles[0].raw)
+ // for (var [key, value] of formData) {
+ // console.log(key, value)
+ // }
+ this.$store.state.app.buttonIsDisabled = true
+ SystemSopSava(formData).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鏂囦欢涓婁紶鎴愬姛锛�')
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getSystemSopSearch()
+ } else {
+ this.$message.error('鏂囦欢涓婁紶澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 185
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<style>
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/sopManager/sopRoute.vue b/src/views/sopManager/sopRoute.vue
new file mode 100644
index 0000000..87c420b
--- /dev/null
+++ b/src/views/sopManager/sopRoute.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'SopRoute'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sopManager/sopWorkOrder.vue b/src/views/sopManager/sopWorkOrder.vue
new file mode 100644
index 0000000..2258028
--- /dev/null
+++ b/src/views/sopManager/sopWorkOrder.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'SopWorkOrder'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 1954a3b..4bde2c9 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -2868,11 +2868,11 @@
if (res.code === '200') {
this.dialogVisible = false
// this.handlePrint()
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇濆瓨鎴愬姛锛�')
this.getMesOrderSearch()
this.$store.state.app.buttonIsDisabled = false
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇濆瓨澶辫触锛�')
}
})
}
--
Gitblit v1.9.3