Browse Source

实验-》试验

master
han\hanst 2 weeks ago
parent
commit
f4725acb1c
  1. 2
      src/api/erf/erf.js
  2. 6
      src/components/ApprovalNotificationManager.vue
  3. 2
      src/store/modules/user.js
  4. 2
      src/views/main.vue
  5. 6
      src/views/modules/erf/plannerSchedule.vue
  6. 14
      src/views/modules/sys/user-add-or-update.vue

2
src/api/erf/erf.js

@ -2,7 +2,7 @@
import { createAPI } from "@/utils/httpRequest.js"; import { createAPI } from "@/utils/httpRequest.js";
// ===================================================== // =====================================================
// 工程验申请单 API接口定义
// 工程验申请单 API接口定义
// ===================================================== // =====================================================
/** /**

6
src/components/ApprovalNotificationManager.vue

@ -65,7 +65,7 @@ export default {
}, },
/** /**
* 工程验消息通知标志'Y'=启用通知, 'N'=禁用通知
* 工程验消息通知标志'Y'=启用通知, 'N'=禁用通知
*/ */
erfMsgFlag() { erfMsgFlag() {
return this.$store.state.user.erfMsgFlag return this.$store.state.user.erfMsgFlag
@ -448,7 +448,7 @@ export default {
h('p', { class: 'notification-item-text' }, [ h('p', { class: 'notification-item-text' }, [
'您有 ', '您有 ',
h('span', { class: 'count-highlight', style: { color: '#E6A23C' } }, counts.manager), h('span', { class: 'count-highlight', style: { color: '#E6A23C' } }, counts.manager),
' 个工程验申请单待审批'
' 个工程验申请单待审批'
]), ]),
h('p', { class: 'notification-item-link' }, '点击此通知查看详情') h('p', { class: 'notification-item-link' }, '点击此通知查看详情')
]) ])
@ -470,7 +470,7 @@ export default {
h('p', { class: 'notification-item-text' }, [ h('p', { class: 'notification-item-text' }, [
'您有 ', '您有 ',
h('span', { class: 'count-highlight', style: { color: '#409EFF' } }, counts.planner), h('span', { class: 'count-highlight', style: { color: '#409EFF' } }, counts.planner),
' 个工程验申请单待排产'
' 个工程验申请单待排产'
]), ]),
h('p', { class: 'notification-item-link' }, '点击此通知查看详情') h('p', { class: 'notification-item-link' }, '点击此通知查看详情')
]) ])

2
src/store/modules/user.js

@ -9,7 +9,7 @@ export default {
userDev: false, userDev: false,
multiLanguage: '', multiLanguage: '',
authControl: '', authControl: '',
erfMsgFlag: 'N', // 工程验消息通知标志:'Y'=启用通知, 'N'=禁用通知
erfMsgFlag: 'N', // 工程验消息通知标志:'Y'=启用通知, 'N'=禁用通知
// favoriteFlag: false, // favoriteFlag: false,
}, },
mutations: { mutations: {

2
src/views/main.vue

@ -134,7 +134,7 @@
this.languageDefault = data.user.languageDefault this.languageDefault = data.user.languageDefault
this.site = data.user.site this.site = data.user.site
this.userDisplay = data.user.userDisplay this.userDisplay = data.user.userDisplay
// 'Y'=, 'N'=
// 'Y'=, 'N'=
this.erfMsgFlag = data.user.erfMsgFlag || 'N' this.erfMsgFlag = data.user.erfMsgFlag || 'N'
} }
}) })

6
src/views/modules/erf/plannerSchedule.vue

@ -274,10 +274,10 @@
<el-form :model="scheduleData" label-position="top" class="schedule-form"> <el-form :model="scheduleData" label-position="top" class="schedule-form">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="验工单号" required>
<el-form-item label="验工单号" required>
<el-input <el-input
v-model="scheduleData.workOrderNo" v-model="scheduleData.workOrderNo"
placeholder="请输入验工单号"
placeholder="请输入验工单号"
clearable> clearable>
<i slot="prefix" class="el-input__icon el-icon-document"></i> <i slot="prefix" class="el-input__icon el-icon-document"></i>
</el-input> </el-input>
@ -450,7 +450,7 @@ export default {
doSchedule() { doSchedule() {
if (!this.scheduleData.workOrderNo) { if (!this.scheduleData.workOrderNo) {
this.$message.warning('请输入验工单号')
this.$message.warning('请输入验工单号')
return return
} }

14
src/views/modules/sys/user-add-or-update.vue

@ -55,10 +55,10 @@
:label="role.roleId">{{role.roleName}} :label="role.roleId">{{role.roleName}}
</el-checkbox> </el-checkbox>
</div> </div>
<!-- 工程验申请角色组 -->
<!-- 工程验申请角色组 -->
<div v-if="erfRoleList.length > 0" style="margin-bottom: 15px;"> <div v-if="erfRoleList.length > 0" style="margin-bottom: 15px;">
<div style="font-weight: bold; color: #409EFF; margin-bottom: 8px; font-size: 13px;"> <div style="font-weight: bold; color: #409EFF; margin-bottom: 8px; font-size: 13px;">
工程验申请专用角色
工程验申请专用角色
</div> </div>
<el-checkbox <el-checkbox
v-for="role in erfRoleList" v-for="role in erfRoleList"
@ -144,21 +144,21 @@ export default {
}, },
computed: { computed: {
/** /**
* 工程验申请相关角色列表
* 根据remark字段包含"工程验申请"进行过滤
* 工程验申请相关角色列表
* 根据remark字段包含"工程验申请"进行过滤
*/ */
erfRoleList() { erfRoleList() {
return this.roleList.filter(role => { return this.roleList.filter(role => {
return role.remark && role.remark.includes('工程验申请')
return role.remark && role.remark.includes('工程验申请')
}) })
}, },
/** /**
* 其他角色列表 * 其他角色列表
* 不包含"工程验申请"的角色
* 不包含"工程验申请"的角色
*/ */
otherRoleList() { otherRoleList() {
return this.roleList.filter(role => { return this.roleList.filter(role => {
return !role.remark || !role.remark.includes('工程验申请')
return !role.remark || !role.remark.includes('工程验申请')
}) })
} }
}, },

Loading…
Cancel
Save