From 82bcd9ca9ee68118c6d3ec82ac4aa5361fbc668f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 27 二月 2024 13:35:22 +0800
Subject: [PATCH] 功能调整
---
static/js/menu.js | 2
src/assets/api/controller.js | 1
src/components/view/5capacity-scope.vue | 130 ++++++++++++++++++++++++++++---------------
3 files changed, 87 insertions(+), 46 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e0385f8..b361d0a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -66,6 +66,7 @@
addEnum: "/enum/addEnum", //娣诲姞鏋氫妇
upEnum: "/enum/upEnum", //淇敼鏋氫妇
delEnum: "/enum/delEnum", //鍒犻櫎鏋氫妇
+ selectEnumByCategory: "/enum/selectEnumByCategory", //閫氳繃鍒嗙被鏌ヨ鏋氫妇
}
const capacityScope = {
diff --git a/src/components/view/5capacity-scope.vue b/src/components/view/5capacity-scope.vue
index cf0ee79..a664762 100644
--- a/src/components/view/5capacity-scope.vue
+++ b/src/components/view/5capacity-scope.vue
@@ -40,19 +40,19 @@
<div class="role_manage">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">
- <el-radio-group v-model="radio" @change="selectorSwitch">
- <el-radio-button label="0">妫�楠岄」鐩弬鏁�</el-radio-button>
- <el-radio-button label="1">妫�楠屽璞�</el-radio-button>
- </el-radio-group>
- </el-col>
+ <el-col :span="12" style="padding-left: 20px;">
+ <el-radio-group v-model="radio" @change="selectorSwitch">
+ <el-radio-button label="0">妫�楠岄」鐩弬鏁�</el-radio-button>
+ <el-radio-button label="1">妫�楠屽璞�</el-radio-button>
+ </el-radio-group>
+ </el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
- <el-button size="medium" icon="el-icon-delete" >鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
- <div class="search" v-if="showItemParameter">
+ <div class="search" v-if="showItemParameter">
<div class="search_thing">
<div class="search_label">妫�楠岄」锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
@@ -63,7 +63,7 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing">
<div class="search_label">璁惧缁勶細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div>
@@ -74,9 +74,11 @@
</div>
</div>
<div class="table" v-if="showItemParameter">
- <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList" :upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter" :componentData="itemParameterData" :key="upIndex"/>
+ <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
+ :upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
+ :componentData="itemParameterData" :key="upIndex" />
</div>
- <div class="search testObject" v-if="showTestObject">
+ <div class="search testObject" v-if="showTestObject">
<div class="search_thing">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
@@ -88,7 +90,9 @@
</div>
</div>
<div class="table" v-if="showTestObject">
- <ValueTable ref="testObjectTable" :url="$api.capacityScope.selectTestObjectList" :upUrl="$api.capacityScope.upTestObject" :delUrl="$api.capacityScope.delTestObject" :componentData="testObjectData" :key="upIndex"/>
+ <ValueTable ref="testObjectTable" :url="$api.capacityScope.selectTestObjectList"
+ :upUrl="$api.capacityScope.upTestObject" :delUrl="$api.capacityScope.delTestObject"
+ :componentData="testObjectData" :key="upIndex" />
</div>
</div>
</template>
@@ -101,9 +105,9 @@
},
data() {
return {
- radio: '0',
- showItemParameter: true,
- showTestObject: false,
+ radio: '0',
+ showItemParameter: true,
+ showTestObject: false,
itemParameterData: {
entity: {
inspectionItem: null,
@@ -122,19 +126,23 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field:[]
- },{
+ field: []
+ }, {
id: 'delete',
font: '鍒犻櫎',
type: 'text',
method: 'doDiy'
}],
tagField: {},
- selectField: {},
- requiredAdd:['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup'],
- requiredUp:['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup']
+ selectField: {
+ inspectionItemType: {
+ select: []
+ }
+ },
+ requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup'],
+ requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup']
},
- testObjectData: {
+ testObjectData: {
entity: {
specimenName: null,
orderBy: {
@@ -150,8 +158,8 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field:['createUserName', 'updateUserName']
- },{
+ field: ['createUserName', 'updateUserName']
+ }, {
id: 'delete',
font: '鍒犻櫎',
type: 'text',
@@ -159,8 +167,8 @@
}],
tagField: {},
selectField: {},
- requiredAdd:['specimenName'],
- requiredUp:['specimenName']
+ requiredAdd: ['specimenName'],
+ requiredUp: ['specimenName']
},
itemParameterEntityCopy: {},
testObjectDataEntityCopy: {},
@@ -172,39 +180,71 @@
mounted() {
this.itemParameterEntityCopy = this.HaveJson(this.itemParameterData.entity)
this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity)
+ this.selectEnumByCategory()
},
methods: {
- selectorSwitch() {
- if(this.radio === '0') {
- this.showItemParameter = true;
- this.showTestObject = false;
+ selectorSwitch() {
+ if (this.radio === '0') {
+ this.showItemParameter = true;
+ this.showTestObject = false;
this.$nextTick(() => {
this.$refs.itemParameterTable.selectList()
})
- } else {
- this.showTestObject = true;
- this.showItemParameter = false;
- }
+ } else {
+ this.showTestObject = true;
+ this.showItemParameter = false;
+ }
},
refreshTable() {
- if(this.radio === '0') {
- this.$refs['itemParameterTable'].selectList()
- } else {
- this.$refs['testObjectTable'].selectList()
- }
+ if (this.radio === '0') {
+ this.$refs['itemParameterTable'].selectList()
+ } else {
+ this.$refs['testObjectTable'].selectList()
+ }
},
refresh() {
this.itemParameterData.entity = this.HaveJson(this.itemParameterEntityCopy)
this.testObjectData.entity = this.HaveJson(this.testObjectDataEntityCopy)
this.upIndex++
},
- openAdd(){
- if(this.radio === '0') {
- this.$refs.itemParameterTable.openAddDia(this.$api.capacityScope.addItemParameter);
- } else {
- this.$refs.testObjectTable.openAddDia(this.$api.capacityScope.addTestObject);
- }
-
+ openAdd() {
+ if (this.radio === '0') {
+ this.$refs.itemParameterTable.openAddDia(this.$api.capacityScope.addItemParameter);
+ } else {
+ this.$refs.testObjectTable.openAddDia(this.$api.capacityScope.addTestObject);
+ }
+ },
+ selectEnumByCategory(){
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠岄」绫诲瀷"
+ }).then(res=>{
+ this.itemParameterData.selectField.inspectionItemType.select = res.data
+ })
+ },
+ // 鏉冮檺鍒嗛厤
+ getPower(){
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ let up = false
+ let add = false
+ let del = false
+ for (var i = 0; i < power.length; i++) {
+ if(power[i].menuMethod=='upItemParameter'){
+ up = true
+ }
+ if(power[i].menuMethod=='delItemParameter'){
+ del = true
+ }
+ if(power[i].menuMethod=='addItemParameter'){
+ add = true
+ }
+ }
+ if(!del){
+ this.componentData.do.splice(1, 1)
+ }
+ if(!up){
+ this.componentData.do.splice(0, 1)
+ }
+ this.addPower = add
}
}
}
diff --git a/static/js/menu.js b/static/js/menu.js
index a4c04ea..63ea8ca 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -240,7 +240,7 @@
i: "font icon-24gl-clipboardList",
u: "5capacity-scope",
g: "C鑳藉姏鑼冨洿鍜岃祫璐�",
- p: ""
+ p: "selectItemParameterList"
}, {
v: "鍦烘墍鎴栬鏂�",
i: "font icon-24gl-clipboardList",
--
Gitblit v1.9.3