From 958ee855acb3431d2da10aa67e2e9453a268fcd4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:11 +0800
Subject: [PATCH] 修改cnasbug
---
src/components/do/a7-quality-control-plan/recordsDialog.vue | 7 +++----
src/components/do/a7-Ensure-results-validity/ViewRecord.vue | 2 +-
src/components/tool/file-preview.vue | 10 ++++++++--
src/components/do/a7-Ensure-results-validity/detailFormDialog.vue | 5 ++++-
src/components/view/a7-distribution-of-nonconforming.vue | 6 ++++--
src/components/view/a7-Ensure-results-validity.vue | 2 +-
6 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/components/do/a7-Ensure-results-validity/ViewRecord.vue b/src/components/do/a7-Ensure-results-validity/ViewRecord.vue
index 6474112..ab217f2 100644
--- a/src/components/do/a7-Ensure-results-validity/ViewRecord.vue
+++ b/src/components/do/a7-Ensure-results-validity/ViewRecord.vue
@@ -17,7 +17,7 @@
<ZTTable
ref="yearTable"
:column="columnData"
- :height="'calc(100vh - 47em)'"
+ :height="'50vh'"
:highlightCurrentRow="true"
:table-data="tableData"
:table-loading="tableLoading"
diff --git a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
index 5c2976d..acac5d6 100644
--- a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
+++ b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
@@ -12,7 +12,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="璁″垝寮�灞曟椂闂�" prop="plannedTime">
- <el-input v-model="form.plannedTime" size="small" clearable></el-input>
+ <!-- <el-input v-model="form.plannedTime" size="small" clearable></el-input> -->
+ <el-date-picker v-model="form.plannedTime" class="date_box" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ size="small" type="date" value-format="yyyy-MM-dd">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
diff --git a/src/components/do/a7-quality-control-plan/recordsDialog.vue b/src/components/do/a7-quality-control-plan/recordsDialog.vue
index ddd6e39..adc8845 100644
--- a/src/components/do/a7-quality-control-plan/recordsDialog.vue
+++ b/src/components/do/a7-quality-control-plan/recordsDialog.vue
@@ -57,10 +57,9 @@
<p><span class="required-span">* </span>妫�娴嬫棩鏈燂細</p>
</td>
<td>
- <el-input v-if="currentStep === 0" v-model="form.testDate"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
- </el-input>
+ <el-date-picker v-if="currentStep === 0" v-model="form.testDate" class="date_box" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ size="small" type="date" value-format="yyyy-MM-dd">
+ </el-date-picker>
<span v-else class="td-info"> {{ form.testDate }}</span>
</td>
</tr>
diff --git a/src/components/tool/file-preview.vue b/src/components/tool/file-preview.vue
index a0123c0..08d1757 100644
--- a/src/components/tool/file-preview.vue
+++ b/src/components/tool/file-preview.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div v-if="isImage">
- <img :src="fileUrl" alt="Image Preview" />
+ <img :src="imgUrl" alt="Image Preview" />
</div>
<div v-if="isPdf">
<object :data="fileUrl" type="application/pdf" width="100%" height="750px">
@@ -95,11 +95,17 @@
transformData: (workbookData) => {return workbookData}, //灏嗚幏鍙栧埌鐨別xcel鏁版嵁杩涜澶勭悊涔嬪悗涓旀覆鏌撳埌椤甸潰涔嬪墠锛屽彲閫氳繃transformData瀵瑰嵆灏嗘覆鏌撶殑鏁版嵁鍙婃牱寮忚繘琛屼慨鏀癸紝姝ゆ椂姣忎釜鍗曞厓鏍肩殑text鍊煎氨鏄嵆灏嗘覆鏌撳埌椤甸潰涓婄殑鍐呭
},
csvList:[],//csv鏂囦欢鏁版嵁
+ imgUrl:''
}
},
computed: {
isImage() {
- return /\.(jpg|jpeg|png|gif)$/i.test(this.fileUrl);
+ let state = /\.(jpg|jpeg|png|gif)$/i.test(this.fileUrl)
+ this.imgUrl = this.fileUrl
+ if(state){
+ this.imgUrl = this.fileUrl.replaceAll('word', 'img')
+ }
+ return state;
},
isPdf() {
return /\.pdf$/i.test(this.fileUrl);
diff --git a/src/components/view/a7-Ensure-results-validity.vue b/src/components/view/a7-Ensure-results-validity.vue
index 2c6ba99..2627d5c 100644
--- a/src/components/view/a7-Ensure-results-validity.vue
+++ b/src/components/view/a7-Ensure-results-validity.vue
@@ -316,7 +316,7 @@
minWidth: '150px'
}, {
dataType: 'action',
- width: '180',
+ width: '220',
label: '鎿嶄綔',
fixed: 'right',
operation: [
diff --git a/src/components/view/a7-distribution-of-nonconforming.vue b/src/components/view/a7-distribution-of-nonconforming.vue
index aa102bf..66a34b7 100644
--- a/src/components/view/a7-distribution-of-nonconforming.vue
+++ b/src/components/view/a7-distribution-of-nonconforming.vue
@@ -9,8 +9,10 @@
</div>
<div class="search-background">
<span class="search-group">
- <span style="width: 120px">骞翠唤锛�</span>
- <el-input v-model="searchForm.distributionYear" clearable size="small"></el-input>
+ <span style="width: 80px">骞翠唤锛�</span>
+ <!-- <el-input v-model="searchForm.distributionYear" clearable size="small"></el-input> -->
+ <el-date-picker v-model="searchForm.distributionYear" format="yyyy" placeholder="閫夋嫨鏃ユ湡" size="small" type="year" value-format="yyyy">
+ </el-date-picker>
</span>
<span class="search-group">
<el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
--
Gitblit v1.9.3