From 95af123562c0a05ae8955d53fcdcd4c8b310ced8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 29 六月 2022 17:32:00 +0800
Subject: [PATCH] 1.制造模型：工艺路线(新增、删除、预览)功能开发 2.制造模型：工序定义(查询) 功能开发 3.系统设置：编码规则(查询)功能开发4.修改实施部提出的bug
---
src/views/jcsz/zzjg.vue | 214 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 132 insertions(+), 82 deletions(-)
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index beb7b7d..9ed8ac4 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div style="height: 50px;">
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -9,15 +9,15 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
- <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
- <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <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.OrgType" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in OrgTypeArr"
:key="item.value"
@@ -27,7 +27,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;">
@@ -36,27 +36,30 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">淇敼</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-delete" @click="del">鎵归噺鍒犻櫎</el-button>-->
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
+ stripe
:style="{width: 100+'%',height:tableHeight+'px'}"
+ highlight-current-row
+ :height="tableHeight"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
<!-- />-->
<el-table-column
- prop="id"
+ prop="RowNum"
width="50"
label="搴忓彿"
/>
@@ -96,6 +99,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-overflow-tooltip
sortable="custom"
/>
<el-table-column
@@ -124,17 +128,18 @@
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
+ @close="handleClose"
>
- <el-form ref="dialogForm" :model="dialogForm" label-width="80px">
- <el-form-item label="缁勭粐绫诲瀷" required>
+ <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
<el-radio-group
v-model="dialogForm.OrgType"
- style="display: flex;align-items: end;height: 29px;"
@change="changeRadio"
>
<el-radio
@@ -145,16 +150,18 @@
/>
</el-radio-group>
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" required>
- <el-input v-model="dialogForm.OrgCode" style="width: 220px" />
+ <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" required>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
<el-input v-model="dialogForm.OrgName" style="width: 220px" />
</el-form-item>
- <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" label="涓婄骇鍗曚綅" required>
+ <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
style="width: 220px"
+ filterable
+ :popper-append-to-body="false"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -181,12 +188,31 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
Pagination
},
data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
return {
mainHeight: 0,
tableHeight: 0,
@@ -198,7 +224,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
OrgTypeArr: [
{ label: '宸ュ巶', value: 'F' },
@@ -219,21 +245,21 @@
},
SupUnitArr: [],
dialogFormOrgTypeSelected: '',
- operation: ''
- // dialogFormRules: {
- // // OrgType: [
- // // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
- // // ],
- // OrgCode: [
- // { required: true, message: '璇疯緭鍏ョ粍缁囩紪鐮�', trigger: 'blur' }
- // ],
- // OrgName: [
- // { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: 'blur' }
- // ]
- // // SupUnit: [
- // // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
- // // ]
- // }
+ operation: '',
+ dialogFormRules: {
+ OrgType: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ OrgCode: [
+ { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ ],
+ OrgName: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ SupUnit: [
+ { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ ]
+ }
}
},
@@ -246,8 +272,9 @@
},
methods: {
async getOrganizationSearch() {
- const { data: res } = await OrganizationSearch(this.form)
- this.tableData = res
+ const res = await OrganizationSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -312,10 +339,12 @@
} else if (row.description === 'L') {
this.dialogForm.OrgType = '鐢熶骇绾�'
}
- this.changeRadio(this.dialogForm.OrgType)
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.$nextTick(() => {
+ this.changeRadio(this.dialogForm.OrgType)
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
},
// 鍒犻櫎鎸夐挳
async del(id) {
@@ -340,47 +369,40 @@
this.dialogForm.OrgCode = ''
this.dialogForm.OrgName = ''
this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
},
// 瀵硅瘽妗嗙‘璁�
- async dialogVisibleConfirm() {
- if (this.dialogFormOrgTypeSelected.length < 1) {
- return this.$message.info('缁勭粐绫诲瀷鏈�夛紒')
- }
- if (this.dialogForm.OrgCode < 1) {
- return this.$message.info('缁勭粐缂栫爜鏈～锛�')
- }
- if (this.dialogForm.OrgName < 1) {
- return this.$message.info('缁勭粐鍚嶇О鏈～锛�')
- }
- if (this.dialogForm.SupUnit < 1) {
- return this.$message.info('涓婄骇鍗曚綅鏈�夛紒')
- }
-
- const data = {
- OrganType: this.dialogFormOrgTypeSelected,
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- const res = await AddUpdateOrganization(data)
- if (res.code === '200') {
- this.$message.success('娣诲姞鎴愬姛锛�')
- await this.getOrganizationSearch()
- } else {
- this.$message.error('娣诲姞澶辫触锛�')
- }
- this.dialogVisible = false
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganType: this.dialogFormOrgTypeSelected,
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getOrganizationSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
}
@@ -395,17 +417,28 @@
height: 30px;
display: flex;
align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
-::v-deep .el-button--info {
- //background-color: $main_color !important;
+::v-deep .el-button--info{
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -418,6 +451,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -443,11 +477,11 @@
}
::v-deep .el-input__inner {
- height: 30px
+ height: 30px;
+ line-height:30px;
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -470,8 +504,24 @@
align-items: center;
}
-//::v-deep .el-message-box__btns button:nth-child(2){
-// background-color: $main_color !important;
-// border-color: $main_color !important;
-//}
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+.body ::v-deep .el-form-item{
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+color: $main_color;
+}
</style>
--
Gitblit v1.9.3