Browse Source

修改 各种问题

master
xiaobai 3 years ago
parent
commit
e6fee4a193
  1. 3
      src/views/ysjl/1000/dj/sy/sysy.vue
  2. 38
      src/views/ysjl/2000/2100/zbg/dj/edit.vue
  3. 12
      src/views/ysjl/2000/2100/zbg/nd/edit.vue
  4. 46
      src/views/ysjl/2000/2200/zbg/dj/edit.vue
  5. 7
      src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
  6. 610
      src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
  7. 23
      src/views/ysjl/2000/2400/common/ycjl.vue
  8. 16
      src/views/ysjl/2000/2400/zbg/jj/edit.vue
  9. 4
      src/views/ysjl/7000/jj/edit.vue

3
src/views/ysjl/1000/dj/sy/sysy.vue

@ -483,7 +483,8 @@ export default {
data = { data = {
ysjlId: this.ysjlId, ysjlId: this.ysjlId,
isReport: false, isReport: false,
order: sort order: sort,
templateId: this.$route.query.templateId
} }
} }
this.api({ this.api({

38
src/views/ysjl/2000/2100/zbg/dj/edit.vue

@ -24,10 +24,10 @@
<el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')"> <el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
预览 预览
</el-button> </el-button>
<el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)"> <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
查看驳回意见 查看驳回意见
</el-button> </el-button>
<Symbols /> <Symbols /> -->
</div> </div>
</sticky> </sticky>
<el-tabs v-model="checkedTab" type="card"> <el-tabs v-model="checkedTab" type="card">
@ -327,12 +327,12 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="检验开始日期" prop="jianyankaishiriqi"> <el-form-item label="检验开始日期" prop="jianyankaishiriqi">
<el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" placeholder="选择日期" style="width: 100%;" /> <el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="检验结束日期" prop="jianyanjieshuriqi"> <el-form-item label="检验结束日期" prop="jianyanjieshuriqi">
<el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" /> <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -340,7 +340,7 @@
<el-col :span="9"> <el-col :span="9">
<el-form-item label="下次定期检验日期" label-width="150px" prop="xiacijianyanriqi"> <el-form-item label="下次定期检验日期" label-width="150px" prop="xiacijianyanriqi">
<el-input v-if="ysjl.jianyanjielun === '不符合要求'" v-model="ysjl.xiacijianyanriqishuoming" type="text" disabled="true" /> <el-input v-if="ysjl.jianyanjielun === '不符合要求'" v-model="ysjl.xiacijianyanriqishuoming" type="text" disabled="true" />
<el-date-picker v-else v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" /> <el-date-picker v-else v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
@ -1006,9 +1006,9 @@
</fieldset> </fieldset>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="压力容器原始资料" name="sixth"> <!-- <el-tab-pane label="压力容器原始资料" name="sixth">
<SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" /> <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
<el-dialog :visible.sync="jyfaDialogVisible" title="添加检验方案" width="600px"> <el-dialog :visible.sync="jyfaDialogVisible" title="添加检验方案" width="600px">
<jyfa ref="jyfa" :info="info" @childMethod="getJyxm" /> <jyfa ref="jyfa" :info="info" @childMethod="getJyxm" />
@ -1052,13 +1052,13 @@ import jyfa from '../../../../addJyfa'
import SignName from '@/views/common/SignName' import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact' import Utils from '@/utils/contact'
import pictureUpload from '@/components/Upload' import pictureUpload from '@/components/Upload'
import SliceUpload from '@/components/SliceUpload' // import SliceUpload from '@/components/SliceUpload'
import Symbols from '@/views/common/Symbols' // import Symbols from '@/views/common/Symbols'
import { getDepartmentTreeList } from '@/api/common' import { getDepartmentTreeList } from '@/api/common'
export default { export default {
name: 'RqDjYsjl', name: 'RqDjYsjl',
components: { SignName, Sticky, jyfa, pictureUpload, SliceUpload, Symbols }, components: { SignName, Sticky, jyfa, pictureUpload },
data() { data() {
return { return {
// //
@ -1201,13 +1201,13 @@ export default {
this.ysjl = data.ysjl this.ysjl = data.ysjl
this.departmentId = this.ysjl.departmentId this.departmentId = this.ysjl.departmentId
this.param = data.param ? data.param : {} this.param = data.param ? data.param : {}
// // //
const tempTime = new Date() // const tempTime = new Date()
this.ysjl.jianyankaishiriqi = tempTime // this.ysjl.jianyankaishiriqi = tempTime
this.ysjl.jianyanjieshuriqi = tempTime // this.ysjl.jianyanjieshuriqi = tempTime
let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate() // let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
xcjyrq = new Date(xcjyrq) // xcjyrq = new Date(xcjyrq)
this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1) // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
this.ysjl.xiacijianyanriqishuoming = '/' this.ysjl.xiacijianyanriqishuoming = '/'
this.$set(this.ysjl, 'shebeipinzhong', '储存') this.$set(this.ysjl, 'shebeipinzhong', '储存')
this.$set(this.ysjl, 'jianyanjielun', '符合要求') this.$set(this.ysjl, 'jianyanjielun', '符合要求')
@ -1589,9 +1589,9 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
cyJyxm:{ cyJyxm: {
jyxm: jyxm, jyxm: jyxm,
bgjyxm: jyxm, bgjyxm: jyxm
} }
} }
}).then(data => { }).then(data => {

12
src/views/ysjl/2000/2100/zbg/nd/edit.vue

@ -17,7 +17,7 @@
<el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')"> <el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
预览 预览
</el-button> </el-button>
<Symbols /> <!-- <Symbols /> -->
</div> </div>
</sticky> </sticky>
<el-tabs v-model="checkedTab" type="card"> <el-tabs v-model="checkedTab" type="card">
@ -117,7 +117,7 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="下次定期检验日期" prop="xiacijianyanriqi"> <el-form-item label="下次定期检验日期" prop="xiacijianyanriqi">
<el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" /> <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -190,7 +190,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="下次年度检查日期" prop="xiaciniandujianchariqi"> <el-form-item label="下次年度检查日期" prop="xiaciniandujianchariqi">
<el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" style="width: 100%;" /> <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -281,11 +281,11 @@
import Utils from '@/utils/contact.js' // import Utils from '@/utils/contact.js' //
import Sticky from '@/components/Sticky' import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName' import SignName from '@/views/common/SignName'
import Symbols from '@/views/common/Symbols' // import Symbols from '@/views/common/Symbols'
import { getDepartmentTreeList } from '@/api/common' import { getDepartmentTreeList } from '@/api/common'
export default { export default {
name: 'RqNdYsjl', name: 'RqNdYsjl',
components: { SignName, Sticky, Symbols }, components: { SignName, Sticky },
data() { data() {
return { return {
edit: false, // edit: false, //
@ -381,8 +381,6 @@ export default {
this.ysjl = data.ysjl this.ysjl = data.ysjl
this.departmentId = this.ysjl.departmentId this.departmentId = this.ysjl.departmentId
this.param = data.param ? data.param : {} this.param = data.param ? data.param : {}
const tempTime = new Date()
this.ysjl.jianyanjieshuriqi = tempTime
this.ysjl.jianyanjielun = '符合要求' this.ysjl.jianyanjielun = '符合要求'
this.param = { this.param = {
wentijizai: '无', wentijizai: '无',

46
src/views/ysjl/2000/2200/zbg/dj/edit.vue

@ -351,12 +351,12 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="下次年度检验日期" prop="xiaciniandujianchariqi"> <el-form-item label="下次年度检验日期" prop="xiaciniandujianchariqi">
<el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" editable style="width: 100%;" /> <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" editable style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="下次全面检验日期" prop="xiacijianyanriqi"> <el-form-item label="下次全面检验日期" prop="xiacijianyanriqi">
<el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" editable style="width: 100%;" /> <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" editable style="width: 100%;" value-format="yyyy-MM-dd" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -816,26 +816,7 @@ export default {
name: 'RqDjGcYsjl', name: 'RqDjGcYsjl',
components: { SignName, Sticky, jyfa }, components: { SignName, Sticky, jyfa },
props: { props: {
neibuleibiejielun: {
type: String,
default: '汽车罐车(罐式集装箱)定期检验结论记录'
},
neibuleibieshencha: {
type: String,
default: '汽车罐车(罐式集装箱)资料审查记录'
},
neibuleibieparam: {
type: String,
default: '汽车罐车(罐式集装箱)资料审查记录附页'
},
datashow: {
type: Boolean,
default: true
},
jyxm: {
type: String,
default: ''
}
}, },
data() { data() {
return { return {
@ -890,7 +871,12 @@ export default {
similarVisible: false, similarVisible: false,
similarTableData: [], similarTableData: [],
djjgs: ['无'], djjgs: ['无'],
departmemtArr: [] departmemtArr: [],
neibuleibiejielun: '汽车罐车(罐式集装箱)定期检验结论记录',
neibuleibieshencha: '汽车罐车(罐式集装箱)资料审查记录',
neibuleibieparam: '汽车罐车(罐式集装箱)资料审查记录附页',
datashow: true,
jyxm: ''
} }
}, },
computed: { computed: {
@ -951,12 +937,12 @@ export default {
this.ysjl = data.ysjl this.ysjl = data.ysjl
this.templateId = this.ysjl.departmentId this.templateId = this.ysjl.departmentId
this.param = data.param ? data.param : {} this.param = data.param ? data.param : {}
const tempTime = new Date() // const tempTime = new Date()
this.$set(this.ysjl, 'jianyankaishiriqi', this.dateFormat(new Date())) this.$set(this.ysjl, 'jianyankaishiriqi', this.dateFormat(new Date()))
this.$set(this.ysjl, 'jianyanjieshuriqi', this.dateFormat(new Date())) this.$set(this.ysjl, 'jianyanjieshuriqi', this.dateFormat(new Date()))
let xcjyrq = (tempTime.getFullYear() + 1) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate() // let xcjyrq = (tempTime.getFullYear() + 1) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
xcjyrq = new Date(xcjyrq) // xcjyrq = new Date(xcjyrq)
this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1) // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
this.$set(this.ysjl, 'bianzhiriqi', this.dateFormat(new Date())) this.$set(this.ysjl, 'bianzhiriqi', this.dateFormat(new Date()))
this.$set(this.ysjl, 'jianyanyiju', '《移动式压力容器安全技术监察规程》(TSG R0005)\n' + '《压力容器定期检验规则》(TSG R7001)') this.$set(this.ysjl, 'jianyanyiju', '《移动式压力容器安全技术监察规程》(TSG R0005)\n' + '《压力容器定期检验规则》(TSG R7001)')
this.$set(this.ysjl, 'shebeipinzhong', '汽车罐车') this.$set(this.ysjl, 'shebeipinzhong', '汽车罐车')
@ -1185,9 +1171,9 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
cyJyxm:{ cyJyxm: {
jyxm: jyxm, jyxm: jyxm,
bgjyxm: jyxm, bgjyxm: jyxm
} }
} }
}).then(data => { }).then(data => {

7
src/views/ysjl/2000/2200/zbg/nd/tuoche.vue

@ -629,9 +629,10 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
jyxm: JSON.stringify(this.tableData), cyJyxm: {
bgjyxm: JSON.stringify(this.tableDataBg), jyxm: JSON.stringify(this.tableData),
flag: operation bgjyxm: JSON.stringify(this.tableDataBg)
}
} }
}).then(data => { }).then(data => {
Utils.$emit('bggl-daiban-list') Utils.$emit('bggl-daiban-list')

610
src/views/ysjl/2000/2300/zbg/jj/cyqp.vue

@ -1,610 +0,0 @@
<!-- 车用气瓶安装监督检验报告 -->
<template>
<div class="app-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
保存
</el-button>
<el-button v-show="state === 'update'" type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
更新
</el-button>
<el-button v-show="state === 'update'" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
生成报告
</el-button>
<el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
预览
</el-button>
<el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
查看驳回意见
</el-button>
</div>
</sticky>
<el-tabs v-model="checkedTab" type="card">
<el-tab-pane label="基本信息" name="first">
<el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="130px">
<fieldset>
<legend>基本信息</legend>
<el-row :gutter="20">
<el-col v-if="state === 'create' || ysjl.jilubianhao === null || ysjl.jilubianhao === ''" :span="13">
<el-form-item label="报告编号">
<el-input v-model="jlbh1" style="width:70px" disabled /> -
<el-input v-model="jlbh2" style="width:120px" disabled /> -
<el-input v-model="jlbh3" style="width:120px" />
</el-form-item>
</el-col>
<el-col v-else :span="9">
<el-form-item label="报告编号" prop="jilubianhao">
<el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" @blur="judgeRepeat(ysjl.jilubianhao, ysjl.id)" />
</el-form-item>
</el-col>
<el-col v-if="isRepeat" :span="2">
<span style="color:red">编号重复</span>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="18">
<el-form-item label="安装单位" prop="shigongdanwei">
<el-input v-model="ysjl.shigongdanwei" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="安装许可证编号" prop="shigongxukezheng">
<el-input v-model="ysjl.shigongxukezheng" type="text" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="安装日期" prop="shigongriqi">
<el-date-picker v-model="ysjl.shigongriqi" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="18">
<el-form-item label="气瓶制造单位" prop="zhizaodanwei">
<el-input v-model="ysjl.zhizaodanwei" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="产品编号" prop="chanpinbianhao">
<el-input v-model="ysjl.chanpinbianhao" type="text" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="设备代码" prop="shebeidaima">
<el-input v-model="ysjl.shebeidaima" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="制造日期" prop="zhizaoriqi">
<el-date-picker v-model="ysjl.zhizaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="登记机关" prop="dengjijiguan">
<el-select v-model="ysjl.dengjijiguan" filterable style="width: 100%;">
<el-option v-for="(item, index) in djjgs" :key="index" :label="item" :value="item" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="检验金额(元)" prop="jianyanheding">
<el-input-number v-model="ysjl.jianyanheding" :disabled="ysjl.retreatState === 2 && ysjl.jfState !== null && ysjl.jfState" :controls="false" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
</fieldset>
<fieldset>
<legend>性能参数</legend>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="公称压力" prop="yali">
<el-input v-model="param.yali" type="text" style="width: 120%;" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="工作介质" prop="jiezhi">
<el-input v-model="param.jiezhi" type="text" style="width: 120%;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="车辆牌号/车辆底盘号" label-width="150px" prop="rongqituhao">
<el-input v-model="param.rongqituhao" type="text" style="width: 120%;" />
</el-form-item>
</el-col>
</el-row>
</fieldset>
<fieldset>
<legend>检验信息</legend>
<el-row :gutter="20" style="text-align:left;margin-left: 35px;font-size: 18px;color: #606266;line-height: 60px;font-weight: bolder;">
根据中华人民共和国特种设备安全法特种设备安全监察条例车用气瓶安全技术监察规程的要求该车用气瓶安装经我机构监督检验其安装安全质量
<el-select v-model="ysjl.jianyanjielun" placeholder="请选择" style="width: 100px;">
<el-option label="符合" value="符合" />
<el-option label="不符合" value="不符合" />
</el-select>
相关要求特发此证
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="检验开始日期" prop="jianyankaishiriqi">
<el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="检验结束日期" prop="jianyanjieshuriqi">
<el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="选择科室" prop="departmentId">
<el-cascader
v-model="ysjl.departmentId"
:options="departmemtArr"
:props="{ value: 'id', label: 'name', checkStrictly: true }"
:show-all-levels="false"
@change="handleChange"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="9">
<el-form-item label="检验人员" prop="jianyanrenyuan">
<el-input v-model="jianyanrenyuan" disabled />
<el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
</el-form-item>
</el-col>
<el-col v-if="state !== 'bgView'" :span="9">
<sign-name :ysjl="ysjl" :jianyanrenyuan="jianyanrenyuan" :disabled="edit" @setSignValue="singNameValue" />
</el-col>
</el-row>
</fieldset>
</el-form>
</el-tab-pane>
<el-tab-pane label="车用气瓶安装监督检验报告附页" name="second">
<el-table
:data="bgfyData"
:span-method="arraySpanMethod"
border
highlight-current-row
stripe
style="width:80%"
>
<el-table-column type="index" width="60" align="center" label="序号" />
<el-table-column align="center" label="检验项目">
<el-table-column align="left" prop="jianyanxiang" width="150" label="检验项" />
<el-table-column align="left" prop="jianyanmu" width="300" label="检验内容" />
</el-table-column>
<el-table-column align="center" prop="xiangmuleibie" label="类别" />
<el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope">
<el-select v-model="scope.row.jianyanjieguo" :disabled="edit" filterable allow-create default-first-option placeholder="请选择" style="width: 100%;">
<el-option label="资料齐全" value="资料齐全" />
<el-option label="未到首次检验日期" value="未到首次检验日期" />
<el-option label="无变更" value="无变更" />
<el-option label="未发现超标缺陷" value="未发现超标缺陷" />
<el-option label="符合要求" value="符合要求" />
<el-option label="不符合要求" value="不符合要求" />
<el-option label="合格" value="合格" />
<el-option label="齐全" value="齐全" />
</el-select>
</template>
</el-table-column>
<el-table-column align="center" prop="beizhu" label="工作见证">
<template slot-scope="scope">
<el-input v-model="scope.row.beizhu" :disabled="edit" name="fyGongzuojianzheng" placeholder="请输入内容" />
</template>
</el-table-column>
</el-table>
<br>
<el-form ref="param" :model="param" class="el_form" label-position="right" label-width="250px">
<el-row>
<el-col :span="11" style="height: 60px">
<el-form-item label="对安装单位质量体系运转情况的评价:" prop="aqglqkjcjg">
<el-input v-model="param.aqglqkjcjg" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" style="height: 80px">
<el-form-item label="记事栏:" prop="qita">
<el-input v-model="param.qita" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact.js'
import { getDepartmentTreeList } from '@/api/common'
export default {
name: 'CyqpAjYsjl',
components: { SignName, Sticky },
data() {
return {
//
edit: false, //
bgfyData: [], //
jlbh1: 'PJ1',
jlbh2: 'ZZSYC' + new Date().getFullYear(),
jlbh3: '',
//
jianyanrenyuan: '',
//
// {create=> update=> }
state: this.$route.query.state,
ysjl: {},
departmentId: this.$route.query.departmentId,
param: {},
checkedTab: 'first',
//
//
cols: [
{
name: 'jianyanxiang', // el-table-column prop=''
getValue(row) { //
return row.jianyanxiang
}
},
{
name: 'jianyanmu',
getValue(row) {
return row.jianyanmu
}
}
],
//
rows: [
{
name: 'jianyanxiang',
getValue(row) {
return row.jianyanxiang
}
},
{
name: 'jianyanmu',
getValue(row) {
return row.jianyanmu
}
}
],
isRepeat: false,
users: [],
djjgs: ['无'],
departmemtArr: []
}
},
// computed: {
// jilubianhao: function() {
// let bianhao
// if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
// return this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
// } else {
// bianhao = this.ysjl.jilubianhao
// }
// return this.judgeRepeat(bianhao, this.ysjl.id)
// }
// },
// watch: {
// jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// },
// jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id)
// }
// },
//
created() {
// if (this.state === 'create') {
// //
// this.initYsjl()
// } else {
// this.getYsjl()
// this.getParam(this.$route.query.id, this.$route.query.sbzldm)
// }
// this.getUserList()
// this.getJyxm(1)
// this.getArea()
},
mounted() {
if (!this.ysjl.jilubianhao) {
this.getMaxBh()
}
this.getDepartmentArr()
},
methods: {
getDepartmentArr() {
getDepartmentTreeList().then(res => {
this.departmemtArr = res
})
},
handleChange(v) {
this.ysjl.departmentId = v[1]
},
initYsjl() {
this.api({
url: '/ysjl/initYsjl',
method: 'post',
data: {
templateId: this.$route.query.templateId,
renwuId: this.$route.query.renwuId,
neibuleibie: this.$route.query.neibuleibie,
sblbdm: this.$route.query.sblbdm,
sblbmc: this.$route.query.sblbmc,
sbpzdm: this.$route.query.sbpzdm,
sbpzmc: this.$route.query.sbpzmc
}
}).then(data => {
this.ysjl = data.ysjl
this.departmentId = this.ysjl.departmentId
this.param = data.param ? data.param : {}
const tempTime = new Date()
this.$set(this.ysjl, 'jianyanjielun', '符合')
this.ysjl.jianyankaishiriqi = tempTime
this.ysjl.jianyanjieshuriqi = tempTime
this.ysjl.jiaoheriqi = tempTime
let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
xcjyrq = new Date(xcjyrq)
this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
this.ysjl.xiacijianyanriqishuoming = '/'
})
},
getYsjl() {
this.api({
url: '/ysjl',
method: 'get',
params: {
ysjlId: this.$route.query.id
}
}).then(data => {
this.ysjl = data
this.departmentId = this.ysjl.departmentId
if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
}
//
if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
this.getMaxBh()
}
})
},
getParam(ysjlId, sbzldm) {
// id
this.api({
url: '/ysjl/getParamByYsjlId',
method: 'get',
params: { ysjlId: ysjlId, sbzldm: sbzldm }
}).then(data => {
this.param = data
})
},
//
singNameValue(data) {
this.jianyanrenyuan = data.name
this.ysjl.jianyanrenyuan = data.id
if (this.state !== 'create') {
this.common.signName(this.ysjl.id, this.ysjl.jianyanrenyuan)
Utils.$emit('ysjl-list')
}
},
getUserList() {
this.api({
url: '/user/all',
method: 'get'
}).then(data => {
this.users = data
})
},
//
getMaxBh() {
const aheadPart = this.jlbh1 + '-' + this.jlbh2 + this.jlbh3 + '-'
this.api({
url: '/ysjl/gainCurrentBh',
method: 'get',
params: {
aheadPart: aheadPart,
hinderPart: ''
}
}).then(data => {
this.jlbh3 = data
})
},
//
getJyxm(sort) {
let url = ''
let data = {}
if (this.state === 'create') {
url = '/jyxm/getCyJyxm'
data = {
templateId: this.$route.query.templateId,
order: sort
}
} else {
url = '/jyxm/getCyJyxmByYsjl'
data = {
ysjlId: this.$route.query.id,
isReport: false,
order: sort
}
}
this.api({
url: url,
method: 'get',
params: data
}).then(data => {
console.log(data)
this.bgfyData = data
this.tableJs.getData(this.cols, this.rows, data)
})
},
saveYsjl: function(operation) {
this.tableData = []
const retData = []
for (let i = 0; i < this.bgfyData.length; i++) {
//
const retRow = {}
retRow.id = this.bgfyData[i].id
if (this.bgfyData[i].jianyanjieguo !== '' && this.bgfyData[i].jianyanjieguo !== null && this.bgfyData[i].jianyanjieguo !== undefined) {
retRow.jianyanjieguo = this.bgfyData[i].jianyanjieguo
}
if (this.bgfyData[i].beizhu !== '' && this.bgfyData[i].beizhu !== null && this.bgfyData[i].beizhu !== undefined) {
retRow.beizhu = this.bgfyData[i].beizhu
}
retData.push(retRow)
}
this.tableData.push(retData)
let type = ''
if (operation === 'add') {
type = 'post'
this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl'
this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
this.ysjl.jlprintState = 0
this.ysjl.jianyanxiangmu = 'cyqp'
this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
this.save(operation, type)
} else if (operation === 'upd') {
type = 'put'
this.save(operation, type)
} else if (operation === 'build') {
if (this.ysjl.jilubianhao && this.ysjl.jilubianhao.indexOf('COPY') > -1) {
this.$message({
type: 'error',
message: '请先修改记录编号,不允许携带COPY标志生成报告!'
})
return false
}
if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
this.$message({
type: 'error',
message: '请先签名再生成报告!'
})
return false
}
this.tableData = null
type = 'put'
this.save(operation, type)
}
},
save(operation, type) {
//
if (this.isRepeat) {
this.$message({ message: '报告编号重复,请先修改报告编号再保存', type: 'error' })
return false
} else {
this.$refs['ysjl'].validate(valid => {
if (valid) {
const jyxm = JSON.stringify(this.tableData)
this.api({
url: '/ysjl',
method: type,
data: {
ysjl: this.ysjl,
param: this.param,
jyxm: jyxm,
bgjyxm: jyxm,
flag: operation
}
}).then(data => {
//
Utils.$emit('task-list')
Utils.$emit('bggl-daiban-list')
if (operation === 'add') {
this.ysjl.id = data
this.param.ysjlId = data
this.$message({ message: '保存成功', type: 'success' })
} else if (operation === 'upd') {
this.$message({ message: '更新成功', type: 'success' })
} else if (operation === 'build') {
Utils.$emit('ysjl-list')
Utils.$emit('ysjl-yb-list')
Utils.$emit('bggl-daiban-list')
// 16
this.common.updRenwuState(this.ysjl.id, 2, true)
// pdf
this.common.viewYsjlNoOpen(this.ysjl.id, 'YSJL')
this.$message({ message: '生成报告成功', type: 'success' })
this.$store.dispatch('delCurrentViews', {
view: this.$route,
$router: this.$router
})
}
this.state = 'update'
})
}
})
}
},
judgeRepeat(bianhao, id) {
this.api({
url: '/ysjl/judgeRepeat',
method: 'get',
params: {
ysjlId: id,
bianhao: bianhao
}
}).then(data => {
this.isRepeat = data > 0
})
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 1) {
if (rowIndex === 0) {
return [2, 1]
} else if (rowIndex === 2 || rowIndex === 6) {
return [3, 1]
} else if (rowIndex === 5 || rowIndex === 9 || rowIndex === 10) {
return [1, 2]
} else {
return [0, 0]
}
} else if (columnIndex === 2) {
if (rowIndex === 5 || rowIndex === 9 || rowIndex === 10) {
return [0, 0]
}
} else if (columnIndex === 5) {
if (rowIndex === 0) {
return [11, 1]
} else {
return [0, 0]
}
}
},
/**
* 查询区划
*/
getArea() {
this.api({
url: '/area/getShiArea',
method: 'get',
params: {
shidaima: '370100'
}
}).then(data => {
data.forEach(area => {
this.djjgs.push(area.label + '市场监督管理局')
})
})
}
}
}
</script>

23
src/views/ysjl/2000/2400/common/ycjl.vue

@ -24,10 +24,10 @@
<el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')"> <el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
预览 预览
</el-button> </el-button>
<el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)"> <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
查看驳回意见 查看驳回意见
</el-button> </el-button>
<Symbols /> <Symbols /> -->
</div> </div>
</sticky> </sticky>
<el-tabs v-model="checkedTab" type="card"> <el-tabs v-model="checkedTab" type="card">
@ -547,10 +547,10 @@ import Sticky from '@/components/Sticky'
import jyfa from '@/views/ysjl/addJyfa' import jyfa from '@/views/ysjl/addJyfa'
import SignName from '@/views/common/SignName' import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact.js' import Utils from '@/utils/contact.js'
import Symbols from '@/views/common/Symbols' // import Symbols from '@/views/common/Symbols'
export default { export default {
name: 'Ycjl', name: 'Ycjl',
components: { SignName, Sticky, jyfa, Symbols }, components: { SignName, Sticky, jyfa },
props: { props: {
neibuleibieparam: { neibuleibieparam: {
type: String, type: String,
@ -692,10 +692,10 @@ export default {
this.ysjl = data.ysjl this.ysjl = data.ysjl
this.param = (data.param !== null && data.param !== undefined) ? data.param : {} this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
// //
const tempTime = new Date() // const tempTime = new Date()
let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate() // let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
xcjyrq = new Date(xcjyrq) // xcjyrq = new Date(xcjyrq)
this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1) // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
this.dateFormat() this.dateFormat()
this.ysjl.xiacijianyanriqishuoming = '/' this.ysjl.xiacijianyanriqishuoming = '/'
this.ysjl.bianzhiren = this.$store.getters.userId + '' this.ysjl.bianzhiren = this.$store.getters.userId + ''
@ -944,9 +944,10 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
jyxm: jyxm, cyJyxm: {
bgjyxm: jyxm, jyxm: jyxm,
flag: operation bgjyxm: jyxm
}
} }
}).then(data => { }).then(data => {
// //

16
src/views/ysjl/2000/2400/zbg/jj/edit.vue

@ -34,10 +34,10 @@
<el-button type="success" size="medium" icon="el-icon-edit" @click="batchUpdDate"> <el-button type="success" size="medium" icon="el-icon-edit" @click="batchUpdDate">
批量修改日期 批量修改日期
</el-button> </el-button>
<el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)"> <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
查看驳回意见 查看驳回意见
</el-button> </el-button>
<Symbols /> <Symbols /> -->
</div> </div>
</sticky> </sticky>
<el-tabs v-model="checkedTab" type="card"> <el-tabs v-model="checkedTab" type="card">
@ -402,9 +402,9 @@
</el-row> </el-row>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="压力容器原始资料" name="third"> <!-- <el-tab-pane label="压力容器原始资料" name="third"> -->
<SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" /> <!-- <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
<el-dialog :visible.sync="jyxmrqShow" title="批量修改日期" width="500px" @close="closeDialog"> <el-dialog :visible.sync="jyxmrqShow" title="批量修改日期" width="500px" @close="closeDialog">
<template> <template>
@ -456,14 +456,14 @@
import Sticky from '@/components/Sticky' import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName' import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact.js' import Utils from '@/utils/contact.js'
import SliceUpload from '@/components/SliceUpload' // import SliceUpload from '@/components/SliceUpload'
import Symbols from '@/views/common/Symbols' // import Symbols from '@/views/common/Symbols'
import jyfa from '@/views/ysjl/addJyfa' import jyfa from '@/views/ysjl/addJyfa'
import { getDepartmentTreeList } from '@/api/common' import { getDepartmentTreeList } from '@/api/common'
export default { export default {
name: 'YcJdYsjl', name: 'YcJdYsjl',
components: { SignName, Sticky, SliceUpload, Symbols, jyfa }, components: { SignName, Sticky, jyfa },
data() { data() {
return { return {
// //

4
src/views/ysjl/7000/jj/edit.vue

@ -589,8 +589,8 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
cyJyxm:{ cyJyxm: {
jyxm: JSON.stringify(this.tableData), jyxm: JSON.stringify(this.tableData)
} }
} }
}).then(data => { }).then(data => {

Loading…
Cancel
Save