From 798ff0bede63be7b7645d92acec5b449a0376c73 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 20 一月 2026 11:10:00 +0800
Subject: [PATCH] 1.递交
---
src/views/sopManager/sopRoute.vue | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 333 insertions(+), 24 deletions(-)
diff --git a/src/views/sopManager/sopRoute.vue b/src/views/sopManager/sopRoute.vue
index 1b5230a..8d863cc 100644
--- a/src/views/sopManager/sopRoute.vue
+++ b/src/views/sopManager/sopRoute.vue
@@ -192,21 +192,32 @@
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="浜у搧淇℃伅" prop="partcode">
- <el-select
- v-model="dialogForm.partcode"
+ <el-button
+ v-waves
+ type="primary"
style="width: 200px"
- placeholder="璇烽�夋嫨"
- filterable
- :popper-append-to-body="false"
- @change="partcodeChange"
- >
- <el-option
- v-for="item in partcodeArr"
- :key="item.partcode"
- :label="item.partname+' / '+item.partcode"
- :value="item.partcode"
- />
- </el-select>
+ icon="el-icon-circle-plus-outline"
+ @click="selectSuitpart"
+ >閫夋嫨鐗╂枡
+ </el-button>
+ <div v-if="dialogForm.partcode.toString().trim().length>0">
+ 宸查�夋嫨{{ dialogForm.partcode }} {{ dialogForm.partname }}
+ </div>
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.partcode"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- @change="partcodeChange"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in partcodeArr"-->
+ <!-- :key="item.partcode"-->
+ <!-- :label="item.partname+' / '+item.partcode"-->
+ <!-- :value="item.partcode"-->
+ <!-- />-->
+ <!-- </el-select>-->
</el-form-item>
<el-form-item
v-if="mesSetting.route"
@@ -279,9 +290,8 @@
:on-exceed="handleExceed"
:auto-upload="false"
:multiple="false"
- accept=".mp4,.pdf,.png,.jpeg,.jpg,.svg,.txt,.xlsx,.xls"
>
- <!-- accept=".mp4,.pdf"-->
+ <!-- accept=".mp4,.pdf,.png,.jpeg,.jpg"-->
<el-button
v-waves
type="primary"
@@ -307,6 +317,183 @@
</span>
</el-dialog>
+ <!--閫夋嫨鐗╂枡-->
+ <el-dialog
+ v-el-drag-dialog
+ :title="dialogForm.suitobject==='P'?'閫夋嫨鐗╂枡':'閫夋嫨鐗╂枡绫诲埆'"
+ :visible.sync="dialogVisibleSuitobject"
+ width="1460px"
+ :close-on-click-modal="false"
+ top="5vh"
+ @closed="handleCloseSuitobject"
+ @close="handleCloseSuitobject"
+ >
+
+ <div style="display: flex">
+ <div style="width: 300px;margin-right: 20px;background:#fff">
+
+ <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+ <div style="display: flex;">
+ <div
+ style="width: 5px;height: 100%;border-radius: 5px;"
+ :style="{background:$store.state.settings.theme}"
+ />
+ <div style="margin-left: 8px;">瀛樿揣妗ｆ</div>
+ </div>
+ </div>
+
+ <el-tree
+ ref="treeLeftRef"
+ style="padding: 10px;overflow: auto;height: 600px;"
+ :data="treeLeft"
+ node-key="code"
+ highlight-current
+ :props="defaultPropsLeft"
+ :default-expand-all="true"
+ :expand-on-click-node="false"
+ @node-click="getTMaterielData"
+ />
+ </div>
+ <div
+ style=" width:calc(100% - 300px);"
+ >
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="suitobjectForm"
+ :model="suitobjectForm"
+ label-width="80px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="瀛樿揣缂栫爜" style=" display: flex;">
+ <el-input
+ v-model="suitobjectForm.partcode"
+ placeholder="璇疯緭鍏�"
+ :style="{minWidth:'100px',width:150+'px'}"
+ />
+ </el-form-item>
+ <el-form-item label="瀛樿揣鍚嶇О" style=" display: flex;">
+ <el-input
+ v-model="suitobjectForm.partname"
+ placeholder="璇疯緭鍏�"
+ :style="{minWidth:'100px',width:150+'px'}"
+ />
+ </el-form-item>
+ <el-form-item label="瀛樿揣瑙勬牸" style=" display: flex;">
+ <el-input
+ v-model="suitobjectForm.partspec"
+ placeholder="璇疯緭鍏�"
+ :style="{minWidth:'100px',width:150+'px'}"
+ />
+ </el-form-item>
+
+ </div>
+ <div class="bodySearchReset">
+ <el-button
+ v-waves
+ type="primary"
+ icon="el-icon-search"
+ @click="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
+ >鏌ヨ
+ </el-button>
+ <el-button
+ v-waves
+ type="info"
+ icon="el-icon-refresh"
+ @click="resetSuitobject"
+ >閲嶇疆
+ </el-button>
+ </div>
+ </el-form>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef3"
+ class="tableFixed"
+ :data="suitobjectTableData"
+ height="520"
+ border
+ row-class-name="custom-row"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ row-key="partcode"
+ @row-click="rowClick2"
+ >
+
+ <el-table-column
+ width="50"
+ fixed
+ >
+ <template slot-scope="{row}">
+ <el-radio
+ v-model="dialogForm.partcode"
+ :label="row.partcode"
+ style="color: transparent;padding-left: 10px;"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="rowNum"
+ width="70"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="partcode"
+ label="瀛樿揣缂栫爜"
+ />
+ <el-table-column
+ prop="partname"
+ label="瀛樿揣鍚嶇О"
+ show-tooltip-when-overflow
+ min-width="200"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸鍨嬪彿"
+ >
+ <template slot-scope="{row}">
+ {{ row.partspec ? row.partspec : '/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="idinventoryclassname"
+ label="鎵�灞炵被鍒�"
+ />
+ </el-table>
+ </div>
+
+ <!--鍒嗛〉-->
+ <pagination
+ :total="suitobjectTotal"
+ :page.sync="suitobjectForm.page"
+ :limit.sync="suitobjectForm.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
+ />
+
+ </div>
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleCancelSuitobject">杩� 鍥�</el-button>
+ <el-button
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirmSuitobject"
+ >纭� 璁�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
@@ -315,8 +502,9 @@
import { ProcessSopAddSeave, ProcessSopDeleteSeave, ProcessSopSearch, ProcessSopMaxVersion } from '@/api/SopManager'
import waves from '@/directive/waves'
import elDragDialog from '@/directive/el-drag-dialog'
-import { PartSelect } from '@/api/ProductModel'
+import { PartSelect, TMaterielClassTree, TMaterielData } from '@/api/ProductModel'
import { PartSelectRpute, RouteSelectStep } from '@/api/basicSettings'
+import arrayToTree from 'array-to-tree'
export default {
name: 'SopRoute',
@@ -345,6 +533,8 @@
dialogVisible: false,
dialogForm: {
partcode: '', // 璁惧绫诲瀷缂栫爜
+ partname: '', //
+
route: '', // 鐗╂枡缂栫爜
stepcode: '',
defilename: '',
@@ -378,7 +568,33 @@
{ code: 'P002', name: '妫�楠屾寚瀵间功' },
{ code: 'P003', name: '鍥剧焊' }
],
- mesSetting: JSON.parse(localStorage.getItem('mesSetting'))
+ mesSetting: JSON.parse(localStorage.getItem('mesSetting')),
+
+ dialogVisibleSuitobject: false,
+ treeLeft: [
+ {
+ code: '-1',
+ name: '鍏ㄩ儴'
+ }
+ ], // 宸︿晶鏍�
+ treeLeftArr: [],
+ defaultPropsLeft: {
+ children: 'children',
+ label: 'name'
+ },
+
+ suitobjectTableData: [],
+ suitobjectForm: {
+ inventoryclasscode: '',
+ partcode: '',
+ partname: '',
+ partspec: '',
+ page: 1,
+ rows: 20,
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc' // 鎺掑簭瀛楁
+ },
+ suitobjectTotal: 0
}
},
@@ -387,17 +603,102 @@
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.getProcessSopSearch()
- this.getPartSelect()
+ // this.getPartSelect()
+ this.getTMaterielClassTree()
},
created() {
this.getProcessSopSearch()
- this.getPartSelect()
+ // this.getPartSelect()
+ this.getTMaterielClassTree()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ selectSuitpart() {
+ this.dialogVisibleSuitobject = true
+ this.$nextTick(() => {
+ this.$refs.treeLeftRef.setCurrentKey('-1')
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ })
+ },
+ handleCloseSuitobject() {
+ this.suitobjectForm = {
+ inventoryclasscode: '',
+ partcode: '',
+ partname: '',
+ partspec: '',
+ page: 1,
+ rows: 20,
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc' // 鎺掑簭瀛楁
+ }
+ },
+ dialogVisibleCancelSuitobject() {
+ this.dialogVisibleSuitobject = false
+ },
+
+ async dialogVisibleConfirmSuitobject() {
+ await this.partcodeChange(this.dialogForm.partcode)
+ this.dialogVisibleSuitobject = false
+ },
+
+ rowClick2(row, event, column) {
+ this.dialogForm.partcode = row.partcode
+ this.dialogForm.partname = this.suitobjectTableData.find(i => i.partcode === row.partcode).partname
+ // this.dialogForm.partspec = this.partcodeArr.find(i => i.partcode === row.partcode).partspec
+ },
+
+ resetSuitobject() {
+ this.suitobjectForm.inventoryclasscode = ''
+ this.suitobjectForm.partcode = ''
+ this.suitobjectForm.partname = ''
+ this.suitobjectForm.partspec = ''
+ this.$refs.treeLeftRef.setCurrentKey('-1')
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ },
+ async getTMaterielClassTree() {
+ const res = await TMaterielClassTree()
+ res.data.forEach(i => {
+ i.idparent = i.idparent ? i.idparent : '-1'
+ })
+ this.treeLeftArr = res.data
+ this.treeLeftArr.forEach(e => {
+ e.name = e.code + ' ' + e.name
+ })
+ this.treeLeft = arrayToTree(this.treeLeft.concat(res.data), {
+ parentProperty: 'idparent',
+ customID: 'code',
+ childrenProperty: 'children'
+ })
+ },
+ async getTMaterielData(node) {
+ const result = this.getChildrenCodeMethod(node, [])
+ if (result.includes('-1')) {
+ result.shift()
+ }
+ this.suitobjectForm.inventoryclasscode = result.join(',')
+ const res = await TMaterielData(this.suitobjectForm)
+
+ this.suitobjectTableData = res.data
+ this.suitobjectTotal = res.count
+
+ this.$nextTick(() => {
+ this.$refs.tableDataRef3.doLayout()
+ })
+ },
+ // 閫掑綊鍙栧瓙闆嗙殑鎵�鏈塩ode
+ getChildrenCodeMethod(node, result) {
+ result.push(node.code)
+ if (node.children && node.children.length > 0) {
+ node.children.forEach(i => {
+ this.getChildrenCodeMethod(i, result)
+ })
+ }
+ return result
+ },
+
async getPartSelect() {
const { data: res } = await PartSelect()
this.partcodeArr = res
@@ -527,14 +828,14 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- console.log(this.$refs.uploadFileRef.uploadFiles[0])
+ // console.log(this.$refs.uploadFileRef.uploadFiles[0])
if (!this.$refs.uploadFileRef.uploadFiles[0]) {
- this.$message.info('璇烽�夋嫨鏂囦欢涓婁紶锛�')
+ return this.$message.info('璇烽�夋嫨鏂囦欢涓婁紶锛�')
}
- const isLt100M = this.$refs.uploadFileRef.uploadFiles[0].size / 1024 / 1024 <= 1024
+ const isLt100M = this.$refs.uploadFileRef.uploadFiles[0].size / 1024 / 1024 <= 10
if (!isLt100M) {
- return this.$message.info('璇锋鏌ワ紝涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃1024MB!')
+ return this.$message.info('璇锋鏌ワ紝涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
}
this.$refs.dialogForm.validate(valid => {
@@ -580,8 +881,16 @@
}
</script>
+<style lang="scss" scoped>
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none !important;
+ }
+}
+</style>
<style>
.el-table .custom-row {
background: #f8f8fa;
}
+
</style>
--
Gitblit v1.9.3