From 1c21a8b4a9e735635a952dcf03b31f288adab2e5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 三月 2025 13:29:54 +0800
Subject: [PATCH] 合并装备代码更新
---
src/views/business/unpass/index.vue | 40 ++++++------
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 2
src/views/business/rawMaterialInspection/index.vue | 19 ++----
src/views/CNAS/personnel/personnelInfo/components/Edit.vue | 58 +++---------------
src/views/business/productOrder/components/cable-config.vue | 2
src/views/business/unpass/index-manage.vue | 56 +++++++++---------
6 files changed, 68 insertions(+), 109 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index 0076ed3..2e6d1dd 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -103,25 +103,23 @@
</el-table>
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鐢ㄦ埛" width="70%">
- <div class="search" style="margin-bottom: 9px;">
- <div class="search_thing">
- <div class="search_label">鐢ㄦ埛鍚嶏細</div>
- <div class="search_input">
+ <div>
+ <el-form :model="addUserTableInfo" ref="addUserTableInfo" size="small" :inline="true" label-position="left" label-width="100">
+ <el-form-item label="鐢ㄦ埛鍚�" prop="name">
<el-input
v-model="addUserTableInfo.name"
clearable
placeholder="璇疯緭鍏�"
size="small"
- @keyup.enter.native="selectUserList"
+ @input="selectUserList"
></el-input>
- </div>
- </div>
+ </el-form-item>
+ </el-form>
</div>
<div v-if="selectUserDia" class="body" style="height: 60vh;">
<lims-table :tableData="tableData1" :column="column1"
:isSelection="true" :handleSelectionChange="selectMethod"
- @pagination="pagination1" :height="'calc(100vh - 290px)'"
- :page="page1" :tableLoading="tableLoading1"></lims-table>
+ height="500" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -203,7 +201,7 @@
if (params == 0) {
return '鍚敤'
} else {
- return ''
+ return '鍋滅敤'
}
},
formatType: (params) => {
@@ -260,19 +258,16 @@
addPerson() {
this.isSelectedList = this.trainingTableData.map(item => item.userId)
this.selectUserDia = true;
+ this.selectUserList()
},
selectUserList () {
this.tableLoading1 = true
selectUserCondition({...this.addUserTableInfo}).then(res => {
- this.tableData1 = res.data.records
- this.page1.total = res.data.total
+ this.tableLoading1 = false
+ this.tableData1 = res.data
}).catch(err => {
this.tableLoading1 = false
})
- },
- pagination1 (page) {
- this.page1.size = page.limit
- this.selectUserList()
},
// 琛ㄦ牸閫夋嫨鏂规硶
selectMethod(val) {
@@ -407,32 +402,6 @@
margin-bottom: 10px;
}
-.el-divider {
- margin: 0 1em 1em 0;
-}
-
-.form__input_label {
- width: 90px;
- margin-right: 6px;
- color: #606266;
-}
-
-.form__input_label2 {
- width: 210px;
- margin-right: 6px;
- color: #606266;
-}
-.search_thing {
- display: flex;
- align-items: center
-}
-.search_label {
- width: 120px;
-}
-.pagination {
- display: flex;
- justify-content: space-between
-}
.items_center {
float: left;
@@ -444,10 +413,5 @@
width: 50%;
float: right;
margin-bottom: 1em;
-}
-
-.search {
- width: 180px;
- padding: 0 16px;
}
</style>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index 3936a69..8b3cdf7 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -57,7 +57,7 @@
</div>
<div v-if="selectUserDia" class="body" style="height: 60vh;">
<lims-table :tableData="tableData1" :column="column1" :isSelection="true" :handleSelectionChange="selectMethod"
- height="560" :tableLoading="tableLoading1"></lims-table>
+ height="520" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
diff --git a/src/views/business/productOrder/components/cable-config.vue b/src/views/business/productOrder/components/cable-config.vue
index 46c3e9e..3e04ae7 100644
--- a/src/views/business/productOrder/components/cable-config.vue
+++ b/src/views/business/productOrder/components/cable-config.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="search_form">
- <div v-if="currentTab=='缁濈紭'">
+ <div v-if="currentTab=='缁濈紭'" style="display: flex">
<el-radio-group v-model="currentTab" size="small" style="margin-right: 20px;" @input="changeTab">
<el-radio-button label="缁濈紭">缁� 缂�</el-radio-button>
</el-radio-group>
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index bc5b92f..c4631d8 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -25,8 +25,8 @@
<el-form-item>
<el-button v-if="tabIndex === 3 || tabIndex === 4" :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
style="color: #3A7BFA;" type="text" @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
- <el-button size="mini" icon="el-icon-search" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- <el-button size="mini" @click="refresh()" icon="el-icon-refresh">閲� 缃�</el-button>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="mini" @click="refresh()" >閲� 缃�</el-button>
</el-form-item>
</el-row>
<el-row>
@@ -140,11 +140,6 @@
size="small">
<el-option :value="1" label="杩囨湡鐗╂枡"></el-option>
</el-select>
- </el-form-item>
- <!-- TODO:蹇呭～ -->
- <el-form-item class="declareObj-form-item" label="渚涘簲鍟嗘壒鍙�:" prop="buyUnitMeas">
- <el-input v-model="declareObj.buyUnitMeas" :disabled="declareType !== 'add'" clearable class="addObj-info"
- size="small"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -313,7 +308,6 @@
tableData1: [],
tableLoading1: false,
column1: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -351,7 +345,7 @@
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
- { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
@@ -376,6 +370,7 @@
}
}
},
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{ label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
@@ -400,7 +395,7 @@
},
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
- { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+ { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{
dataType: 'action',
fixed: 'right',
@@ -584,7 +579,7 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList() {
this.tableLoading1 = true
- if (null != this.componentData.date) {
+ if(null != this.componentData.date){
this.componentData.beginDeclareDate = this.componentData.date[0]
this.componentData.endDeclareDate = this.componentData.date[1]
} else {
@@ -604,7 +599,7 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList() {
this.tableLoading1 = true
- if (null != this.componentData.date) {
+ if(null != this.componentData.date){
this.componentData.beginDeclareDate = this.componentData.date[0]
this.componentData.endDeclareDate = this.componentData.date[1]
} else {
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index e478a36..35eb7b6 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -83,34 +83,34 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- {
- label: "OA瀹℃牳鐘舵��",
- prop: "oaState",
- width: "100px",
- dataType: "tag",
- formatData: (params) => {
- if (params == 1) {
- return "寰呭鏍�";
- } else if(params == 2) {
- return "瀹℃牳涓�";
- } else if(params == 3) {
- return "閫氳繃";
- } else {
- return "椹冲洖";
- }
- },
- formatType: (params) => {
- if (params == 1) {
- return "warning";
- } else if(params == 2) {
- return "info";
- } else if(params == 3) {
- return "success";
- } else {
- return "danger";
- }
- },
- },
+ // {
+ // label: "OA瀹℃牳鐘舵��",
+ // prop: "oaState",
+ // width: "100px",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 1) {
+ // return "寰呭鏍�";
+ // } else if(params == 2) {
+ // return "瀹℃牳涓�";
+ // } else if(params == 3) {
+ // return "閫氳繃";
+ // } else {
+ // return "椹冲洖";
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 1) {
+ // return "warning";
+ // } else if(params == 2) {
+ // return "info";
+ // } else if(params == 3) {
+ // return "success";
+ // } else {
+ // return "danger";
+ // }
+ // },
+ // },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{
label: "闆朵欢鍙�",
diff --git a/src/views/business/unpass/index.vue b/src/views/business/unpass/index.vue
index e52f63b..2e796ae 100644
--- a/src/views/business/unpass/index.vue
+++ b/src/views/business/unpass/index.vue
@@ -43,26 +43,26 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- {
- label: "OA瀹℃牳鐘舵��",
- prop: "oaState",
- width: "100px",
- dataType: "tag",
- formatData: (params) => {
- if (params == 0) {
- return "鍚�";
- } else {
- return "鏄�";
- }
- },
- formatType: (params) => {
- if (params == 0) {
- return "danger";
- } else {
- return "primary";
- }
- },
- },
+ // {
+ // label: "OA瀹℃牳鐘舵��",
+ // prop: "oaState",
+ // width: "100px",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 0) {
+ // return "鍚�";
+ // } else {
+ // return "鏄�";
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 0) {
+ // return "danger";
+ // } else {
+ // return "primary";
+ // }
+ // },
+ // },
{
dataType: 'action',
fixed: 'right',
--
Gitblit v1.9.3