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

优化页面移除报告发放等

master
李磊 3 years ago
parent
8f74ef3217
commit
37ae77f3b1
9 changed files with 13 additions and 219 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      src/views/bggl/components/original_db_list.vue
  2. 10
      src/views/print/1000/grant_create.vue
  3. 26
      src/views/print/1000/print_list.vue
  4. 26
      src/views/print/2000/print_list.vue
  5. 32
      src/views/print/3000/print_list.vue
  6. 35
      src/views/print/4000/print_list.vue
  7. 17
      src/views/print/5000/print_list.vue
  8. 23
      src/views/print/8000/print_list.vue
  9. 1
      src/views/print/grant_list.vue

62
src/views/bggl/components/original_db_list.vue
View File

@ -895,10 +895,21 @@ export default {
data: {
ids: ysjlId,
generateType: 'END'
},
paramsSerializer: function(data) {
return qs.stringify(data, { indices: false })
}
})
this.preview({
url: '/print/batchGeneratePdfHgz',
method: 'get',
params: {
ysjlIds: ysjlId
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
})
// 发起消红请求
this.cleanRed(ysjls)
}
}
})
@ -964,53 +975,6 @@ export default {
})
}
},
cleanRed(ysjls) {
if (ysjls != null && ysjls.length > 0) {
this.api({
url: '/template/getById',
method: 'get',
params: {
id: ysjls[0].modelId
}
}).then(data => {
if (data.cleanState) {
const cleanData = []
ysjls.forEach(ysjl => {
// 排除使用单位标注了测试的报告
if (ysjl.shiyongdanwei.indexOf('测试') === -1) {
const data = {}
data.shiyongdanwei = ysjl.shiyongdanwei
data.shebeizhonglei = ysjl.shebeizhongleidaima
// 获取内部类别对应中文名称
data.jianyanleibie = this.formatter.formatterCategory(null, null, ysjl.neibuleibie)
data.zhucedaima = ysjl.zhucedaima
data.shiyongdengjibianhao = ysjl.shiyongdengjibianhao
data.jianyanriqi = ysjl.jianyanjieshuriqi
data.xiacijianyanriqi = ysjl.xiacijianyanriqi
data.jianyanjielun = ysjl.jianyanjielun
data.baogaobianhao = ysjl.baogaobianhao
data.quxian = ysjl.quhuamingcheng
data.jianyanjigou = '济南市特种设备检验研究院'
data.shi = '济南市'
cleanData.push(data)
}
})
if (cleanData.length > 0) {
this.apisjse({
url: '/baseInfo/chaoqijiekoupi',
method: 'post',
headers: { 'content-type': 'application/x-www-form-urlencoded' },
data: qs.stringify({
loginname: 'jntjysjgx',
password: '123',
jiekous: JSON.stringify(cleanData)
})
})
}
}
})
}
},
qianming() {
this.api({
url: '/user/validationPwd',

10
src/views/print/1000/grant_create.vue
View File

@ -92,16 +92,6 @@
<el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" sortable="custom" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
<el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="收费单状态" prop="sfdId" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.sfdId !== null" type="success">

26
src/views/print/1000/print_list.vue
View File

@ -3,9 +3,6 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="hasPerm('print:SFD')" type="success" icon="el-icon-printer" @click="printSfd">
收费通知单
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('YSJL')">
原始记录
</el-button>
@ -15,10 +12,6 @@
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('HGZ')">
合格证
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -59,15 +52,6 @@
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态：</span>
<el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0">
未发放
</el-radio>
<el-radio :label="1">
已发放
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
@ -120,16 +104,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="60">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

26
src/views/print/2000/print_list.vue
View File

@ -3,9 +3,6 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="hasPerm('print:SFD')" type="success" icon="el-icon-printer" @click="printSfd">
收费通知单
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('YSJL')">
原始记录
</el-button>
@ -15,10 +12,6 @@
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('HGZ')">
合格证
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -56,15 +49,6 @@
<el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态：</span>
<el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0">
未发放
</el-radio>
<el-radio :label="1">
已发放
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
@ -117,16 +101,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="60">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

32
src/views/print/3000/print_list.vue
View File

@ -3,9 +3,6 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="hasPerm('print:SFD')" type="success" icon="el-icon-printer" @click="printSfd">
收费通知单
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('YSJL')">
原始记录
</el-button>
@ -15,10 +12,6 @@
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('HGZ')">
合格证
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -35,12 +28,6 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="hasRole('ADMIN')" type="primary" @click="sign">
签章
</el-button>
<el-button v-if="hasRole('ADMIN')" type="primary" @click="removeSign">
移除签章
</el-button>
</div>
</sticky>
<el-form ref="testrefprint">
@ -63,15 +50,6 @@
<el-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">打印状态：</span>
<el-radio-group v-model="listQuery.printState" @change="handleFilter">
<el-radio :label="0">
未打印
</el-radio>
<el-radio :label="1">
已打印
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
@ -108,16 +86,6 @@
<el-table-column align="center" label="检验日期" prop="jianyankaishiriqi" width="110" sortable="custom" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
<el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="100">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

35
src/views/print/4000/print_list.vue
View File

@ -3,28 +3,15 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="hasPerm('print:SFD')" type="success" icon="el-icon-printer" @click="printSfd">
收费通知单
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('YSJL')">
原始记录
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('XMB')">
项目表
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('JYBG')">
检验报告
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('QZJZS')">
监检证书
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('HGZ')">
合格证
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -33,26 +20,14 @@
<el-dropdown-item command="YSJL">
原始记录
</el-dropdown-item>
<el-dropdown-item command="XMB">
项目表
</el-dropdown-item>
<el-dropdown-item command="JYBG">
检验报告
</el-dropdown-item>
<el-dropdown-item command="QZJZS">
监检证书
</el-dropdown-item>
<el-dropdown-item command="HGZ">
合格证
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="hasRole('ADMIN')" type="primary" @click="sign">
签章
</el-button>
<el-button v-if="hasRole('ADMIN')" type="primary" @click="removeSign">
移除签章
</el-button>
<!-- <el-button type="success" icon="el-icon-edit" @click="editPrintState">-->
<!-- 标记为已打印-->
<!-- </el-button>-->
@ -123,16 +98,6 @@
<el-table-column align="center" label="检验日期" prop="jianyankaishiriqi" width="110" sortable="custom" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
<el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="100">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

17
src/views/print/5000/print_list.vue
View File

@ -3,9 +3,6 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="hasPerm('print:SFD')" type="success" icon="el-icon-printer" @click="printSfd">
收费通知单
</el-button>
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('YSJL')">
原始记录
</el-button>
@ -15,10 +12,6 @@
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('HGZ')">
合格证
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -103,16 +96,6 @@
<el-table-column align="center" label="检验日期" prop="jianyankaishiriqi" width="110" sortable="custom" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
<el-table-column align="center" label="检验结论" prop="jianyanjielun" width="80" />
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="100">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

23
src/views/print/8000/print_list.vue
View File

@ -9,10 +9,6 @@
<el-button type="primary" icon="el-icon-printer" @click="batchToPrint('JYBG')">
检验报告
</el-button>
<el-button type="primary" @click="openGrant()">
<svg-icon icon-class="form" />
报告发放
</el-button>
<el-dropdown @command="printOnline">
<el-button type="success" icon="el-icon-view">
预览打印<i class="el-icon-arrow-down el-icon--right" />
@ -50,15 +46,6 @@
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态：</span>
<el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0">
未发放
</el-radio>
<el-radio :label="1">
已发放
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
@ -111,16 +98,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="交费状态" prop="jfState" width="90" fixed="right">
<template slot-scope="scope">
<el-tag v-if="scope.row.jfState" type="success">
已交费
</el-tag>
<el-tag v-else type="danger">
未交费
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" prop="" width="60">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-view" title="预览" circle @click="viewBaogao(scope.row.id, scope.row.reportVersion)" />

1
src/views/print/grant_list.vue
View File

@ -54,7 +54,6 @@
<el-table-column align="center" label="发票号码" prop="lingqurenDianhua" />
<el-table-column align="center" label="发放日期" prop="createTime" />
<el-table-column align="center" label="台数" prop="taishu" />
<el-table-column align="center" label="交费金额(元)" prop="hejijine" />
</el-table>
<pagination v-show="total > 0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageSize" @pagination="getList" />
</div>

Write Preview
Loading…
Cancel
Save