suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 4d32578db0 c5fae402b6
commit a843ca6619
4 changed files with 96 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      public/config.js
  2. 101
      src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
  3. 61
      src/views/wel/components/notice.vue
  4. 4
      vite.config.mjs

4
public/config.js
Unescape View File

@ -22,4 +22,6 @@ window.WARE_MATERIAL_PRINT = "http://192.168.169.172:9000/jmreport/view/11814863
// 领料单明细打印 // 领料单明细打印
// 库存汇总标签打印 // 库存汇总标签打印
window.WARE_MATERIAL_STOCK_TAG = "http://192.168.169.172:9000/jmreport/view/1181492297180168192" window.WARE_MATERIAL_STOCK_TAG = "http://192.168.169.172:9000/jmreport/view/1181492297180168192"
window.PROCESS_INSPECTION_RECORD ="http://192.168.169.172:9000/jmreport/view/1188648621968805888" //检验记录地址

101
src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
Unescape View File

@ -48,15 +48,7 @@
<el-tag v-if="row.line == 1">线上</el-tag> <el-tag v-if="row.line == 1">线上</el-tag>
<el-tag v-if="row.line == 0" type="success">线下</el-tag> <el-tag v-if="row.line == 0" type="success">线下</el-tag>
</template> </template>
<!-- <template #approvalStatus="{ row }">
<approvalStandard
ref="approvalRpf"
:cur-status="row.approvalStatus"
:flow-code="row.flowCode"
:the-id="row.rfpId"
@refresh="refresh"
/>
</template> -->
</avue-crud> </avue-crud>
<detailRb <detailRb
:detail-open="detailOpen" :detail-open="detailOpen"
@ -224,24 +216,24 @@ export default {
}, },
], ],
}, },
{ // {
label: '线上/线下', // label: '线上/线下',
prop: 'line', // prop: 'line',
span: 24, // span: 24,
value:0, // value:0,
type: 'switch', // type: 'switch',
dicData: [ // dicData: [
{ // {
label: '线下', // label: '线下',
value: 0, // value: 0,
}, // },
{ // {
label: '线上', // label: '线上',
value: 1, // value: 1,
}, // },
], // ],
}, // },
{ {
label: '维护人', label: '维护人',
prop: 'keepUserRealName', prop: 'keepUserRealName',
@ -261,33 +253,50 @@ export default {
display: false, display: false,
width:200, width:200,
}, },
// {
// label: '状态',
// prop: 'status',
// search: true,
// sortable: true,
// filter: true,
// display: false,
// type: 'select',
// dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-Status',
// props:{
// label: 'dictValue',
// value: 'dictKey',
// }
// },
{ {
label: '状态', label: '状态',
prop: 'status',
search: true,
sortable: true,
filter: true,
display: false,
type: 'select',
dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-Status',
props:{
label: 'dictValue',
value: 'dictKey',
}
},
{
label: '审批状态',
prop: 'approvalStatus', prop: 'approvalStatus',
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
display: false,
type: 'select', type: 'select',
dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-ApprovalStatus', // dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-ApprovalStatus',
props:{ // props:{
label: 'dictValue', // label: 'dictValue',
value: 'dictKey', // value: 'dictKey',
} // },
dicData: [
{
label: '新建',
value: 0,
},
{
label: '发布',
value: 1,
},
{
label: '使用中',
value: 2,
},
{
label: '废弃',
value: 3,
},
],
}, },
], ],
}, },

61
src/views/wel/components/notice.vue
Unescape View File

@ -1,29 +1,29 @@
<template> <template>
<div class="notice_box"> <div class="notice_box">
<!-- <div class="title_box"> <div class="title_box">
<span class="title">通知中心</span> <span class="title">通知中心</span>
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span> <!-- <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span> -->
</div> --> </div>
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="我的待办" name="backlog"> <el-tab-pane label="我的待办" name="backlog">
<div class="back_box"> <div class="back_box">
<div class="back_item" v-for="item in backlogData" :key="item.id"> <div class="back_item" v-for="item in backlogData" :key="item.id">
<div class="back_top"> <div class="back_top">
<div class="title">{{item.title}}</div> <div class="title">审批请求待处理</div>
<div>{{ item.createTime.substring(0,10) == today ? item.createTime.substring(11,16) <div>{{ item.createTime.substring(0,10) == today ? item.createTime.substring(11,16)
: item.createTime.substring(0,4) == year ? item.createTime.substring(5,10) : item.createTime.substring(0,10)}} : item.createTime.substring(0,4) == year ? item.createTime.substring(5,10) : item.createTime.substring(0,10)}}
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
{{item.content}} {{item.createUserName}}创建的{{item.content}},等待您的审批
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="btn_box">查看更多</div> --> <!-- <div class="btn_box">查看更多</div> -->
<!-- <el-button v-if="backlogData.length >= 3" type="primary" @click="handleMore(1)">查看更多</el-button> --> <el-button v-if="backlogData.length >= 3" type="primary" @click="handleMore(1)">查看更多</el-button>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="消息通知" name="notice"> <el-tab-pane label="消息通知" name="notice">
<div class="back_box"> <div class="back_box">
<div class="back_item" v-for="item in noticeArr" :key="item.id"> <div class="back_item" v-for="item in noticeArr" :key="item.id">
<div class="back_top"> <div class="back_top">
@ -38,9 +38,9 @@
</div> </div>
</div> </div>
<!-- <div class="btn_box">查看更多</div> -->
<el-button v-if="noticeArr.length >= 3" type="primary" @click="handleMore(2)">查看更多</el-button>
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- <div class="notice_data"> <!-- <div class="notice_data">
<div class="notice_data_item" v-for="item in noticeArr" :key="item.content"> <div class="notice_data_item" v-for="item in noticeArr" :key="item.content">
@ -75,18 +75,12 @@ export default {
content:"张伟提交的转外协申请，等待您的审批", content:"张伟提交的转外协申请，等待您的审批",
createTime:"2026-03-05 09:05:05", createTime:"2026-03-05 09:05:05",
}, },
// { {
// id:'1963789019681054722', id:'1963789019681054722',
// title:"审批请求待处理", title:"审批请求待处理",
// content:"张伟提交的转外协申请，等待您的审批", content:"张伟提交的转外协申请，等待您的审批",
// createTime:"2024-03-05 09:05:05", createTime:"2024-03-05 09:05:05",
// }, },
// {
// id:'1963789019681054722',
// title:"审批请求待处理",
// content:"张伟提交的转外协申请，等待您的审批",
// createTime:"2024-03-05 09:05:05",
// }
], ],
noticeArr:[ noticeArr:[
{ {
@ -121,13 +115,31 @@ export default {
"content": "<p><strong>工艺任务待分派</strong></p><p>零件号为21E6-575-12846_001-B1的相关工艺任务待分派，请尽快处理！</p>", "content": "<p><strong>工艺任务待分派</strong></p><p>零件号为21E6-575-12846_001-B1的相关工艺任务待分派，请尽快处理！</p>",
"categoryName": "消息通知" "categoryName": "消息通知"
}, },
] ],
backlogLength:0
} }
}, },
mounted(){ mounted(){
this.getTodoList()
}, },
methods:{ methods:{
getTodoList(){
getMyTodoList({
current:1,
size:10
}).then(res =>{
this.backlogData = res.data.data.records.length > 3 ? res.data.data.records.slice(0,3) :res.data.data.records
this.backlogLength = res.data.data.total
})
},
getData(){
getNoticeList({
current:1,
size:10
}).then(res =>{
console.log('res-----------',res)
})
},
loadMore(){ loadMore(){
this.$router.push('/desk/notice'); this.$router.push('/desk/notice');
}, },
@ -168,7 +180,6 @@ export default {
.back_item{ .back_item{
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px;
.back_top{ .back_top{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

4
vite.config.mjs
Unescape View File

@ -61,7 +61,7 @@ export default ({ mode, command }) => {
port: 2888, port: 2888,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://192.168.0.115:80',//本地 // target: 'http://192.168.0.115:80',//本地
// target: 'http://192.168.1.5:82', // target: 'http://192.168.1.5:82',
// target: "http://192.168.1.4:82", // target: "http://192.168.1.4:82",
// target: 'http://49.232.74.228:82', // target: 'http://49.232.74.228:82',
@ -70,7 +70,7 @@ export default ({ mode, command }) => {
// target: 'http://49.232.74.228:82', // target: 'http://49.232.74.228:82',
// target: "http:192.168.0.220:80", // target: "http:192.168.0.220:80",
// target: 'http:49.232.74.228:49', // target: 'http:49.232.74.228:49',
// target: 'http://49.232.74.228:80', //测试环境的地址 target: 'http://49.232.74.228:80', //测试环境的地址
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''), rewrite: path => path.replace(/^\/api/, ''),
}, },

Write Preview
Loading…
Cancel
Save