From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 719c8be..2bcb6aa 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -2,18 +2,19 @@
<!-- 7.7璐ㄩ噺鐩戠潱璁″垝-->
<div class="app-container">
<div class="table-card">
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="yearForm" ref="yearForm" size="small" :inline="true">
- <el-form-item label="璁″垝鍚嶇О" prop="superviseName">
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">璁″垝鍚嶇О</span>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="yearForm.superviseName"
- @keyup.enter.native="getYearPlanList"></el-input>
- </el-form-item>
- <el-form-item>
+ @keyup.enter.native="getYearPlanList"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button type="primary" size="mini" @click="getYearPlanList">鏌ヨ</el-button>
<el-button size="mini" @click="clearYear">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- <div>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="record">瀵煎叆</el-button>
</div>
</div>
@@ -21,26 +22,30 @@
height="40vh" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
</div>
<div style="margin-top: 20px">
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="yearDetailForm" ref="yearDetailForm" size="small" :inline="true">
- <el-form-item>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
<el-radio-group v-model="yearDetailForm.causeType" @change="getYearDetailPlan" size="small">
<el-radio-button :label="1">瀹氭湡鐩戠潱</el-radio-button>
<el-radio-button :label="2">鍔ㄦ�佺洃鐫�</el-radio-button>
</el-radio-group>
- </el-form-item>
- <el-form-item label="鐩戞帶鐩殑" prop="supervisePurpose">
- <el-input v-model="yearDetailForm.supervisePurpose" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鐩戞帶椤圭洰" prop="superviseProject">
- <el-input v-model="yearDetailForm.superviseProject" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item>
+ </div>
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鐩戞帶鐩殑</span>
+ <el-input v-model="yearDetailForm.supervisePurpose" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="getYearDetailPlan"></el-input>
+ </div>
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鐩戞帶椤圭洰</span>
+ <el-input v-model="yearDetailForm.superviseProject" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="getYearDetailPlan"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button type="primary" size="mini" @click="getYearDetailPlan">鏌ヨ</el-button>
<el-button size="mini" @click="clearDetail">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- <div>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="showDialog('add')">鏂板</el-button>
</div>
</div>
@@ -71,9 +76,9 @@
</el-dialog>
<el-dialog :visible.sync="downloadDialog" title="瀵煎嚭" width="600px">
<span>
- <el-button plain type="primary" @click="controlDown">璁板綍鍗曞鍑�</el-button>
- <el-button plain type="primary" @click="processingDown">澶勭悊鍗曞鍑�</el-button>
- <el-button plain type="primary" @click="supervisoryDown">绾犳鍗曞鍑�</el-button>
+ <el-button plain type="primary" :disabled="download.recordStatus !== 3" @click="controlDown">璁板綍鍗曞鍑�</el-button>
+ <el-button plain type="primary" :disabled="download.accordingStatus !== 3" @click="processingDown">澶勭悊鍗曞鍑�</el-button>
+ <el-button plain type="primary" :disabled="download.correctStatus !== 3" @click="supervisoryDown">绾犳鍗曞鍑�</el-button>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="downloadDialog = false">鍙� 娑�</el-button>
@@ -258,11 +263,11 @@
}, {
label: '鐩戠潱鐩殑',
prop: 'supervisePurpose',
- width: '150px',
+ width: '180px',
}, {
label: '鐩戞帶椤圭洰',
prop: 'superviseProject',
- width: '150px'
+ width: '180px'
}, {
label: '琚洃鐫ｄ汉鍛�',
prop: 'supervisee',
@@ -280,8 +285,10 @@
if (params === 0) {
return '鏈紑濮�';
} else if (params === 1) {
- return '寰呮壒鍑�';
- } else if (params === 2) {
+ return '寰呰瘎浠�';
+ } else if (params === 2) {
+ return '涓嶆壒鍑�';
+ } else if (params === 3) {
return '宸叉壒鍑�';
} else {
return null;
@@ -293,6 +300,8 @@
} else if (params === 1) {
return 'warning';
} else if (params === 2) {
+ return 'danger';
+ } else if (params === 3) {
return 'success';
} else {
return null;
@@ -307,8 +316,10 @@
if (params === 0) {
return '鏈紑濮�';
} else if (params === 1) {
- return '寰呮壒鍑�';
- } else if (params === 2) {
+ return '寰呰瘎浠�';
+ } else if (params === 2) {
+ return '涓嶆壒鍑�';
+ } else if (params === 3) {
return '宸叉壒鍑�';
} else {
return null;
@@ -320,6 +331,8 @@
} else if (params === 1) {
return 'warning';
} else if (params === 2) {
+ return 'danger';
+ } else if (params === 3) {
return 'success';
} else {
return null;
@@ -334,8 +347,10 @@
if (params === 0) {
return '鏈紑濮�';
} else if (params === 1) {
- return '寰呮壒鍑�';
- } else if (params === 2) {
+ return '寰呰瘎浠�';
+ } else if (params === 2) {
+ return '涓嶆壒鍑�';
+ } else if (params === 3) {
return '宸叉壒鍑�';
} else {
return null;
@@ -347,6 +362,8 @@
} else if (params === 1) {
return 'warning';
} else if (params === 2) {
+ return 'danger';
+ } else if (params === 3) {
return 'success';
} else {
return null;
@@ -357,6 +374,7 @@
prop: 'remark',
}, {
dataType: 'action',
+ fixed: 'right',
label: '鎿嶄綔',
operation: [
{
@@ -637,10 +655,8 @@
},
// 閲嶇疆鏄庣粏琛�
clearDetail() {
- this.yearDetailForm = {
- supervisePurpose: '',
- superviseProject: ''
- }
+ this.yearDetailForm.supervisePurpose = ''
+ this.yearDetailForm.superviseProject = ''
this.getYearDetailPlanList()
},
// 鎵撳紑骞村害鏄庣粏鏂板銆佷慨鏀瑰脊妗�
--
Gitblit v1.9.3