xiaobai
/
equipment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

1. 修复检验项目数据保存问题 

2. 记录编号监听变化
3. 检验项目列需要采用具体检验项目列名，不是采用DN模式
master
李磊 3 years ago
parent
6b361adb31
commit
ee6c8516f4
1 changed files with 74 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 170
      src/views/ysjl/4000/dj/common/index.vue

170
src/views/ysjl/4000/dj/common/index.vue
View File

@ -53,42 +53,19 @@
<fieldset> <fieldset>
<legend>基本信息</legend> <legend>基本信息</legend>
<el-row :gutter="25"> <el-row :gutter="25">
<el-col <el-col v-if="state === 'create' || !ysjl.jilubianhao" :span="10">
v-if="
state === 'create' ||
ysjl.jilubianhao === null ||
ysjl.jilubianhao === ''
"
:span="14"
>
<el-form-item label="记录编号"> <el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width: 80px" disabled /> <el-input v-model="jlbh1" style="width: 80px" disabled />
<el-input v-model="jlbh2" style="width: 80px" disabled />- <el-input v-model="jlbh2" style="width: 80px" disabled />-
<el-input <el-input v-model="jlbh3" style="width: 85px" />
v-model="jlbh3"
style="width: 85px"
@blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-else :span="9"> <el-col v-else :span="9">
<el-form-item label="记录编号" prop="jilubianhao"> <el-form-item label="记录编号" prop="jilubianhao">
<el-input <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
v-if="state !== 'create'"
v-model="ysjl.jilubianhao"
:disabled="edit"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col v-if="isRepeat" :span="2" style="font-size: 15px;">
v-if="isRepeat"
:span="2"
style="
vertical-align: middle;
padding-top: 3px;
font-size: 15px;
"
>
<span style="color: red">编号重复</span> <span style="color: red">编号重复</span>
</el-col> </el-col>
</el-row> </el-row>
@ -249,20 +226,20 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="取物装置" prop="quwuzhuangzhi"> <el-form-item label="取物装置" prop="quwuzhuangzhi">
<el-radio-group v-model="param.quwuzhuangzhi"> <el-radio-group v-model="param.quwuzhuangzhi">
<el-radio label="吊钩"> <el-radio label="吊钩">
吊钩 吊钩
</el-radio> </el-radio>
<el-radio label="抓斗"> <el-radio label="抓斗">
抓斗 抓斗
</el-radio> </el-radio>
<el-radio label="吸盘"> <el-radio label="吸盘">
吸盘 吸盘
</el-radio> </el-radio>
<el-radio label="集装箱吊具"> <el-radio label="集装箱吊具">
集装箱吊具 集装箱吊具
</el-radio> </el-radio>
<el-radio label="其他"> <el-radio label="其他">
其他 其他
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -272,20 +249,20 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="吊具形式" prop="quwuzhuangzhi"> <el-form-item label="吊具形式" prop="quwuzhuangzhi">
<el-radio-group v-model="param.quwuzhuangzhi"> <el-radio-group v-model="param.quwuzhuangzhi">
<el-radio label="吊钩"> <el-radio label="吊钩">
吊钩 吊钩
</el-radio> </el-radio>
<el-radio label="抓斗"> <el-radio label="抓斗">
抓斗 抓斗
</el-radio> </el-radio>
<el-radio label="吸盘"> <el-radio label="吸盘">
吸盘 吸盘
</el-radio> </el-radio>
<el-radio label="集装箱吊具"> <el-radio label="集装箱吊具">
集装箱吊具 集装箱吊具
</el-radio> </el-radio>
<el-radio label="其他"> <el-radio label="其他">
其他 其他
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -295,11 +272,11 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检验类别" prop="jianyanleibie"> <el-form-item label="检验类别" prop="jianyanleibie">
<el-radio-group v-model="ysjl.jianyanleibie"> <el-radio-group v-model="ysjl.jianyanleibie">
<el-radio label="SC"> <el-radio label="SC">
首次检验 首次检验
</el-radio> </el-radio>
<el-radio label="DQ"> <el-radio label="DQ">
定期检验 定期检验
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -310,23 +287,23 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="工作环境" prop="jianyanhuanjing"> <el-form-item label="工作环境" prop="jianyanhuanjing">
<el-radio-group v-model="param.jianyanhuanjing"> <el-radio-group v-model="param.jianyanhuanjing">
<el-radio label="露天"> <el-radio label="露天">
露天 露天
</el-radio> </el-radio>
<el-radio label="非露天"> <el-radio label="非露天">
非露天 非露天
</el-radio> </el-radio>
<el-radio label="高温"> <el-radio label="高温">
高温 高温
</el-radio> </el-radio>
<el-radio label="粉尘"> <el-radio label="粉尘">
粉尘 粉尘
</el-radio> </el-radio>
<el-radio label="有毒"> <el-radio label="有毒">
有毒 有毒
</el-radio> </el-radio>
<el-radio label="其他"> <el-radio label="其他">
其他 其他
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -340,11 +317,11 @@
prop="jianyanhuanjingtiaojian" prop="jianyanhuanjingtiaojian"
> >
<el-radio-group v-model="ysjl.jianyanhuanjingtiaojian"> <el-radio-group v-model="ysjl.jianyanhuanjingtiaojian">
<el-radio label="符合"> <el-radio label="符合">
符合 符合
</el-radio> </el-radio>
<el-radio label="不符合"> <el-radio label="不符合">
不符合 不符合
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -474,20 +451,20 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="取物装置" prop="quwuzhuangzhi"> <el-form-item label="取物装置" prop="quwuzhuangzhi">
<el-radio-group v-model="param.quwuzhuangzhi"> <el-radio-group v-model="param.quwuzhuangzhi">
<el-radio label="吊钩"> <el-radio label="吊钩">
吊钩 吊钩
</el-radio> </el-radio>
<el-radio label="抓斗"> <el-radio label="抓斗">
抓斗 抓斗
</el-radio> </el-radio>
<el-radio label="吸盘"> <el-radio label="吸盘">
吸盘 吸盘
</el-radio> </el-radio>
<el-radio label="集装箱吊具"> <el-radio label="集装箱吊具">
集装箱吊具 集装箱吊具
</el-radio> </el-radio>
<el-radio label="其他"> <el-radio label="其他">
其他 其他
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -732,17 +709,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检验结论" prop="jianyanjielun"> <el-form-item label="检验结论" prop="jianyanjielun">
<el-radio-group v-model="ysjl.jianyanjielun"> <el-radio-group v-model="ysjl.jianyanjielun">
<el-radio label="合格"> <el-radio label="合格">
合格 合格
</el-radio> </el-radio>
<el-radio label="不合格"> <el-radio label="不合格">
不合格 不合格
</el-radio> </el-radio>
<el-radio label="复检合格"> <el-radio label="复检合格">
复检合格 复检合格
</el-radio> </el-radio>
<el-radio label="复检不合格"> <el-radio label="复检不合格">
复检不合格 复检不合格
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -847,7 +824,7 @@
<el-table-column align="center" prop="D1" label="检验结果"> <el-table-column align="center" prop="D1" label="检验结果">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
v-model="scope.row.D1" v-model="scope.row.jianyanjieguo"
:disabled="edit" :disabled="edit"
type="text" type="text"
placeholder="请选择" placeholder="请选择"
@ -887,7 +864,7 @@ export default {
}, },
data() { data() {
return { return {
jlbh1: 'GN', jlbh1: 'QZ',
jlbh2: '(' + new Date().getFullYear() + ')', jlbh2: '(' + new Date().getFullYear() + ')',
jlbh3: '', jlbh3: '',
ysjl: { ysjl: {
@ -934,13 +911,13 @@ export default {
}, },
computed: {}, computed: {},
watch: { watch: {
// jlbh3: function(val) { jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id) this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// }, },
// jilubianhao: function(newValue) { jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id) this.judgeRepeat(newValue, this.ysjl.id)
// } }
}, },
// 添加F5刷新监听事件 // 添加F5刷新监听事件
mounted() { mounted() {
@ -1128,10 +1105,11 @@ export default {
this.sybjSData.forEach((row) => { this.sybjSData.forEach((row) => {
tableData.push({ tableData.push({
ysjlId: this.ysjlId, ysjlId: this.ysjlId,
id: row.id,
beizhu: row.beizhu, beizhu: row.beizhu,
dicJyxmId: row.dicJyxmId, dicJyxmId: row.dicJyxmId,
jianyanjieguo: row.jianyanjieguo ? row.jianyanjieguo : '', jianyanjieguo: row.jianyanjieguo || '',
jianyanjielun: row.jianyanjielun ? row.jianyanjielun : '', jianyanjielun: row.jianyanjielun || '',
jyxmMode: 0, jyxmMode: 0,
sort: row.sort, sort: row.sort,
orders: row.orders, orders: row.orders,

Write Preview
Loading…
Cancel
Save