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/api/zlgl.js | 46 ++
src/views/zlgl/gxjy.vue | 631 +++++++++++++++++++++++++++++++
src/views/scgl/gd.vue | 5
src/views/zlgl/qxdy.vue | 1
src/views/jcsz/jsqd.vue | 43 -
src/views/scgl/sckbg.vue | 273 -------------
src/views/template.vue | 6
src/views/zlgl/gxjybz.vue | 169 +++++---
src/views/zlgl/gxjyxm.vue | 1
src/components/Pagination/index.vue | 2
10 files changed, 802 insertions(+), 375 deletions(-)
diff --git a/src/api/zlgl.js b/src/api/zlgl.js
index ca6c676..e33151c 100644
--- a/src/api/zlgl.js
+++ b/src/api/zlgl.js
@@ -70,6 +70,7 @@
params: data
})
}
+
// 宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜�
export function AddUpdateStepCheckItem(data) {
return request({
@@ -78,6 +79,7 @@
data
})
}
+
// 宸ュ簭妫�楠岄」鐩垹闄�
export function DeleteStepCheckItem(data) {
return request({
@@ -86,3 +88,47 @@
params: data
})
}
+
+// 宸ュ簭妫�楠屾爣鍑嗗垹闄�
+export function DeleteStepCheckStaned(data) {
+ return request({
+ url: 'QualityManagement/DeleteStepCheckStaned',
+ method: 'post',
+ params: data
+ })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+export function MesOrderStepCheckSearch(data) {
+ return request({
+ url: 'ProductionManagement/MesOrderStepCheckSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+export function MesOrderStepCheckSelect() {
+ return request({
+ url: 'ProductionManagement/MesOrderStepCheckSelect',
+ method: 'get'
+ })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
+export function MesOrderStepCheckItemList(data) {
+ return request({
+ url: 'ProductionManagement/MesOrderStepCheckItemList',
+ method: 'get',
+ params: data
+ })
+}
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+export function SaveMesOrderStepCheckItem(data) {
+ return request({
+ url: 'ProductionManagement/SaveMesOrderStepCheckItem',
+ method: 'post',
+ data
+ })
+}
+
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 51bcb07..91fec95 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -36,7 +36,7 @@
pageSizes: {
type: Array,
default() {
- return [5, 10, 20, 100]
+ return [10, 20, 50, 100]
}
},
layout: {
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 5d0f56b..743c65e 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -975,49 +975,24 @@
type: ''
}
const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
- // '0'鏄剧ず '1' 涓嶆樉绀�
+
this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
this.PCTrue = res[0][0].is_delete === '0'
this.APPTrue = res[1][0].is_delete === '0'
-
+ // '0'鏄剧ず '1' 涓嶆樉绀� 杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
if (this.PCTrue) {
- this.dialogFormRight.rightPCArr[0].children.forEach((item, index) => {
- if (item.is_delete === '1') {
- this.dialogFormRight.rightPCArr[0].children.splice(index, 1)
- } else {
- if (item.children.length > 0 && item.children) {
- item.children.forEach((it, ind) => {
- console.log(it, 9)
- console.log(it.is_delete, 9)
- if (it.is_delete === '1') {
- item.children.splice(ind, 1)
- }
- })
- }
- if (item.children.length === 0) {
- this.dialogFormRight.rightPCArr[0].children.splice(index, 1)
- }
- }
+ this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0')
})
}
+
if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].children.forEach((item, index) => {
- if (item.is_delete === '1') {
- this.dialogFormRight.rightAPPArr[0].children.splice(index, 1)
- } else {
- if (item.children.length > 0 && item.children) {
- item.children.forEach((it, ind) => {
- if (it.is_delete === '1') {
- item.children.splice(ind, 1)
- }
- })
- }
- if (item.children.length === 0) {
- this.dialogFormRight.rightAPPArr[0].children.splice(index, 1)
- }
- }
+ this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0')
})
}
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 6785126..6732ca5 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -997,12 +997,11 @@
if (res.code === '200') {
// 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
var args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
data: res.data
}
-
webapp_ws_ajax_run(args)
}
},
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 8d169cd..4ec892b 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,7 +1,6 @@
<template>
<div>
<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
-
<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
@@ -302,192 +301,6 @@
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
- </el-tab-pane>
- <el-tab-pane label="宸ュ簭妫�楠�">
- <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
- <div style="margin-bottom: 10px;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">鎵弿鏉＄爜锛�</div>
- <el-input
- v-model="GXform.orderstepqrcode"
- name="GXproduceCode"
- style="width: 300px"
- @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
- />
- </div>
- <!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center">
- <div style="display: flex;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style="display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style=" display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div>PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div>123-446-789</div>
- </div>
- </div>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">妫�楠屾爣鍑嗭細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div style="width: 90px;margin-left: 50px;">妫�楠屼汉鍛橈細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
- </div>
- <div>
- <el-button type="primary" @click="add">鏂板</el-button>
- </div>
- <div style="margin-top: 10px">
- <el-table
- :data="JYTableData"
- :height="(tableHeight-195)+'px'"
- border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="JYsortChange"
- >
- <el-table-column
- prop="RowNum"
- label="搴忓彿"
- />
- <!-- <el-table-column-->
- <!-- prop="bm"-->
- <!-- label="妫�楠岄」鐩紪鐮�"-->
- <!-- sortable="custom"-->
- <!-- />-->
- <el-table-column
- prop="mc"
- sortable="custom"
- label="妫�楠岄」鐩悕绉�"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="ms"
- label="妫�楠屾爣鍑嗘弿杩�"
- sortable="custom"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="jg"
- label="妫�楠岀粨鏋�"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div style="justify-content: flex-start ;">
- <el-radio v-model="radio" label="1">澶囬�夐」</el-radio>
- <el-radio v-model="radio" label="2">澶囬�夐」</el-radio>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
- <div style="display: flex;margin-top: 20px;align-items: center">
-
- <div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px">妫�楠岀粨鏋滐細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">妫�楠屽娉細</div>
- <!-- <el-input v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- </div>
-
- </div>
-
- <div style="display: flex;margin: 20px 0;align-items: center">
- <el-button type="primary">棣栨淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
- <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
- </div>
- </div>
</el-tab-pane>
</el-tabs>
@@ -990,18 +803,7 @@
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
]
},
- activeName: '',
- GXform: { // 宸ュ簭
- orderstepqrcode: '' // 鎵弿鐨勪簩缁寸爜淇℃伅
- // prop: 'wo_code', // 鎺掑簭瀛楁z
- // order: 'asc', // 鎺掑簭瀛楁
- // page: 1, // 绗嚑椤�
- // rows: 20 // 姣忛〉澶氬皯鏉�
- },
- JYTableData: [
- { RowNum: 1, bm: '001', mc: '灏哄', ms: '鏃�', jg: '鎴戞槸缁撴灉', isVisible: 0 }
- ], // 妫�楠岄」淇℃伅琛ㄦ牸
- radio: ''
+ activeName: ''
}
},
created() {
@@ -1083,11 +885,6 @@
this.form.orderstepqrcode = ''
})
}
- if (this.$refs.elTabs.currentName === '2') {
- this.$nextTick(() => {
- $("input[name='GXproduceCode']")[0].focus()
- })
- }
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
@@ -1126,10 +923,6 @@
if (res.code === '200' && res.count === 3) {
await this.WXback(res.data)
}
- }
-
- if (belong === 'GXproduceCode') {
- console.log('GXproduceCode')
}
},
// 鏌ヨ
@@ -1548,8 +1341,8 @@
]
}
const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/鎶ュ伐浜у嚭鏍囩.grf'),
data: obj
}
@@ -1571,8 +1364,8 @@
]
}
const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/澶栧崗鏀舵枡鏍囩.grf'),
data: obj
}
@@ -1584,62 +1377,6 @@
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 80
})
- },
- /*
- *妫�楠岄」淇℃伅
- * */
- JYsortChange({ column, prop, order }) {
- if (order === 'descending') {
- order = 'desc'
- } else if (order === 'ascending') {
- order = 'asc'
- } else {
- order = 'desc'
- }
- this.GXform.order = order
- this.GXform.prop = prop
- // this.getOrganizationSearch()
- },
- // 鑾峰彇宸ュ簭鍒楄〃
- // getList(){
- //
- // },
- // 鏂板
- add() {
- // this.JYTableData.forEach(item => {
- // item.isVisible = 0
- // })
-
- // let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- // number = number === 0 ? (10 + Math.random()) : number
-
- // const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
- // this.JYTableData.unshift(data)
- },
- // 鍒犻櫎
- del() {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- // UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // this.getUserGroupSearch()
- // }
- // })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 纭
- confirm() {
-
- },
- // 鍙栨秷
- cancel() {
-
}
}
}
diff --git a/src/views/template.vue b/src/views/template.vue
index 04d142a..18c02c9 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -523,5 +523,9 @@
::v-deep .el-textarea__inner:focus{
border-color: $main_color;
}
-
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
</style>
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index e69de29..d208458 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -0,0 +1,631 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
+ <div style="margin-bottom: 15px;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">鎵弿鏉＄爜锛�</div>
+ <el-input
+ v-model="form.orderstepqrcode"
+ name="GXproduceCode"
+ style="width: 300px"
+ @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
+ />
+ </div>
+ <!-- 鍏」淇℃伅 -->
+ <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div style="display: flex;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 100px">{{ form.partcode }}</div>
+ </div>
+ </div>
+ <div style="display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 100px">{{ form.partname }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 100px">{{ form.partspec }}</div>
+ </div>
+ </div>
+ <div style=" display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div>{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div>{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屾爣鍑嗭細</div>
+ <el-select
+ v-model="checkStandard"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="changeCheckStandard"
+ >
+ <el-option
+ v-for="item in checkStandardSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 50px;">妫�楠屼汉鍛橈細</div>
+ <el-select
+ v-model="checkUser"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkUserSelect"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </div>
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+ </div>
+ <div>
+ <el-button type="primary" @click="add">鏂板</el-button>
+ </div>
+ <div style="margin-top: 10px">
+ <el-table
+ ref="tableDataRef"
+ :data="JYTableData"
+ :height="(tableHeight-195)+'px'"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="100"
+ />
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="妫�楠岄」鐩紪鐮�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <el-table-column
+ prop="code"
+ label="妫�楠岄」鐩悕绉�(鍚嶇О)"
+ >
+ <template slot-scope="{row}">
+ <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
+ style="width: 400px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeCode(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.code+''+item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stepcheckitem_desc"
+ label="妫�楠屾爣鍑嗘弿杩�"
+ >
+ <template slot-scope="{row}">
+ <el-input v-if="row.isVisible===1" v-model="row.stepcheckitem_desc" placeholder="璇疯緭鍏�" />
+ <div v-else> {{ row.stepcheckitem_desc }}</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="reslut"
+ label="妫�楠岀粨鏋�"
+ >
+ <template slot-scope="{row}">
+ <el-radio-group v-model="row.reslut" size="small" @change="a=>changeRadioValue(a,row)">
+ <el-radio-button style="box-shadow: none" :label="0" @click.native.prevent="clickRadio(0,row)">
+ 鍚堟牸
+ </el-radio-button>
+ <el-radio-button style="box-shadow: none" :label="1" @click.native.prevent="clickRadio(1,row)">
+ 涓嶈壇
+ </el-radio-button>
+ </el-radio-group>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
+ <div style="display: flex;margin-top: 20px;align-items: center">
+
+ <div style="display: flex;margin-right: 50px;align-items: center">
+ <div style="width: 90px">妫�楠岀粨鏋滐細</div>
+ <el-select
+ v-model="checkResult"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkResultSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屽娉細</div>
+ <el-input v-model="checkdescr" style="width: 300px" placeholder="璇疯緭鍏�" />
+ </div>
+
+ </div>
+
+ <div style="display: flex;margin: 30px 0;align-items: center">
+ <el-button type="primary">棣栨淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
+ <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+// import Pagination from '@/components/Pagination'
+
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import $ from 'jquery'
+import {
+ MesOrderStepCheckItemList,
+ MesOrderStepCheckSearch,
+ MesOrderStepCheckSelect,
+ StepCheckItemSelect
+} from '@/api/zlgl'
+import { MesOrderSelectUser } from '@/api/scgl'
+
+export default {
+ name: 'QXDY',
+ // components: {
+ // Pagination
+ // },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: { // 宸ュ簭
+ orderstepqrcode: 'MO-2022-07-0001_1;001', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ wo_code: '', // 宸ュ崟缂栫爜
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: ''// 宸ュ簭鍚嶇О
+ },
+ checkStandard: '', // 妫�楠屾爣鍑�
+ checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ checkUser: '', // 妫�楠屼汉鍛�
+ checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
+ checkResult: '', // 妫�楠岀粨鏋�
+ checkResultSelect: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
+ ], // 妫�楠岀粨鏋滀笅鎷夋暟缁�
+ checkdescr: '', // 妫�楠屽娉紙鎻忚堪锛�
+
+ JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
+ JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
+ JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
+ // checkresultArr:[
+ // {''}
+ // ]
+ }
+ },
+ created() {
+ this.getMesOrderStepCheckSelect()
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+
+ this.getFocus()
+ },
+ methods: {
+ // 鑾峰彇鑱氱劍
+ getFocus() {
+ this.$nextTick(() => {
+ $("input[name='GXproduceCode']")[0].focus()
+ })
+ },
+ // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ async getMesOrderStepCheckSelect() {
+ const { data: res } = await MesOrderStepCheckSelect()
+ this.checkStandardSelect = res
+ },
+ // 鑾峰彇妫�楠屼汉鍛樹笅鎷�
+ async getMesOrderSelectUser() {
+ const { data: res } = await MesOrderSelectUser()
+ this.checkUserSelect = res
+ },
+ // 鑾峰彇妫�楠岄」涓嬫媺鏁扮粍
+ async getJYSelectArr() {
+ const { data: res } = await StepCheckItemSelect()
+ this.JYSelectArr = res
+ },
+ // 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
+ async changeCheckStandard(val) {
+ this.JYSelectedArr = []
+ const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
+ this.JYTableData = res
+
+ this.JYTableData.forEach(item => {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+
+ item.reslut = 0 // 0鍚堟牸 1涓嶈壇
+
+ item.isVisible = 0
+ item.number = number
+ this.JYSelectedArr.push(item.code)
+ })
+ },
+ changeRadioValue(val, row) {
+ console.log(val, row)
+ },
+ clickRadio(e, row) {
+ console.log(e, row, 1)
+ row.reslut = row.reslut === 0 ? 1 : 0
+ // this.JYTableData.forEach(item => {
+ // if (row.code === item.code) {
+ // item.reslut = row.reslut === 0 ? 1 : 0
+ // }
+ // })
+ // e === row.reslut ? row.reslut = null : row.reslut = e
+ // this.$nextTick(() => {
+ // row.reslut = row.reslut === 0 ? 1 : 0
+ // })
+ //
+ // this.$forceUpdate()
+
+ // this.$refs.tableDataRef.toggleRowSelection(row, false)
+ },
+
+ reslutChange(val, row) {
+
+ },
+ xxxx(val) {
+ console.log(val)
+ },
+ changeSelect(val, row) {
+ console.log(val, row)
+ },
+ changSwitch(val, row) {
+ console.log(val)
+ // row.result = val
+ // this.JYTableData.forEach(item => {
+ // if (row.code === item.code) {
+ // item.reslut = val === 'NG' ? 'OK' : 'NG'
+ // }
+ // })
+
+ // row.reslut = !row.reslut
+ // this.handleValue(row)
+ },
+ handleValue(row) {
+ this.JYTableData.forEach(item => {
+ if (item.code === row.code) {
+ item.reslut = item.reslut === 'OK' ? 'NG' : 'OK'
+ }
+ })
+ },
+ //
+ changeCode(val, row) {
+ row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
+ row.name = this.JYSelectArr.find(it => it.code === val).name
+ },
+ // 鎵爜閿洏鍥炶溅浜嬩欢
+ async enterNative(val, belong) {
+ if (belong === 'GXproduceCode') {
+ const res = await MesOrderStepCheckSearch({ orderstepqrcode: this.form.orderstepqrcode })
+ this.form.wo_code = res.data[0].wo_code
+ this.form.partcode = res.data[0].partcode
+ this.form.partname = res.data[0].partname
+ this.form.partspec = res.data[0].partspec
+ this.form.stepcode = res.data[0].stepcode
+ this.form.stepname = res.data[0].stepname
+ }
+ },
+
+ // 鏂板
+ add() {
+ if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
+ return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
+ }
+
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ const data = { code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ this.JYTableData.push(data)
+ },
+
+ // 纭
+ confirm(row) {
+ if (row.code === '') {
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ }
+
+ if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
+ } else {
+ this.JYSelectedArr.push(row.code)
+ }
+
+ 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,
+ reslut: row.reslut,
+ stepcheckitem_desc: row.stepcheckitem_desc
+ })
+ }
+ })
+
+ console.log(this.JYTableData)
+ },
+ // 鍙栨秷
+ cancel(row) {
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+
+ this.JYSelectedArr.forEach((item, index) => {
+ if (item === row.code) {
+ this.JYSelectedArr.splice(index, 1)
+ }
+ })
+ },
+ // 鍒犻櫎
+ del(row) {
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+
+ this.JYSelectedArr.forEach((item, index) => {
+ if (item === row.code) {
+ this.JYSelectedArr.splice(index, 1)
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 250
+ this.tableHeight = this.mainHeight - 100
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--primary:hover {
+ border: none;
+}
+
+::v-deep .el-button--info {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px;
+ line-height: 30px;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::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 {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
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;
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 7d7f1c4..7dd00fc 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -107,6 +107,7 @@
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 1dfddec..790ef95 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -109,6 +109,7 @@
:visible.sync="dialogVisible"
width="800px"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
--
Gitblit v1.9.3