From d762fc609a101b1a82576a54f835834f4e9cd9b9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 10:54:39 +0800
Subject: [PATCH] modified: src/layout/components/Sidebar/SidebarItem.vue modified: src/router/index.js modified: src/views/CNAS/nonConformanceManage/index.vue modified: src/views/CNAS/reviewAnnualPlan/index.vue modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/basicData/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/organizational/index.vue modified: src/views/login/index.vue
---
src/views/basicData/index.vue | 14 +---
src/views/experiment/inspectionApplication/index.vue | 59 +++++++++----------
src/views/login/index.vue | 2
src/views/CNAS/nonConformanceManage/index.vue | 2
src/views/inspectionManagement/reportForInspection/index.vue | 8 --
src/views/laboratory/organizational/index.vue | 2
src/views/CNAS/satisfactionSurveys/index.vue | 2
src/layout/components/Sidebar/SidebarItem.vue | 3 +
src/router/index.js | 50 ++++++++--------
src/views/CNAS/reviewAnnualPlan/index.vue | 2
src/views/inspectionManagement/commissionInspection/index.vue | 2
11 files changed, 70 insertions(+), 76 deletions(-)
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index cf9ad14..31a901d 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -6,6 +6,9 @@
<item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
<span v-if="onlyOneChild.meta.title==='涓婚〉'">涓婚〉</span>
<span v-if="onlyOneChild.meta.title==='鍩虹鏁版嵁'">鍩虹鏁版嵁</span>
+ <span v-if="onlyOneChild.meta.title==='鏍囧噯搴�'">鏍囧噯搴�</span>
+ <span v-if="onlyOneChild.meta.title==='鎴戠殑寰呭姙'">娑堟伅寰呭姙</span>
+ <span v-if="onlyOneChild.meta.title==='鎴戠殑淇℃伅'">涓汉绠＄悊</span>
</el-menu-item>
</app-link>
</template>
diff --git a/src/router/index.js b/src/router/index.js
index b86d642..0c8e1b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,21 +42,21 @@
path: '/standardLibrary',
component: Layout,
redirect: '/standardLibrary/index',
- meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
+ // meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
children: [
{
path: 'index',
name: 'StandardLibrary',
component: () => import('@/views/standardLibrary/index'),
- meta: { title: '鏍囧噯搴�', icon: 'form' }
+ meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' }
},
- {
- path: 'specificationDetails/:id',
- name: 'SpecificationDetails',
- // hidden: true,
- component: () => import('@/views/standardLibrary/SpecificationDetails'),
- meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
- }
+ // {
+ // path: 'specificationDetails/:id',
+ // name: 'SpecificationDetails',
+ // // hidden: true,
+ // component: () => import('@/views/standardLibrary/SpecificationDetails'),
+ // meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
+ // }
]
},
{
@@ -254,19 +254,20 @@
component: Layout,
redirect: '/message/toDo',
name: 'Message',
- meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
+ // meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
children: [
{
path: 'toDo',
name: 'ToDo',
component: () => import('@/views/message/toDo/index'),
- meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
+ // meta: { title: '娑堟伅寰呭姙', icon: 'tree' }
+ meta: { title: '鎴戠殑寰呭姙', icon: 'el-icon-s-help' },
},
- {
- path: 'message',
- name: 'Message',
- component: () => import('@/views/message/message/index'),
- },
+ // {
+ // path: 'message',
+ // name: 'Message',
+ // component: () => import('@/views/message/message/index'),
+ // },
]
},
{
@@ -274,20 +275,21 @@
component: Layout,
redirect: '/personal/myInformation',
name: 'Personal',
- meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
children: [
{
path: 'myInformation',
name: 'MyInformation',
component: () => import('@/views/personal/myInformation/index'),
- meta: { title: '鎴戠殑淇℃伅', icon: 'table' }
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' }
+ meta: { title: '鎴戠殑淇℃伅', icon: 'el-icon-s-help' }
},
- {
- path: 'myBusiness',
- name: 'MyBusiness',
- component: () => import('@/views/personal/myBusiness/index'),
- meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
- }
+ // {
+ // path: 'myBusiness',
+ // name: 'MyBusiness',
+ // component: () => import('@/views/personal/myBusiness/index'),
+ // meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
+ // }
]
},
{
diff --git a/src/views/CNAS/nonConformanceManage/index.vue b/src/views/CNAS/nonConformanceManage/index.vue
index 0b1c6be..3d7e10e 100644
--- a/src/views/CNAS/nonConformanceManage/index.vue
+++ b/src/views/CNAS/nonConformanceManage/index.vue
@@ -39,7 +39,7 @@
</el-form>
<el-form class="rightBtn" style="margin-top: 10px;">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-document-add" style="margin-right: 10px;">鏂板璁板綍</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" style="margin-right: 10px;">鏂板璁板綍</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
<el-button size="small" type="primary" icon="el-icon-download">瀵煎嚭</el-button>
diff --git a/src/views/CNAS/reviewAnnualPlan/index.vue b/src/views/CNAS/reviewAnnualPlan/index.vue
index 5626a6d..0257f62 100644
--- a/src/views/CNAS/reviewAnnualPlan/index.vue
+++ b/src/views/CNAS/reviewAnnualPlan/index.vue
@@ -78,7 +78,7 @@
<el-button
size="small"
type="primary"
- icon="el-icon-document-add"
+ icon="el-icon-plus"
@click="
dialogFormVisible2 = true;
newly = {};
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
index 5082099..3b85a7b 100644
--- a/src/views/CNAS/satisfactionSurveys/index.vue
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -28,7 +28,7 @@
</el-form-item>
</el-form>
<el-form style="margin-top: 10px;">
- <el-button size="small" @click="getFillName()" icon="el-icon-document-add" type="primary">鏂板璁板綍</el-button>
+ <el-button size="small" @click="getFillName()" icon="el-icon-plus" type="primary">鏂板璁板綍</el-button>
</el-form>
</div>
<div class="library-table">
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 1b1c086..b62b911 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -17,8 +17,8 @@
<el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
<el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
</el-form-item>
- <el-form-item>
- <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
+ <el-form-item style="margin-left: 25%;">
+ <el-button class="top_div_button" type="primary" size="small" icon="el-icon-plus"
@click="centerDialogVisible = true">鏂板</el-button>
<el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
@click="deleteListClick">鍒犻櫎</el-button>
@@ -35,7 +35,7 @@
<el-form-item>
<span>椤圭洰鍒嗙粍锛�</span>
<el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
- placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
+ placeholder="璇疯緭鍏ラ」鐩垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
</el-form-item>
<el-row :gutter="24">
<el-col :span="12"><el-form-item prop="name" required><span>椤圭洰鍚嶇О锛�</span>
@@ -193,12 +193,8 @@
});
},
handleClose(done) {
- this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.centerDialogVisible = false;
- done();
- })
- .catch((_) => {});
+ this.centerDialogVisible = false;
+ done();
},
selectProductModelTable() {
selectproductModelApi(this.params).then((res) => {
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index bdf2da8..31f2a90 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -29,7 +29,7 @@
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
@@ -229,13 +229,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.deliverydate"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -243,13 +243,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鎴愬搧缂栫爜锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鎴愬搧鍚嶇О锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -257,13 +257,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.modelandspecification"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -271,7 +271,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -673,8 +673,9 @@
},
// 鏂板妫�楠�
async addInspection() {
+ let obj = {};
if (this.type === 0) {
- addInspect({
+ obj = {
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
@@ -687,18 +688,10 @@
type: this.type,
unit: this.infoForm.unit,
version: this.version
- }).then(res => {
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
- this.$router.push(`Viewdetails/${res.data}`)
- }).catch(error=>{
- this.$message.error(error.message);
- })
+ }
}
if (this.type === 1) {
- const res = await addInspect({
+ obj = {
endTime: this.commisionSelection.checkdate[1],
formTime: this.commisionSelection.formTime,
mcode: this.commisionSelection.mcode,
@@ -710,30 +703,34 @@
type: this.type,
unit: this.commisionSelection.unit,
version: this.version
- })
+ }
}
if (this.type === 2) {
- const res = await addInspect({
- endTime: '2023-08-15',
+ obj = {
+ endTime: this.finishedTable.checkdate[1],
formTime: this.finishedTable.deliverydate,
mcode: this.finishedTable.code,
name: this.finishedTable.name,
num: parseInt(this.finishedTable.amount),
specifications: this.finishedTable.modelandspecification,
- startTime: '2023-08-14',
+ startTime: this.finishedTable.checkdate[1],
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
version: this.version
- })
+ }
}
- this.type = 0
- this.checkTypeVisible = false
- // this.$message({
- // message: '娣诲姞鎴愬姛锛�',
- // type: 'success'
- // });
- // this.$router.push({name: 'Viewdetails'})
+ addInspect(obj).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.type = 2
+ this.checkTypeVisible = false
+ this.$router.push(`Viewdetails/${res.data}`)
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 2bf4083..36860a8 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -251,7 +251,7 @@
this.addReportDialog = false
},
checkSelect(row) {
- if (row.type === 1) {
+ if (row.inspection_status === 2) {
return false;
} else {
return true;
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index c4d1f48..e3dd70b 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -146,9 +146,6 @@
import {
getRawMaterialList,
addInspect,
- selectInspectsListById,
- selectUser,
- selectEquipment,
deleteMaterial,
addMaterial,
getMaterielName,
@@ -156,7 +153,6 @@
getChooseVersion,
lookProByVer
} from '@/api/inspection/rawmaterial'
-import ItemVue from '@/layout/components/Sidebar/Item.vue'
export default {
data() {
return {
@@ -406,7 +402,7 @@
"name": val.materialName,
"num": val.quantity,
"specifications": val.specificationsModels,
- "specificationsId": val.specificationsId,
+ "specificationId": val.specificationsId,
"startTime": dateArr[0],
"supplier": val.supplierName,
"type": val.type,
@@ -425,7 +421,7 @@
this.$message.success('鎶ユ鎴愬姛')
this.$router.push(`/experiment/Viewdetails/${res.data}`)
}).catch(error =>{
- this.$message.error('鎶ユ澶辫触')
+ this.$message.error(error.message)
});
},
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
diff --git a/src/views/laboratory/organizational/index.vue b/src/views/laboratory/organizational/index.vue
index aa83bc1..b8e8d8a 100644
--- a/src/views/laboratory/organizational/index.vue
+++ b/src/views/laboratory/organizational/index.vue
@@ -23,7 +23,7 @@
<el-button
type="primary"
size="small"
- icon="el-icon-circle-plus-outline"
+ icon="el-icon-plus"
@click="dialogVisible = true"
>鏂板</el-button
>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1d73885..3076e66 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -118,7 +118,7 @@
<div class="title_big">娆㈣繋鎮ㄧ櫥褰曪紒</div>
<div class="title_small">瑁呭鐢电紗LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="elform" :hide-required-asterisk="true">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username">
+ <el-form-item label="璐﹀彿" prop="username">
<el-input v-model="ruleForm.username" placeholder="璇疯緭鍏ヨ处鍙�" clearable></el-input>
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
--
Gitblit v1.9.3