From da21d42968dc18840f74693c14d13f623fcf8bf8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Nov 2025 08:43:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E9=BB=91=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9=E4=B8=BA7:00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_heihuadept.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/bigScreen/index_heihuadept.vue b/src/views/bigScreen/index_heihuadept.vue
index da2f4a04..f5b5f769 100644
--- a/src/views/bigScreen/index_heihuadept.vue
+++ b/src/views/bigScreen/index_heihuadept.vue
@@ -159,7 +159,7 @@
 				<el-col :xs="8" :md="8" style="height: 100%;">
 					<div class="box">
 						<div class="boxtitle">
-							<div class="boxlabel">生产分析（8:00 — 次日8:00）</div>
+							<div class="boxlabel">生产分析（7:00 — 次日7:00）</div>
 						</div>
 						<div class="totalStatic">
 							<span class="totalStaticItem">昨日黑化进炉统计</span>

From 9d257317074fd2cbb97d7d3e72a1c9301486811d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Nov 2025 10:02:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96sc-upload-file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scUpload/file.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/scUpload/file.vue b/src/components/scUpload/file.vue
index f8ec732c..79c5b072 100644
--- a/src/components/scUpload/file.vue
+++ b/src/components/scUpload/file.vue
@@ -19,7 +19,7 @@
 			:on-preview="handlePreview"
 			:on-exceed="handleExceed">
 			<slot>
-				<el-button type="primary" :disabled="disabled">Click to upload</el-button>
+				<el-button type="primary" :disabled="disabled">上传</el-button>
 			</slot>
 			<template #tip>
 				<div v-if="tip" class="el-upload__tip">{{tip}}</div>

From c603210fdb3f2bd2a69c9420d841653d8b3d64d3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Nov 2025 10:06:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20handover=5Fform=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 68b1d076..2df9c813 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -97,12 +97,15 @@
 								format="YYYY-MM-DD"
 								value-format="YYYY-MM-DD"
 								style="width: 100%"
+								:readonly="mode==='show'"
 							/>
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="24" v-if="mtype!==30">
 						<el-form-item label="交送人">
+							<span v-if="mode==='show'">{{ form.send_user_name }}</span>
 							<el-select
+								v-else
 								v-model="form.send_user"
 								placeholder="交送人"
 								clearable
@@ -139,7 +142,9 @@
 					</el-col>
 					<el-col :md="12" :sm="24"  v-if="mtype!==30">
 						<el-form-item label="接收人">
+							<span v-if="mode==='show'">{{ form.recive_user_name }}</span>
 							<el-select
+								v-else
 								v-model="form.recive_user"
 								placeholder="接收人"
 								clearable
@@ -170,29 +175,29 @@
 							<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :md="12" :sm="24" v-if="route_code=='tuihuo'">
+					<el-col :md="12" :sm="24" v-if="route_code=='tuihuo' || form.oinfo_json.test_file">
 						<el-form-item label="检验附件">
 							<sc-upload-file
-							v-model="fileList"
+							v-model="form.oinfo_json.test_file"
 							:multiple="false"
 							:limit="1"
 							:accept="['.xlsx', '.xls']"
-							@success = "fileUPSuccess"
+							:disabled="mode ==='show'"
 							>
-								<el-button type="primary" icon="el-icon-upload" v-if="mode!=='show'"> </el-button>
+								<!-- <el-button type="primary" icon="el-icon-upload" v-if="mode!=='show'"> </el-button>
 								<br/>
-							 	<el-link v-if="mode!=='add'&&form.oinfo_json" :href="form.oinfo_json.test_file" type="primary" target="_blank">{{form.oinfo_json.test_file}}</el-link>
+							 	<el-link v-if="mode!=='add'&&form.oinfo_json" :href="form.oinfo_json.test_file" type="primary" target="_blank">{{form.oinfo_json.test_file}}</el-link> -->
 							</sc-upload-file>
 						</el-form-item>
 					</el-col>
 				</el-row>
 			</el-form>
-			<el-footer v-show="mode!=='show'">
+			<el-footer>
 				<template  v-if="(route_code=='tuihuo'&&type==10&&mtype==10)||form.ticket!=null">
 					<ticketd_b :workflow_key="'backfire'" :title="'退火交接审批单'" :t_id="form.id" :ticket_="form.ticket_"
 					@success="()=>{$emit('success')} " :submit_b_func="submit_b_func" ref="ticketd_b"></ticketd_b>
 				</template>
-				<el-button v-else type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
+				<el-button v-else-if="mode!='show'" type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
 				<el-button @click="$emit('closed')">取消</el-button>
 			</el-footer>
 		</el-main>
@@ -259,7 +264,8 @@ export default {
 				recive_mgroup: null,
 				handoverb:[],
 				ticket:null,
-				ticket_:null
+				ticket_:null,
+				oinfo_json:{},
 			},
 			initForm:{},
 			selectObjIds:[],

From 94066ee14d7e4d4695637fe342f5131ea904a701 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Nov 2025 10:08:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20resignatioin=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/resignation.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/hrm/resignation.vue b/src/views/hrm/resignation.vue
index 73a87bd6..d7a53dcb 100644
--- a/src/views/hrm/resignation.vue
+++ b/src/views/hrm/resignation.vue
@@ -1,8 +1,20 @@
 <template>
     <el-container>
         <el-header>
-            <div class="left-panel">
-                <el-button type="primary" @click="handleAdd">新增</el-button>
+            <div class="left-panel"></div>
+            <div class="right-panel">
+                <!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
+                <el-input
+                    v-model="query.search"
+                    placeholder="姓名"
+                    clearable
+                    @keyup.enter="$refs.table.refresh()"
+                ></el-input>
+                <el-button
+            type="primary"
+            icon="el-icon-search"
+            @click="handleQuery"
+          ></el-button>
             </div>
 
         </el-header>