From 95fb18f99827a5eeefa1ebf661c6f6459646b87b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 20 七月 2022 19:27:37 +0800
Subject: [PATCH] 1.修改bug 2.正在开发缺陷定义
---
src/views/zlgl/gxjybz.vue | 169 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 68 deletions(-)
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 8494f30..c20637e 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -109,21 +109,29 @@
:visible.sync="dialogVisible"
width="800"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<div style="margin-bottom: 10px">
<i class="el-icon-s-comment" style="color:#42b983;" /> 鏍囧噯淇℃伅锛�
</div>
- <el-form ref="dialogForm" style="margin-left: 80px" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form
+ ref="dialogForm"
+ style="margin-left: 80px"
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="80px"
+ >
<el-form-item label="鏍囧噯缂栫爜" prop="code">
<el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" prop="name">
- <el-input v-model="dialogForm.name" style="width: 200px" />
+ <el-input v-model="dialogForm.name" :disabled="operation==='check'" style="width: 200px" />
</el-form-item>
<el-form-item label="鎻忚堪">
- <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
+ <el-input v-model="dialogForm.description" :disabled="operation==='check'" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<div style="margin-bottom: 10px">
@@ -150,52 +158,56 @@
/>
<el-table-column
prop="code"
- label="妫�楠屾爣鍑嗙紪鐮�"
+ label="妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <div v-if="row.isVisible===0" style="display: flex;">
+ <div>{{ row.code }}</div>
+ <div style="margin-left: 10px">{{ row.name }}</div>
+ </div>
+
<el-select
v-if="row.isVisible===1"
v-model="row.code"
filterable
:popper-append-to-body="false"
- style="width: 200px;"
+ style="width: 400px;"
placeholder="璇烽�夋嫨"
@change="val=>changeCode(val,row)"
>
<el-option
v-for="item in JYSelectArr"
:key="item.code"
- :label="item.code"
+ :label="item.code+''+item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="name"
- label="妫�楠屾爣鍑嗗悕绉�"
- >
- <template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.name }}</div>
- <el-select
- v-if="row.isVisible===1"
- v-model="row.name"
- filterable
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- @change="val=>changeName(val,row)"
- >
- <el-option
- v-for="item in JYSelectArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="妫�楠屾爣鍑嗗悕绉�"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.isVisible===0">{{ row.name }}</div>-->
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.name"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="val=>changeName(val,row)"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in JYSelectArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="descr"
label="妫�楠屾弿杩版弿杩�"
@@ -206,6 +218,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="operation!=='check'"
label="鎿嶄綔"
>
<template slot-scope="{row}">
@@ -222,8 +235,9 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">鎻� 浜�</el-button>
+ <el-button v-if="operation==='check'" @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <el-button v-if="operation!=='check'" @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-if="operation!=='check'" type="primary" @click="dialogVisibleConfirm">鎻� 浜�</el-button>
</div>
</span>
</el-dialog>
@@ -232,9 +246,13 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { AddUpdateStepCheckStaned, StepCheckItemSelect, StepCheckStanedSearch } from '@/api/zlgl'
+import { DeleteOrganization } from '@/api/jcsz'
+import {
+ AddUpdateStepCheckStaned, DeleteStepCheckStaned,
+ EditStepCheckStanedSearch,
+ StepCheckItemSelect,
+ StepCheckStanedSearch
+} from '@/api/zlgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -294,7 +312,6 @@
JYTableData: [], // 瀵硅瘽妗嗘楠屼俊鎭〃鏍�
JYSelectArr: [], // 妫�楠岄」鐩笅鎷夋暟缁�
JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
- // JYAddFlag: true // 鏄惁鍙繘琛屾坊鍔�
}
},
created() {
@@ -348,17 +365,28 @@
edit(operation, row) {
this.operation = operation
this.dialogVisible = true
-
- this.$nextTick(() => {
- this.dialogForm.OrgCode = row.code
- this.dialogForm.OrgName = row.name
- this.dialogForm.SupUnit = row.descr
- })
+ this.getEditStepCheckStanedSearch(row.code)
},
// 鏌ョ湅
check(operation, row) {
this.operation = operation
this.dialogVisible = true
+ this.getEditStepCheckStanedSearch(row.code)
+ },
+ async getEditStepCheckStanedSearch(val) {
+ const { data: res } = await EditStepCheckStanedSearch({ defectcode: val })
+ this.dialogForm.code = res.code
+ this.dialogForm.name = res.name
+ this.dialogForm.description = res.description
+ this.JYTableData = res.Data
+ this.JYTableData.forEach(item => {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ item.isVisible = 0
+ item.descr = item.stepcheckitem_desc
+ item.number = number
+ this.JYSelectedArr.push(item.code)
+ })
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -367,7 +395,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
+ DeleteStepCheckStaned({ stanedcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
this.getStepCheckStanedSearch()
@@ -393,7 +421,6 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- console.log(this.JYSelectedArr.map(i => i))
this.$refs.dialogForm.validate(valid => {
if (valid) {
const tableData = []
@@ -431,21 +458,20 @@
})
},
// 鑾峰彇妫�楠岄」鐩笅鎷夊垪琛�
- async getStepCheckItemSelect() {
+ async getStepCheckItemSelect() {
const { data: res } = await StepCheckItemSelect()
this.JYSelectArr = res
},
// 妫�楠屾爣鍑嗙紪鐮佸�兼敼鍙�
changeCode(val, row) {
- console.log(this.JYSelectedArr.map(i => i))
row.name = this.JYSelectArr.find(it => it.code === val).name
row.descr = this.JYSelectArr.find(it => it.code === val).descr
},
// 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
- changeName(val, row) {
- row.code = this.JYSelectArr.find(it => it.code === val).code
- row.descr = this.JYSelectArr.find(it => it.code === val).descr
- },
+ // changeName(val, row) {
+ // row.code = this.JYSelectArr.find(it => it.code === val).code
+ // row.descr = this.JYSelectArr.find(it => it.code === val).descr
+ // },
// 妫�楠屾柊澧�
JYadd() {
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
@@ -485,28 +511,30 @@
},
JYsave(row) {
if (row.code === '') {
- return this.$message.info('妫�楠屾爣鍑嗕唬鐮佷笉鑳戒负绌猴紒')
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
}
- if (row.name === '') {
- return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
- }
+ // if (row.name === '') {
+ // return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
+ // }
if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠屾爣鍑嗕唬鐮佷笉鑳介噸澶嶏紒')
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
} else {
this.JYSelectedArr.push(row.code)
}
- // if (row.code === this.JYTableData.find(item => item.code).code) {
- // return this.$message.info('妫�楠屾爣鍑嗕唬鐮佷笉鑳介噸澶嶏紒')
- // }
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
item.isVisible = 0
- this.JYTableData.splice(index, 1, { number: row.number, code: row.code, name: row.name, isVisible: 0, descr: row.descr })
+ this.JYTableData.splice(index, 1, {
+ number: row.number,
+ code: row.code,
+ name: row.name,
+ isVisible: 0,
+ descr: row.descr
+ })
}
})
- console.log(this.JYTableData, 898989)
},
JYcancel(row) {
this.JYTableData.forEach((item, index) => {
@@ -536,9 +564,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -598,6 +628,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -674,21 +705,23 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-checkbox__inner:hover{
- border-color: $main_color;
-}
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-checkbox__inner:hover {
border-color: $main_color;
}
-::v-deep .el-select__caret{
+::v-deep .el-textarea__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
--
Gitblit v1.9.3