Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

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>

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>

src/views/hrm/resignation.vue

@@ -1,8 +1,20 @@
 <template>
     <el-container>
         <el-header>
-            <div class="left-panel">
+            <div class="left-panel"></div>
-                <el-button type="primary" @click="handleAdd">新增</el-button>
+            <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>

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:[],