From 5eeb8864bebb1dc4f97f2feef32b742d8a9a10d5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 14 九月 2022 15:43:04 +0800
Subject: [PATCH] 1.新增报表管理菜单
---
src/views/sbgl/bybw.vue | 148 +++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 72 deletions(-)
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index ddff0d5..853645c 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -16,10 +16,10 @@
>
<div class="elForm">
<el-form-item label="閮ㄤ綅缂栫爜" style=" display: flex;">
- <el-input v-model="form.checkitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.maiitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
- <el-input v-model="form.checkitemname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.maiitemname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="淇濆吇瑕佹眰" style=" display: flex;">
<el-input v-model="form.maidescr" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -62,15 +62,16 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="code"
label="閮ㄤ綅缂栫爜"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="name"
label="閮ㄤ綅鍚嶇О"
sortable="custom"
/>
@@ -78,12 +79,29 @@
prop="description"
label="淇濆吇瑕佹眰"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.description">{{ row.description }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="parentorg_name"
+ prop="isscan"
label="閫夋嫨鎵爜"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isscan==='Y'">
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.isscan==='N'">
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ 鍚�
+ </div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -119,7 +137,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceMaiItemSearch"
/>
@@ -135,30 +153,30 @@
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="閮ㄤ綅缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+ <el-form-item label="閮ㄤ綅缂栫爜" prop="maiitemcode">
+ <el-input v-model="dialogForm.maiitemcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
- <el-form-item label="閮ㄤ綅鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 200px" />
+ <el-form-item label="閮ㄤ綅鍚嶇О" prop="maiitemname">
+ <el-input v-model="dialogForm.maiitemname" style="width: 200px" />
</el-form-item>
- <el-form-item prop="SupUnit" label="閫夋嫨鎵爜">
+ <el-form-item required label="閫夋嫨鎵爜">
<el-select
- v-model="dialogForm.SupUnit"
+ v-model="dialogForm.isqrcode"
style="width: 200px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
>
<el-option
- v-for="item in SupUnitArr"
+ v-for="item in isqrcodeArr"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item label="淇濆吇瑕佹眰" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 200px" />
+ <el-form-item label="淇濆吇瑕佹眰" prop="maiitemdescr">
+ <el-input v-model="dialogForm.maiitemdescr" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -177,42 +195,23 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { DeviceCheckItemSearch, DeviceMaiItemSearch } from '@/api/sbgl'
-import ImportPicker from '@/components/ImportPicker'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { AddUpdateDeviceMaiItem, DeleteDeviceMaiItem, DeviceMaiItemSearch } from '@/api/sbgl'
+import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
+
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
form: {
- checkitemcode: '', // 閮ㄤ綅缂栫爜
- checkitemname: '', // 閮ㄤ綅鍚嶇О
+ maiitemcode: '', // 閮ㄤ綅缂栫爜
+ maiitemname: '', // 閮ㄤ綅鍚嶇О
maidescr: '', // 淇濆吇瑕佹眰
isqrcode: '', // 閫変腑鎵爜
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -229,24 +228,20 @@
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ id: '',
+ maiitemcode: '',
+ maiitemname: '',
+ maiitemdescr: '',
+ isqrcode: 'N',
+ OperType: ''
},
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ maiitemcode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
+ maiitemname: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
]
},
@@ -302,10 +297,10 @@
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ this.form.maiitemcode = ''
+ this.form.maiitemname = ''
+ this.form.maidescr = ''
+ this.form.isqrcode = ''
this.getDeviceMaiItemSearch()
},
@@ -320,9 +315,11 @@
this.dialogVisible = true
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.id = row.id
+ this.dialogForm.maiitemcode = row.code
+ this.dialogForm.maiitemname = row.name
+ this.dialogForm.maiitemdescr = row.description
+ this.dialogForm.isqrcode = row.isscan
})
},
// 鍒犻櫎鎸夐挳
@@ -332,9 +329,12 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
+ DeleteDeviceMaiItem({ maiitemcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceMaiItemSearch()
}
})
@@ -344,10 +344,11 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.id = ''
+ this.dialogForm.maiitemcode = ''
+ this.dialogForm.maiitemname = ''
+ this.dialogForm.maiitemdescr = ''
+ this.dialogForm.isqrcode = 'N'
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -359,12 +360,15 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
+ id: this.dialogForm.id,
+ maiitemcode: this.dialogForm.maiitemcode,
+ maiitemname: this.dialogForm.maiitemname,
+ maiitemdescr: this.dialogForm.maiitemdescr,
+ isqrcode: this.dialogForm.isqrcode,
+ OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- AddUpdateOrganization(data).then(res => {
+ console.log(data)
+ AddUpdateDeviceMaiItem(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
--
Gitblit v1.9.3