From d18ba4694e16b41208487a347025f7b0c5d4c8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com>
Date: Mon, 16 Mar 2026 10:27:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=83=A8=E5=88=86=E7=8A=B6=E6=80=81=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8,=E5=88=A0=E9=99=A4=E4=B8=8A=E7=BA=BF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5,=E5=88=A0=E9=99=A4=E5=AE=A1=E6=A0=B8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rbFilePreserve/index.vue                  | 101 ++++++++++--------
 vite.config.mjs                               |   4 +-
 2 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
index 84bcf42..55a34bb 100644
--- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
+++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
@@ -48,15 +48,7 @@
         <el-tag v-if="row.line == 1">线上</el-tag>
         <el-tag v-if="row.line == 0" type="success">线下</el-tag>
       </template>
-      <!-- <template #approvalStatus="{ row }">
-        <approvalStandard
-          ref="approvalRpf"
-          :cur-status="row.approvalStatus"
-          :flow-code="row.flowCode"
-          :the-id="row.rfpId"
-          @refresh="refresh"
-        />
-      </template> -->
+
     </avue-crud>
     <detailRb
       :detail-open="detailOpen"
@@ -224,24 +216,24 @@ export default {
               },
             ],
           },
-          {
-            label: '线上/线下',
-            prop: 'line',
-            span: 24,
-            value:0,
-            type: 'switch',
-            dicData: [
-              {
-                label: '线下',
-                value: 0,
-              },
-              {
-                label: '线上',
-                value: 1,
-              },
+          // {
+          //   label: '线上/线下',
+          //   prop: 'line',
+          //   span: 24,
+          //   value:0,
+          //   type: 'switch',
+          //   dicData: [
+          //     {
+          //       label: '线下',
+          //       value: 0,
+          //     },
+          //     {
+          //       label: '线上',
+          //       value: 1,
+          //     },
               
-            ],
-          },
+          //   ],
+          // },
           {
             label: '维护人',
             prop: 'keepUserRealName',
@@ -261,33 +253,50 @@ export default {
             display: false,
             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: '状态',
-            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',
             search: true,
             sortable: true,
             filter: true,
-            display: false,
             type: 'select',
-            dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-ApprovalStatus',
-            props:{
-              label: 'dictValue',
-              value: 'dictKey',
-            }
+            // dicUrl:'/api/blade-system/dict/dictionary?code=ProReTemplate-ApprovalStatus',
+            // props:{
+            //   label: 'dictValue',
+            //   value: 'dictKey',
+            // },
+              dicData: [
+              {
+                label: '新建',
+                value: 0,
+              },
+              {
+                label: '发布',
+                value: 1,
+              },
+               {
+                label: '使用中',
+                value: 2,
+              },
+              {
+                label: '废弃',
+                value: 3,
+              },
+            ],
           },
         ],
       },
diff --git a/vite.config.mjs b/vite.config.mjs
index 1797640..4fdb079 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -61,7 +61,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/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.4: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:192.168.0.220:80",
           // target: 'http:49.232.74.228:49',
-          // target: 'http://49.232.74.228:80', //测试环境的地址
+          target: 'http://49.232.74.228:80', //测试环境的地址
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },

From c5fae402b671f2638eaf7afafe202a59af928bda Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Mon, 16 Mar 2026 10:41:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=8D=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.js                    |  4 +-
 src/views/wel/components/notice.vue | 61 +++++++++++++++++------------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/public/config.js b/public/config.js
index 2bd93b1..1941b40 100644
--- a/public/config.js
+++ b/public/config.js
@@ -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"
\ No newline at end of file
+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" //检验记录地址
\ No newline at end of file
diff --git a/src/views/wel/components/notice.vue b/src/views/wel/components/notice.vue
index 82c6f85..f8a5e8d 100644
--- a/src/views/wel/components/notice.vue
+++ b/src/views/wel/components/notice.vue
@@ -1,29 +1,29 @@
 <template>
   <div class="notice_box">
-    <!-- <div class="title_box">
+    <div class="title_box">
         <span class="title">通知中心</span>
-        <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span>
-    </div> -->
+        <!-- <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span> -->
+    </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="我的待办" name="backlog">
             <div class="back_box">
                 <div class="back_item" v-for="item in backlogData" :key="item.id">
                     <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) 
                             : item.createTime.substring(0,4) == year ? item.createTime.substring(5,10) : item.createTime.substring(0,10)}}
                         </div>
                     </div>
                     <div class="bottom">
-                        {{item.content}}
+                        {{item.createUserName}}创建的{{item.content}},等待您的审批
                     </div>
 
                 </div>
             </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 label="消息通知" name="notice">
+        <el-tab-pane label="消息通知" name="notice">
             <div class="back_box">
                 <div class="back_item" v-for="item in noticeArr" :key="item.id">
                     <div class="back_top">
@@ -38,9 +38,9 @@
 
                 </div>
             </div>
-            
-           
-        </el-tab-pane> -->
+            <!-- <div class="btn_box">查看更多</div> -->
+            <el-button v-if="noticeArr.length >= 3" type="primary" @click="handleMore(2)">查看更多</el-button>
+        </el-tab-pane>
     </el-tabs>
     <!-- <div class="notice_data">
         <div class="notice_data_item" v-for="item in noticeArr" :key="item.content">
@@ -75,18 +75,12 @@ export default {
                     content:"张伟提交的转外协申请，等待您的审批",
                     createTime:"2026-03-05 09:05:05",
                 },
-                // {
-                //     id:'1963789019681054722',
-                //     title:"审批请求待处理",
-                //     content:"张伟提交的转外协申请，等待您的审批",
-                //     createTime:"2024-03-05 09:05:05",
-                // },
-                // {
-                //     id:'1963789019681054722',
-                //     title:"审批请求待处理",
-                //     content:"张伟提交的转外协申请，等待您的审批",
-                //     createTime:"2024-03-05 09:05:05",
-                // }
+                {
+                    id:'1963789019681054722',
+                    title:"审批请求待处理",
+                    content:"张伟提交的转外协申请，等待您的审批",
+                    createTime:"2024-03-05 09:05:05",
+                },
             ],
             noticeArr:[
                 {
@@ -121,13 +115,31 @@ export default {
                     "content": "<p><strong>工艺任务待分派</strong></p><p>零件号为21E6-575-12846_001-B1的相关工艺任务待分派，请尽快处理！</p>",
                     "categoryName": "消息通知"
                 },
-            ]
+            ],
+            backlogLength:0
         }
     },
     mounted(){
-        
+        this.getTodoList()
     },
     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(){
             this.$router.push('/desk/notice');
         },
@@ -168,7 +180,6 @@ export default {
         .back_item{
             border-bottom: 1px solid #eee;
             margin-bottom: 10px;
-            font-size: 14px;
             .back_top{
                 display: flex;
                 justify-content: space-between;