From c2f67da5b5086f6e3e4bc01f61e81e0505a17d10 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 28 二月 2023 16:58:22 +0800
Subject: [PATCH] 1.质检方案对接接口中
---
src/api/zlgl.js | 39 ++
src/views/zlgl/zjfa.vue | 677 ++++++++++++++++++++++++++++++------------------
src/views/scgl/sckbg.vue | 64 ++-
src/views/zlgl/gxjybz.vue | 4
4 files changed, 504 insertions(+), 280 deletions(-)
diff --git a/src/api/zlgl.js b/src/api/zlgl.js
index f5416c3..09cd13a 100644
--- a/src/api/zlgl.js
+++ b/src/api/zlgl.js
@@ -123,6 +123,7 @@
params: data
})
}
+
// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
export function SaveMesOrderStepCheckItem(data) {
return request({
@@ -140,6 +141,7 @@
params: data
})
}
+
// 宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇�
export function StepCheckTableSubSearch(data) {
return request({
@@ -148,6 +150,7 @@
params: data
})
}
+
// 宸ュ簭妫�楠岃褰曞鍑�
export function StepCheckTableOutExcel(data) {
return request({
@@ -157,3 +160,39 @@
})
}
+// 璐ㄦ鏂规鍒楄〃鏌ヨ
+export function QualityInspectionSearch(data) {
+ return request({
+ url: 'QualityManagement/QualityInspectionSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 璐ㄦ鏂规鏌ョ湅缂栬緫
+export function QualityInspectionSeeEdit(data) {
+ return request({
+ url: 'QualityManagement/QualityInspectionSeeEdit',
+ method: 'get',
+ params: data
+ })
+}
+
+// 璐ㄦ鏂规鏂板/缂栬緫鎻愪氦
+export function QualityInspectionAddEditSave(data) {
+ return request({
+ url: 'QualityManagement/QualityInspectionAddEditSave',
+ method: 'post',
+ data
+ })
+}
+
+// 璐ㄦ鏂规鍒犻櫎
+export function QualityInspectionDelete(data) {
+ return request({
+ url: 'QualityManagement/QualityInspectionDelete',
+ method: 'post',
+ params: data
+ })
+}
+
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index f9738fd..53a23a2 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -532,19 +532,19 @@
:model="dialogForm"
label-width="110px"
>
- <el-form-item label="宸ュ崟缂栧彿锛�">
+ <el-form-item label="宸ュ崟缂栧彿锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
- <el-form-item label="浜у搧缂栫爜锛�">
+ <el-form-item label="浜у搧缂栫爜锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partcode }}</div>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О锛�">
+ <el-form-item label="浜у搧鍚嶇О锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
- <el-form-item label="浜у搧瑙勬牸锛�">
+ <el-form-item label="浜у搧瑙勬牸锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
- <el-form-item label="褰撳墠宸ュ簭锛�">
+ <el-form-item label="褰撳墠宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item v-if="false" label="宸ュ簭鎻忚堪锛�">
@@ -554,20 +554,20 @@
</div>
<!-- </el-tooltip>-->
</el-form-item>
- <el-form-item label="浠诲姟鏁伴噺锛�">
+ <el-form-item label="浠诲姟鏁伴噺锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
<!--鑷埗寮�濮�-->
@@ -590,7 +590,7 @@
</el-select>
</el-form-item>
<!-- 鑷埗鎶ュ伐 -->
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
@@ -694,8 +694,11 @@
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
<div v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='group'">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 浜哄憳鍒楄〃
- <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ <div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
+ <div style="margin: 0 15px 0 5px;">浜哄憳鍒楄〃</div>
+ <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ </div>
<el-table
ref="userTableDataRef"
:data="userTableData"
@@ -704,7 +707,7 @@
:row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- height="180"
+ height="188"
highlight-current-row
style="width: 100%"
>
@@ -761,7 +764,13 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2" v-waves type="text" @click="userSave(row)">淇濆瓨</el-button>
+ <el-button
+ v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2"
+ v-waves
+ type="text"
+ @click="userSave(row)"
+ >淇濆瓨
+ </el-button>
<el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">鍙栨秷</el-button>
<el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">鍒犻櫎</el-button>
<el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">淇敼姣斾緥</el-button>
@@ -1496,7 +1505,7 @@
this.getHeight()
this.$nextTick(() => {
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
// this.bindQRCode('10001;001')
})
// webapp_urlprotocol_startup()
@@ -1583,21 +1592,21 @@
if (this.$refs.elTabs.currentName === '0') {
this.$nextTick(() => {
this.getMesOrderStepSearch()
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
this.getMesOrderWxStepSearch()
- $("input[name='WXproduceCode']")[0].focus()
+ $('input[name=\'WXproduceCode\']')[0].focus()
this.form.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '2') {
this.$nextTick(() => {
this.getBadList()
- $("input[name='badProduceCode']")[0].focus()
+ $('input[name=\'badProduceCode\']')[0].focus()
this.badForm.orderstepqrcode = ''
})
}
@@ -1805,6 +1814,8 @@
this.dialogForm.nextstepcode = obj.nextstepcode
this.dialogForm.startqtySum = obj.noreportqty
+
+ this.$refs.userTableDataRef.doLayout()
})
await this.getMesOrderStepStartSelectEqp()
@@ -1937,10 +1948,14 @@
this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))
this.calculatedValue()
- this.$refs.tableDataRef.doLayout()
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ this.$refs.userTableDataRef.doLayout()
+ })
},
calculatedValue() {
- const total = 100; let value = 0
+ const total = 100
+ let value = 0
this.userTableData.forEach(item => {
item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
value += item.ratio
@@ -1949,7 +1964,7 @@
if (value !== total) {
// let temp = this.userTableData
// temp[temp.length-1].ratio=temp[temp.length-1].ratio+(total-value)
- this.userTableData[ this.userTableData.length - 1].ratio = parseFloat((this.userTableData[ this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
+ this.userTableData[this.userTableData.length - 1].ratio = parseFloat((this.userTableData[this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
}
},
// 淇敼鍒嗛厤姣斿垪
@@ -2235,7 +2250,10 @@
eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
// reportuser: reportuser, // 鎶ュ伐浜哄憳
- reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{ usercode: this.dialogForm.operation, ratio: 100 }],
+ reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
+ usercode: this.dialogForm.operation,
+ ratio: 100
+ }],
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
// startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 5bf522e..0867e03 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -194,7 +194,7 @@
<el-table-column
show-tooltip-when-overflow
prop="code"
- label="妫�楠屾爣鍑嗙紪鐮�"
+ label="妫�楠岄」鐩紪鐮�"
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.code }}</div>
@@ -217,7 +217,7 @@
<el-table-column
prop="name"
show-tooltip-when-overflow
- label="妫�楠屾爣鍑嗗悕绉�"
+ label="妫�楠岄」鐩悕绉�"
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.name }}</div>
diff --git a/src/views/zlgl/zjfa.vue b/src/views/zlgl/zjfa.vue
index 557a492..1126347 100644
--- a/src/views/zlgl/zjfa.vue
+++ b/src/views/zlgl/zjfa.vue
@@ -3,7 +3,6 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -16,15 +15,15 @@
>
<div class="elForm">
<el-form-item label="璐ㄦ鏂规缂栫爜" style=" display: flex;">
- <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.qualityinsptcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="璐ㄦ鏂规鍚嶇О" style=" display: flex;">
- <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.qualityinsptname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏈夋晥鐘舵��" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in whetherOrNot"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -32,9 +31,9 @@
</el-select>
</el-form-item>
<el-form-item label="璐ㄦ绫诲瀷" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.checktype" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in checktypeArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -42,9 +41,9 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎶芥牱鏂瑰紡" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.sampltype" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in sampltypeArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -52,9 +51,9 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="閫傜敤瀵硅薄" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.suitobject" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in OrgTypeArr"
+ v-for="item in suitobjectArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -110,37 +109,59 @@
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="code"
label="璐ㄦ鏂规缂栫爜"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="name"
label="璐ㄦ鏂规鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="description"
+ prop="status"
label="鏈夋晥鐘舵��"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='Y'"><i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right:5px" />鏄�</div>
+ <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="parentorg_name"
+ prop="checktype"
label="璐ㄦ绫诲瀷"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.checktype">{{ checktypeArr.find(i=>i.code===row.checktype).name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="sampmethod"
label="鎶芥牱鏂瑰紡"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.sampmethod">{{ sampltypeArr.find(i=>i.code===row.sampmethod).name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="suitobject"
label="閫傜敤瀵硅薄"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.suitobject">{{ suitobjectArr.find(i=>i.code===row.suitobject).name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
<el-table-column
- prop="lm_user"
+ prop="username"
label="鍒涘缓浜哄憳"
sortable="custom"
/>
@@ -157,6 +178,14 @@
>
<template slot-scope="{row}">
<div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
+ <i
+ class="el-icon-view"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right:15px;cursor: pointer;"
+ @click="check('check',row)"
+ />
+ </el-tooltip>
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
@@ -176,15 +205,15 @@
align="right"
layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getOrganizationSearch"
+ @pagination="getQualityInspectionSearch"
/>
</div>
<el-dialog
v-el-drag-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
+ :title="operation==='add'?'鏂板':operation==='check'?'鏌ョ湅':'缂栬緫'"
:visible.sync="dialogVisible"
- width="1200px"
+ width="1260px"
:close-on-click-modal="false"
top="5vh"
@closed="handleClose"
@@ -195,22 +224,22 @@
<!-- <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />鍩虹璧勬枡锛�-->
<!-- </div>-->
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
- <el-form-item label="璐ㄦ鏂规缂栫爜" prop="zjfabm">
- <el-input v-model="dialogForm.zjfabm" :disabled="operation!=='add'" style="width: 200px" />
+ <el-form-item label="璐ㄦ鏂规缂栫爜" prop="qualityinsptcode">
+ <el-input v-model="dialogForm.qualityinsptcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
- <el-form-item label="璐ㄦ鏂规鍚嶇О" prop="zjfamc">
- <el-input v-model="dialogForm.zjfamc" style="width: 200px" />
+ <el-form-item label="璐ㄦ鏂规鍚嶇О" prop="stepcheckitem_name">
+ <el-input v-model="dialogForm.stepcheckitem_name" style="width: 200px" />
</el-form-item>
<br>
- <el-form-item prop="yxzt" label="鏈夋晥鐘舵��">
+ <el-form-item prop="status" label="鏈夋晥鐘舵��">
<el-select
- v-model="dialogForm.yxzt"
+ v-model="dialogForm.status"
style="width: 200px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
>
<el-option
- v-for="item in yxztArr"
+ v-for="item in whetherOrNot"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -218,42 +247,42 @@
</el-select>
</el-form-item>
<br>
- <el-form-item prop="zjlx" label="璐ㄦ绫诲瀷">
- <el-radio-group v-model="dialogForm.zjlx">
- <el-radio label="rcjy">鍏ュ巶妫�楠�</el-radio>
- <el-radio label="ccjy">鍑哄巶妫�楠�</el-radio>
- <el-radio label="cjjy">棣栨妫�楠�</el-radio>
- <el-radio label="xj">宸℃</el-radio>
- <el-radio label="wgj">瀹屽伐妫�</el-radio>
+ <el-form-item prop="checktype" label="璐ㄦ绫诲瀷">
+ <el-radio-group v-model="dialogForm.checktype">
+ <el-radio label="InCheck">鍏ュ巶妫�楠�</el-radio>
+ <el-radio label="OutCheck">鍑哄巶妫�楠�</el-radio>
+ <el-radio label="FirstCheck">棣栨妫�楠�</el-radio>
+ <el-radio label="PatroCheck">宸℃</el-radio>
+ <el-radio label="EndCheck">瀹屽伐妫�</el-radio>
</el-radio-group>
</el-form-item>
<br>
- <el-form-item prop="cyfs" label="鎶芥牱鏂瑰紡">
- <el-radio-group v-model="dialogForm.cyfs" style="width: 200px;">
- <el-radio label="gscj">鍥烘椂鎶芥</el-radio>
- <el-radio label="blcj">姣斾緥鎶芥</el-radio>
+ <el-form-item prop="sampmethod" label="鎶芥牱鏂瑰紡">
+ <el-radio-group v-model="dialogForm.sampmethod" style="width: 200px;">
+ <el-radio label="FIXED">鍥烘椂鎶芥</el-radio>
+ <el-radio label="SCARE">姣斾緥鎶芥</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item v-if="dialogForm.cyfs==='gscj'" label="鏍锋湰鏁伴噺" prop="ybsl">
- <el-input v-model="dialogForm.ybsl" style="width: 200px" />
+ <el-form-item v-if="dialogForm.sampmethod==='FIXED'" label="鏍锋湰鏁伴噺" prop="sampnum">
+ <el-input v-model="dialogForm.sampnum" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogForm.cyfs==='blcj'" label="鎶芥姣斾緥" prop="cjbl">
- <el-input v-model="dialogForm.cjbl" style="width: 180px" />
+ <el-form-item v-if="dialogForm.sampmethod==='SCARE'" label="鎶芥姣斾緥" prop="sampscale">
+ <el-input v-model="dialogForm.sampscale" style="width: 180px" />
%
</el-form-item>
<br>
- <el-form-item prop="sydx" label="閫傜敤瀵硅薄">
- <el-radio-group v-model="dialogForm.sydx" style="width: 200px;">
- <el-radio label="wllb">鐗╂枡绫诲埆</el-radio>
- <el-radio label="wl">鐗╂枡</el-radio>
+ <el-form-item prop="suitobject" label="閫傜敤瀵硅薄">
+ <el-radio-group v-model="dialogForm.suitobject" style="width: 200px;">
+ <el-radio label="PY">鐗╂枡绫诲埆</el-radio>
+ <el-radio label="P">鐗╂枡</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item prop="sywl" :label="dialogForm.sydx==='wl'?'閫傜敤鐗╂枡':'閫傜敤鐗╂枡绫诲埆'">
- <el-input v-model="dialogForm.sywl" style="width: 200px;" />
+ <el-form-item prop="suitpart" :label="dialogForm.suitobject==='P'?'閫傜敤鐗╂枡':'閫傜敤鐗╂枡绫诲埆'">
+ <el-input v-model="dialogForm.suitpart" style="width: 200px;" />
</el-form-item>
<br>
<el-form-item label="妫�楠屾柟妗堟弿杩�">
- <el-input v-model="dialogForm.jyfams" type="textarea" :autosize="{ minRows: 2 }" />
+ <el-input v-model="dialogForm.descr" type="textarea" :autosize="{ minRows: 2 }" />
</el-form-item>
</el-form>
@@ -271,7 +300,7 @@
type="primary"
style="margin-left: 20px;"
icon="el-icon-circle-plus-outline"
- @click="zjlbAdd"
+ @click="addZjlb"
>鏂板
</el-button>
</div>
@@ -279,7 +308,7 @@
<el-table
ref="tableDataRef"
class="tableFixed"
- :data="zjlbTable"
+ :data="checkitem"
height="250"
style="height:250px"
border
@@ -289,203 +318,251 @@
:cell-style="this.$cellStyle"
>
<el-table-column
- prop="RowNum"
+ type="index"
width="50"
fixed
label="搴忓彿"
/>
+ <!-- <el-table-column-->
+ <!-- prop="jyxmbm"-->
+ <!-- width="105"-->
+ <!-- label="妫�楠岄」鐩紪鐮�"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.jyxmbm"-->
+ <!-- filterable-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="val=>tableChange(val,row)"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in PartSelectArr"-->
+ <!-- :key="item.partname"-->
+ <!-- :label="item.partcode"-->
+ <!-- :value="item.partname"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- <div v-if="row.isVisible===0">{{ row.jyxmbm }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="jyxmmc"-->
+ <!-- width="105"-->
+ <!-- label="妫�楠岄」鐩悕绉�"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.jyxmmc"-->
+ <!-- filterable-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="val=>tableChange(val,row)"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in PartSelectArr"-->
+ <!-- :key="item.partname"-->
+ <!-- :label="item.partcode"-->
+ <!-- :value="item.partname"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- <div v-if="row.isVisible===0">{{ row.jyxmmc }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+
<el-table-column
- prop="jyxmbm"
- width="105"
- label="妫�楠岄」鐩紪鐮�"
+ prop="stepcheckitem_code"
+ width="250"
+ label="妫�楠岄」鐩� / 缂栫爜"
>
<template slot-scope="{row}">
<el-select
v-if="row.isVisible===1"
- v-model="row.jyxmbm"
+ v-model="row.stepcheckitem_code"
filterable
placeholder="璇烽�夋嫨"
- @change="val=>tableChange(val,row)"
+ style="width: 100%;"
>
+ <!-- @change="val=>tableChange(val,row)"-->
<el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
+ v-for="item in CheckItemSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.jyxmbm }}</div>
+ <div v-if="row.isVisible===0">{{ CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code).name }}</div>
</template>
</el-table-column>
+
<el-table-column
- prop="jyxmmc"
- width="105"
- label="妫�楠岄」鐩悕绉�"
- >
- <template slot-scope="{row}">
- <el-select
- v-if="row.isVisible===1"
- v-model="row.jyxmmc"
- filterable
- placeholder="璇烽�夋嫨"
- @change="val=>tableChange(val,row)"
- >
- <el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
- />
- </el-select>
- <div v-if="row.isVisible===0">{{ row.jyxmmc }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="sfbt"
+ prop="required"
+ width="85"
label="鏄惁蹇呭～"
>
<template slot-scope="{row}">
<el-select
v-if="row.isVisible===1"
- v-model="row.sfbt"
+ v-model="row.required"
filterable
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
+ v-for="item in whetherOrNot"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.sfbt }}</div>
+ <div v-if="row.isVisible===0">{{ row.required === 'Y' ? '鏄�' : '鍚�' }}</div>
</template>
</el-table-column>
<el-table-column
- prop="szpd"
+ prop="numberjudge"
+ width="85"
label="鏁板�煎垽瀹�"
>
<template slot-scope="{row}">
<el-select
v-if="row.isVisible===1"
- v-model="row.szpd"
+ v-model="row.numberjudge"
filterable
placeholder="璇烽�夋嫨"
+ @change="val=>szpdChange(val,row)"
>
<el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
+ v-for="item in whetherOrNot"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.szpd }}</div>
+ <div v-if="row.isVisible===0">{{ row.numberjudge === 'Y' ? '鏄�' : '鍚�' }}</div>
</template>
</el-table-column>
<el-table-column
- prop="dw"
+ prop="unit"
label="鍗曚綅"
- >
- <template slot-scope="{row}">
- <el-input
- v-if="row.isVisible===1"
- v-model="row.dw"
- oninput="value=value.replace(/[^0-9.]/g,'')"
- placeholder="璇疯緭鍏�"
- />
- <div v-if="row.isVisible===0">{{ row.dw }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="xsws"
- label="灏忔暟浣嶆暟"
>
<template slot-scope="{row}">
<el-select
v-if="row.isVisible===1"
- v-model="row.xsws"
+ v-model="row.unit"
filterable
+ :disabled="row.numberjudge==='N'"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
+ v-for="item in UomSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.dw }}</div>
+ <div v-if="row.isVisible===0">{{
+ row.numberjudge === 'Y' ? UomSelectArr.find(i => i.code === row.unit).name : '/'
+ }}
+ </div>
</template>
</el-table-column>
<el-table-column
- prop="bzz"
+ prop="decimalnum"
+ width="85"
+ label="灏忔暟浣嶆暟"
+ >
+ <template slot-scope="{row}">
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.decimalnum"-->
+ <!-- filterable-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in PartSelectArr"-->
+ <!-- :key="item.partname"-->
+ <!-- :label="item.partcode"-->
+ <!-- :value="item.partname"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.decimalnum"
+ :disabled="row.numberjudge==='N'"
+ oninput="value=value.replace(/[^0-9]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
+ <div v-if="row.isVisible===0">{{ row.numberjudge === 'Y' ? row.decimalnum : '/' }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="standvalue"
label="鏍囧噯鍊�"
>
<template slot-scope="{row}">
<el-input
v-if="row.isVisible===1"
- v-model="row.bzz"
+ v-model="row.standvalue"
+ :disabled="row.numberjudge==='N'"
oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
- <div v-if="row.isVisible===0">{{ row.bzz }}</div>
+ <div v-if="row.isVisible===0">{{ row.standvalue ? row.standvalue : '/' }}</div>
</template>
</el-table-column>
<el-table-column
- prop="sxz"
+ prop="uppervalue"
label="涓婇檺鍊�"
>
<template slot-scope="{row}">
<el-input
v-if="row.isVisible===1"
- v-model="row.sxz"
+ v-model="row.uppervalue"
+ :disabled="row.numberjudge==='N'"
oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
- <div v-if="row.isVisible===0">{{ row.sxz }}</div>
+ <div v-if="row.isVisible===0">{{ row.uppervalue ? row.uppervalue : '/' }}</div>
</template>
</el-table-column>
<el-table-column
- prop="xxz"
+ prop="lowervalue"
label="涓嬮檺鍊�"
>
<template slot-scope="{row}">
<el-input
v-if="row.isVisible===1"
- v-model="row.xxz"
+ v-model="row.lowervalue"
+ :disabled="row.numberjudge==='N'"
oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
- <div v-if="row.isVisible===0">{{ row.xxz }}</div>
+ <div v-if="row.isVisible===0">{{ row.lowervalue ? row.lowervalue : '/' }}</div>
</template>
</el-table-column>
<el-table-column
- prop="ms"
+ prop="stepcheckitem_desc"
label="鎻忚堪"
>
<template slot-scope="{row}">
<el-input
v-if="row.isVisible===1"
- v-model="row.ms"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ v-model="row.stepcheckitem_desc"
placeholder="璇疯緭鍏�"
/>
- <div v-if="row.isVisible===0">{{ row.ms }}</div>
+ <div v-if="row.isVisible===0">{{ row.stepcheckitem_desc ? row.stepcheckitem_desc : '/' }}</div>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
- width="80"
+ width="120"
fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" />
- </el-tooltip>
- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" />
- </el-tooltip>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="editZjlbRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delZjlbRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -499,16 +576,6 @@
</span>
</el-dialog>
- <!--瀵煎叆缁勪欢-->
- <import-picker
- ref="importPickerFunc"
- class="importPickerClass"
- :shows.sync="shows"
- :title="title_value"
- :colos="colos"
- :code="code"
- />
-
</div>
</template>
@@ -516,15 +583,17 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
-import ImportPicker from '@/components/ImportPicker'
+
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { UomSelect } from '@/api/zzmx'
+import { QualityInspectionDelete, QualityInspectionSearch, StepCheckItemSelect } from '@/api/zlgl'
export default {
name: 'Zzjg',
components: {
- Pagination, ImportPicker
+ Pagination
},
directives: { elDragDialog, waves },
data() {
@@ -534,96 +603,113 @@
mainHeight: 0,
tableHeight: 0,
form: {
- OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
- OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
- OrgType: '', // 缁勭粐绫诲瀷
- UserName: '', // 鍒涘缓浜哄憳
- createdate: '',
- prop: 'lm_date', // 鎺掑簭瀛楁
+ qualityinsptcode: '', // 璐ㄦ鏂规缂栫爜
+ qualityinsptname: '', // 璐ㄦ鏂规鍚嶇О
+ status: '', // 鏈夋晥鐘舵��
+ checktype: '', // 璐ㄦ绫诲瀷
+ sampltype: '', // 鎶芥牱鏂瑰紡
+ suitobject: '', // 閫傜敤瀵硅薄
+ prop: 'code', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- OrgTypeArr: [
- { label: '鏄�', value: 'Y' },
- { label: '鍚�', value: 'N' }
+ checktypeArr: [
+ { code: 'InCheck', name: '鍏ュ巶妫�楠�' },
+ { code: 'OutCheck', name: '鍑哄巶妫�楠�' },
+ { code: 'FirstCheck', name: '棣栨' },
+ { code: 'PatroCheck', name: '宸℃' },
+ { code: 'EndCheck', name: '瀹屽伐妫�' }
],
-
+ sampltypeArr: [
+ { code: 'FIXED', name: '鍥哄畾鎶芥' },
+ { code: 'SCARE', name: '姣斾緥鎶芥' }
+ ],
+ suitobjectArr: [
+ { code: 'P', name: '鐗╂枡' },
+ { code: 'PY', name: '鐗╂枡绫诲瀷' }
+ ],
total: 10,
tableData: [],
- dialogVisible: true,
+ dialogVisible: false,
dialogForm: {
- yxzt: '',
- zjfabm: '',
- zjfamc: '',
- zjlx: '',
- cyfs: 'gscj',
- ybsl: '',
- cjbl: '',
- sydx: 'wl',
- sywl: '',
- jyfams: ''
+ qualityinsptcode: '', // 璐ㄦ鏂规缂栫爜
+ stepcheckitem_name: '', // 璐ㄦ鏂规鍚嶇О
+ status: 'Y', // 鏈夋晥鐘舵��
+ checktype: '', // 妫�楠岀被鍨�
+ sampmethod: 'FIXED', // 鎶芥鏂瑰紡
+ sampnum: '', // 鏍锋湰鏁伴噺
+ sampscale: '', // 鎶芥姣斾緥
+ suitobject: 'P', // 閫傜敤瀵硅薄
+ suitpart: '', // 閫傜敤鐗╂枡
+ descr: '' // /鎻忚堪
},
operation: '',
dialogFormRules: {
- yxzt: [
+ status: [
{ required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
],
- zjfabm: [
+ qualityinsptcode: [
{ required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
- zjfamc: [
+ stepcheckitem_name: [
{ required: true, message: '璇疯緭鍏ヨ川妫�鏂规鍚嶇О', trigger: ['blur', 'change'] }
],
- zjlx: [
+ checktype: [
{ required: true, message: '璇烽�夋嫨璐ㄦ鏂瑰紡', trigger: ['blur', 'change'] }
],
- cyfs: [
+ sampmethod: [
{ required: true, message: '璇烽�夋嫨鎶芥牱鏂瑰紡', trigger: ['blur', 'change'] }
],
- ybsl: [
+ sampnum: [
{ required: true, message: '璇疯緭鍏ユ牱鏈暟閲�', trigger: ['blur', 'change'] }
],
- cjbl: [
+ sampscale: [
{ required: true, message: '璇疯緭鍏ユ娊妫�姣斾緥', trigger: ['blur', 'change'] }
],
- sydx: [
+ suitobject: [
{ required: true, message: '璇烽�夋嫨閫傜敤瀵硅薄', trigger: ['blur', 'change'] }
],
- sywl: [
+ suitpart: [
{ required: true, message: '璇疯緭鍏ラ�傜敤鐗╂枡', trigger: ['blur', 'change'] }
]
},
- yxztArr: [
+ checkitem: [],
+
+ whetherOrNot: [ // 鏄垨鍚�
{ code: 'Y', name: '鏄�' },
{ code: 'N', name: '鍚�' }
],
- zjlbTable: [],
- title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
- shows: false
+
+ UomSelectArr: [], // 鍗曚綅涓嬫媺鏁扮粍
+ CheckItemSelectAllArr: [], // 妫�楠岄」鐩�(鎵�鏈�)
+ CheckItemSelectArr: []// 妫�楠岄」鐩�
}
},
- watch: {
- shows() {
- if (!this.shows) {
- this.getOrganizationSearch()
- }
- }
- },
+
created() {
- this.getOrganizationSearch()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
- async getOrganizationSearch() {
- const res = await OrganizationSearch(this.form)
+ handleRequest() {
+ this.getQualityInspectionSearch().then(res => {
+ if (res.code === '200') {
+ this.getUomSelect()
+ this.getStepCheckItemSelect()
+ }
+ })
+ },
+ async getQualityInspectionSearch() {
+ const res = await QualityInspectionSearch(this.form)
this.tableData = res.data
this.total = res.count
+
+ return { code: res.code }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -636,31 +722,30 @@
}
this.form.order = order
this.form.prop = prop
- this.getOrganizationSearch()
+ this.getQualityInspectionSearch()
},
// 鏌ヨ
search() {
- this.getOrganizationSearch()
- },
- // 瀵煎叆鎸夐挳
- upload() {
- this.shows = true
- this.$refs.importPickerFunc.newDataFunc()
- },
- colos() {
- this.shows = false
+ this.getQualityInspectionSearch()
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getOrganizationSearch()
+ this.form.qualityinsptcode = ''
+ this.form.qualityinsptname = ''
+ this.form.status = ''
+ this.form.checktype = ''
+ this.form.sampltype = ''
+ this.form.suitobject = ''
+ this.getQualityInspectionSearch()
},
// 鏂板鎸夐挳
add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 鏌ョ湅
+ check(operation, row) {
this.operation = operation
this.dialogVisible = true
},
@@ -670,9 +755,9 @@
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.qualityinsptcode = row.code
+ this.dialogForm.qualityinsptname = row.name
+ // this.dialogForm.SupUnit = row.parent_id
})
},
// 鍒犻櫎鎸夐挳
@@ -682,50 +767,130 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
+ QualityInspectionDelete({ qualityinsptcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
this.form.page--
}
- this.getOrganizationSearch()
+ this.getQualityInspectionSearch()
}
})
}).catch(() => {
this.$message.info('宸插彇娑堝垹闄�')
})
},
+ // 鑾峰彇鍗曚綅涓嬫媺鎺ュ彛
+ async getUomSelect() {
+ const { data: res } = await UomSelect()
+ this.UomSelectArr = res
+ },
+ // 鑾峰彇妫�楠岄」鐩笅鎷夋帴鍙�
+ async getStepCheckItemSelect() {
+ const { data: res } = await StepCheckItemSelect()
+
+ res.forEach(i => {
+ this.CheckItemSelectArr.push({
+ code: i.code,
+ name: i.name + ' / ' + i.code,
+ descr: i.descr
+ })
+ })
+ this.CheckItemSelectAllArr = JSON.parse(JSON.stringify(this.CheckItemSelectArr))
+ },
+ // 鏁板�煎垽瀹�
+ szpdChange(val, row) {
+ if (val === 'N') {
+ row.unit = ''
+ row.decimalnum = ''
+ row.standvalue = ''
+ row.uppervalue = ''
+ row.lowervalue = ''
+ }
+ },
// 琛ㄦ牸鍊兼敼鍙樻椂
tableChange(val, row) {
console.log(val, row)
},
- // 璐ㄦ鍒楄〃 //涓嬪懆涓�鍐嶅啓
- zjlbAdd() {
+ // 璐ㄦ鍒楄〃 鏂板琛�
+ addZjlb() {
+ if (this.checkitem.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屾暟鎹紒')
+ }
+
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- this.zjlbTable.unshift({
+ this.checkitem.unshift({
number,
isVisible: 1,
- jyxmbm: '',
- jyxmmc: '',
- sfbt: '',
- szpd: '',
- dw: '',
- xsws: '',
- bzz: '',
- sxz: '',
- xxz: '',
- ms: ''
+ // jyxmbm: '',
+ // jyxmmc: '',
+ stepcheckitem_code: '', // 妫�楠岄」鐩紪鐮�
+ required: 'Y', // 鏄惁蹇呭～
+ numberjudge: 'Y', // 鏄惁鏁板�煎垽鏂�
+ unit: '', // 鍗曚綅
+ decimalnum: '', // 灏忔暟浣嶆暟
+ standvalue: '', // 鏍囧噯鍊�
+ uppervalue: '', // 涓婇檺鍊�
+ lowervalue: '', // 涓嬮檺鍊�
+ stepcheckitem_desc: ''// 妫�楠岄」鐩弿杩�
})
},
-
+ // 鍒犻櫎璐ㄦ鍒楄〃琛�
+ delZjlbRow(row) {
+ const t = this.CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code)
+ this.CheckItemSelectArr.unshift(t)
+ this.checkitem = this.checkitem.filter(i => i.number !== row.number)
+ },
+ // 淇濆瓨琛�
+ saveZjlbRow(row) {
+ if (!row.stepcheckitem_code) {
+ return this.$message.info('妫�楠岄」鐩笉鑳戒负绌猴紒')
+ }
+ if (row.numberjudge === 'Y' && !row.unit) {
+ return this.$message.info('鍗曚綅涓嶈兘涓虹┖锛�')
+ }
+ if (row.numberjudge === 'Y' && !row.decimalnum) {
+ return this.$message.info('灏忔暟浣嶆暟涓嶈兘涓虹┖锛�')
+ }
+ if (row.numberjudge === 'Y') {
+ if (!row.standvalue && !row.uppervalue && !row.lowervalue) {
+ return this.$message.info('鏍囧噯鍊笺�佷笂闄愬�笺�佷笅闄愬�煎叾涓竴椤逛笉鑳戒负绌猴紒')
+ }
+ }
+ this.CheckItemSelectArr = this.CheckItemSelectArr.filter(i => i.code !== row.stepcheckitem_code)
+ row.isVisible = 0
+ },
+ // 鍙栨秷琛�
+ cancelZjlbRow(row) {
+ this.checkitem = this.checkitem.filter(i => i.number !== row.number)
+ },
+ // 缂栬緫琛�
+ editZjlbRow(row) {
+ if (this.checkitem.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屾暟鎹紒')
+ }
+ const t = this.CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code)
+ this.CheckItemSelectArr.unshift(t)
+ row.isVisible = 1
+ },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm = {
+ qualityinsptcode: '',
+ stepcheckitem_name: '',
+ status: 'Y',
+ checktype: '',
+ sampmethod: 'FIXED',
+ sampnum: '',
+ sampscale: '',
+ suitobject: 'P',
+ suitpart: '',
+ descr: ''
+ }
+
+ this.checkitem = []
this.$refs.dialogForm.clearValidate()
},
@@ -737,21 +902,23 @@
dialogVisibleConfirm() {
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')
- }
- AddUpdateOrganization(data).then(res => {
- if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.dialogVisible = false
- this.getOrganizationSearch()
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- }
- })
+ console.log(this.dialogForm, 'dialogForm')
+ console.log(this.checkitem, 'checkitem')
+ // const data = {
+ // OrganCode: this.dialogForm.qualityinsptcode,
+ // OrganName: this.dialogForm.qualityinsptname,
+ // OperType: this.operation === 'add' ? 'Add' : 'Update',
+ // Operator: getCookie('admin')
+ // }
+ // AddUpdateOrganization(data).then(res => {
+ // if (res.code === '200') {
+ // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ // this.dialogVisible = false
+ // this.getQualityInspectionSearch()
+ // } else {
+ // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ // }
+ // })
}
})
},
--
Gitblit v1.9.3