From 5370daa7267a0777e1476e7cd536265cb9430bb6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 01 四月 2025 16:30:41 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 140 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 108 insertions(+), 32 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 6ec2abf..719c8be 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -9,8 +9,8 @@
@keyup.enter.native="getYearPlanList"></el-input>
</el-form-item>
<el-form-item>
- <el-button icon="el-icon-refresh" size="mini" @click="clearYear">閲� 缃�</el-button>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="getYearPlanList">鏌� 璇�</el-button>
+ <el-button type="primary" size="mini" @click="getYearPlanList">鏌ヨ</el-button>
+ <el-button size="mini" @click="clearYear">閲嶇疆</el-button>
</el-form-item>
</el-form>
<div>
@@ -24,7 +24,7 @@
<div style="display: flex;justify-content: space-between;">
<el-form :model="yearDetailForm" ref="yearDetailForm" size="small" :inline="true">
<el-form-item>
- <el-radio-group v-model="yearDetailForm.causeType" @change="getYearDetailPlanList" size="small">
+ <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>
@@ -36,8 +36,8 @@
<el-input v-model="yearDetailForm.superviseProject" placeholder="璇疯緭鍏�" size="small"></el-input>
</el-form-item>
<el-form-item>
- <el-button icon="el-icon-refresh" size="mini" @click="clearDetail">閲� 缃�</el-button>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="getYearDetailPlanList">鏌� 璇�</el-button>
+ <el-button type="primary" size="mini" @click="getYearDetailPlan">鏌ヨ</el-button>
+ <el-button size="mini" @click="clearDetail">閲嶇疆</el-button>
</el-form-item>
</el-form>
<div>
@@ -45,8 +45,7 @@
</div>
</div>
<lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
- :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1"
- key="yearDetailTableData"></lims-table>
+ :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1" key="yearDetailColumnData"></lims-table>
</div>
<!--鏂板淇敼寮规-->
<detail-form-dialog v-if="formDia" ref="formDia" :superviseId="superviseId"
@@ -59,7 +58,7 @@
@closeProcessingDia="closeProcessingDia"></processing-sheet>
<!--绾犳澶勭悊娴佺▼寮规-->
<rectify-dialog-new v-if="rectifyDia" ref="rectifyDia" :superviseId="superviseId"
- @closeProcessingDia="closeRectifyDia"></rectify-dialog-new>
+ @closeRectifyDia="closeRectifyDia"></rectify-dialog-new>
<el-dialog :visible.sync="ratifyDialog" title="鎵瑰噯" width="30%" @close="closeRatifyDia">
<span>
鎵瑰噯澶囨敞锛�
@@ -154,20 +153,19 @@
{
label: '璁″垝鍚嶇О',
prop: 'superviseName',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缂栧埗浜�',
prop: 'writeUserName',
- minWidth: '100'
}, {
label: '缂栧埗鏃ユ湡',
prop: 'writeTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'ratifyStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶆壒鍑�';
@@ -189,20 +187,16 @@
}, {
label: '鎵瑰噯鍐呭',
prop: 'ratifyRemark',
- minWidth: '100'
}, {
label: '鎵瑰噯浜�',
prop: 'ratifyUserName',
- minWidth: '100'
}, {
label: '鎵瑰噯鏃ユ湡',
prop: 'ratifyTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'action',
- minWidth: '170',
label: '鎿嶄綔',
- fixed: 'right',
operation: [
{
name: '鎵瑰噯',
@@ -260,33 +254,110 @@
{
label: '鐩戠潱鏃ユ湡',
prop: 'superviseTime',
- minWidth: '150px'
+ width: '120px'
}, {
label: '鐩戠潱鐩殑',
prop: 'supervisePurpose',
- minWidth: '150px',
- showOverflowTooltip: true,
+ width: '150px',
}, {
label: '鐩戞帶椤圭洰',
prop: 'superviseProject',
- minWidth: '150px'
+ width: '150px'
}, {
label: '琚洃鐫ｄ汉鍛�',
prop: 'supervisee',
- minWidth: '150px'
+ width: '120px'
}, {
label: '鐩戠潱鍘熷洜',
prop: 'superviseReason',
- minWidth: '150px'
+ width: '150px'
+ },{
+ dataType: 'tag',
+ label: '璁板綍鐘舵��',
+ prop: 'recordStatus',
+ width: '100',
+ formatData: (params) => {
+ if (params === 0) {
+ return '鏈紑濮�';
+ } else if (params === 1) {
+ return '寰呮壒鍑�';
+ } else if (params === 2) {
+ return '宸叉壒鍑�';
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ if (params === 0) {
+ return '';
+ } else if (params === 1) {
+ return 'warning';
+ } else if (params === 2) {
+ return 'success';
+ } else {
+ return null;
+ }
+ }
+ },{
+ dataType: 'tag',
+ label: '鎺у埗鐘舵��',
+ prop: 'accordingStatus',
+ width: '100',
+ formatData: (params) => {
+ if (params === 0) {
+ return '鏈紑濮�';
+ } else if (params === 1) {
+ return '寰呮壒鍑�';
+ } else if (params === 2) {
+ return '宸叉壒鍑�';
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ if (params === 0) {
+ return '';
+ } else if (params === 1) {
+ return 'warning';
+ } else if (params === 2) {
+ return 'success';
+ } else {
+ return null;
+ }
+ }
+ },{
+ dataType: 'tag',
+ label: '绾犳鐘舵��',
+ prop: 'correctStatus',
+ width: '100',
+ formatData: (params) => {
+ if (params === 0) {
+ return '鏈紑濮�';
+ } else if (params === 1) {
+ return '寰呮壒鍑�';
+ } else if (params === 2) {
+ return '宸叉壒鍑�';
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ if (params === 0) {
+ return '';
+ } else if (params === 1) {
+ return 'warning';
+ } else if (params === 2) {
+ return 'success';
+ } else {
+ return null;
+ }
+ }
}, {
label: '澶囨敞',
prop: 'remark',
- minWidth: '150px'
}, {
dataType: 'action',
- width: '260',
label: '鎿嶄綔',
- fixed: 'right',
operation: [
{
name: '缂栬緫',
@@ -355,6 +426,7 @@
size: 20,
total: 0
},
+ currentScrollPosition: 0,
superviseId: '',
formDia: false,
recordsDia: false,
@@ -406,11 +478,6 @@
pagination({ page, limit }) {
this.yearPage.current = page;
this.yearPage.size = limit;
- this.getYearPlanList();
- },
- pagination1({ page, limit }) {
- this.yearDetailPage.current = page;
- this.yearDetailPage.size = limit;
this.getYearPlanList();
},
// 瀵煎叆娴佺▼
@@ -473,7 +540,7 @@
this.getUserList()
},
getUserList() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 2 }).then((res) => {
this.userList = res.data;
})
},
@@ -538,6 +605,11 @@
// 骞村害璁″垝琛ㄦ牸锛岀偣鍑昏鏁版嵁鍚庡埛鏂拌鎯�
rowClick(row) {
this.superviseId = row.superviseId
+ this.getYearDetailPlan()
+ },
+ getYearDetailPlan () {
+ this.yearDetailPage.current = 1
+ this.yearDetailPage.size = 20
this.getYearDetailPlanList()
},
// 鑾峰彇骞村害鏄庣粏琛�
@@ -559,6 +631,10 @@
this.yearDetailLoading = false
})
},
+ pagination1(page) {
+ this.yearDetailPage.size = page.limit;
+ this.getYearDetailPlanList();
+ },
// 閲嶇疆鏄庣粏琛�
clearDetail() {
this.yearDetailForm = {
--
Gitblit v1.9.3