From 63116158434214f23d1318f54b78de1d0f47ab4e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 15:28:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard.vue | 7 ++++---
static/js/menu.js | 16 ++++++++--------
src/components/view/a5-laboratory-management.vue | 1 -
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index d3b1cb9..8a3ad69 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -283,7 +283,6 @@
return m
})
this.options[0].children = arr;
- this.fileComponentData.tagField.type.select = arr;
this.fileComponentData.selectField.type.select = arr;
})
},
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dccc600..ff51e17 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -230,7 +230,7 @@
<el-table-column prop="manHourGroup" label="宸ユ椂鍒嗙粍" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="templateId" label="妯℃澘" width="200">
<template slot-scope="scope">
- <el-select v-model="scope.row.templateId" size="small" filterable
+ <el-select v-model="scope.row.templateId" size="small" filterable :disabled="!upStandardProduct"
@change="(value)=>upStandardProductListOfTemplate(value,scope.row.id)">
<el-option v-for="(a, ai) in templateList" :key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
@@ -247,8 +247,8 @@
style="position: absolute;right: 16px;bottom: 1px;"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-size="pageSize"
layout="total, prev, pager, next, jumper"
+ :page-size="50"
:total="total">
</el-pagination>
</el-row>
@@ -490,7 +490,6 @@
sectionList: [],
templateList: [],
total:0,
- pageSize:100,
currentPage:1,
standardId: 0,
moreEdit:false,
@@ -525,6 +524,8 @@
this.upIndex++
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
+ this.total = 0
+ this.currentPage = 1
this.selectTree = ''
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
diff --git a/static/js/menu.js b/static/js/menu.js
index 4f54acf..0fb4b37 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport costStatistics selectWarehouse",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -50,7 +50,7 @@
{
v: "鏍囧噯闆�",
i: "font icon-biaozhunji",
- p: "",
+ p: "selectStandardTreeList selectStandardTemplatePageList",
c: [{
v: "鏍囧噯搴�",
i: "font icon-erjidaohang",
@@ -71,7 +71,7 @@
v: "宸ユ椂绠＄悊",
i: "font icon-erjidaohang",
u: "b3-work-time-management",
- p: ""
+ p: "selectAuxiliaryWorkingHours"
}, {
v: "浜哄憳鑰冨嫟",
i: "font icon-erjidaohang",
@@ -101,7 +101,7 @@
v: "鐝",
i: "font icon-erjidaohang",
u: "b3-classes",
- p: ""
+ p: "performanceShiftPage performanceShiftPageYear"
}]
},
{
@@ -127,7 +127,7 @@
v: "鏍峰搧缂洪櫡鎸囨暟",
i: "font icon-erjidaohang",
u: "b4-sample-defects",
- p: ""
+ p: "selectSampleDefects"
}, {
v: "鑰楁潗缁熻",
i: "font icon-erjidaohang",
@@ -174,12 +174,12 @@
v: "瑙掕壊绠＄悊",
i: "el-icon-s-tools",
u: "role-manage",
- p: ""
+ p: "selectRoleLists"
}, {
v: "鐢ㄦ埛绠＄悊",
i: "el-icon-s-tools",
u: "person-manage",
- p: ""
+ p: "selectUserList"
}, {
v: "瀹㈡埛绠＄悊",
i: "el-icon-s-tools",
@@ -189,7 +189,7 @@
v: "绯荤粺鏃ュ織",
i: "el-icon-s-tools",
u: "system-log",
- p: "selectSystemLogList"
+ p: ""
}, {
v: "娑堟伅璇︽儏",
i: "el-icon-s-tools",
--
Gitblit v1.9.3