Browse Source

优化调整接口及传参

master
李磊 3 years ago
parent
commit
15136ab8f5
  1. 11
      src/api/ysjl.js
  2. 40
      src/views/bggl/banjie_list.vue
  3. 1213
      src/views/bggl/components/boiler_db_list.vue
  4. 7
      src/views/bggl/components/original_db_list.vue
  5. 12
      src/views/bggl/daiban_list.vue
  6. 2
      src/views/bggl/eliminatingred_list.vue
  7. 28
      src/views/bggl/yiban_list.vue
  8. 6
      src/views/print/1000/grant_create.vue
  9. 9
      src/views/print/1000/grant_list_yff.vue
  10. 64
      src/views/print/1000/print_list.vue
  11. 39
      src/views/print/2000/print_list.vue
  12. 37
      src/views/print/3000/print_list.vue
  13. 35
      src/views/print/4000/print_list.vue
  14. 35
      src/views/print/5000/print_list.vue
  15. 19
      src/views/print/8000/print_list.vue
  16. 3
      src/views/print/grant/grant_list_chengya.vue
  17. 3
      src/views/print/grant/grant_list_jidian.vue
  18. 3
      src/views/print/grant_list.vue
  19. 9
      src/views/ysjl/2000/sfqk.vue
  20. 368
      src/views/ysjl/components/gascylinder_db_list.vue
  21. 149
      src/views/ysjl/components/gascylinder_yb_list.vue
  22. 1010
      src/views/ysjl/components/manufacture_db_list.vue
  23. 153
      src/views/ysjl/components/manufacture_yb_list.vue
  24. 139
      src/views/ysjl/components/original_db_list.vue
  25. 17
      src/views/ysjl/components/original_yb_list.vue
  26. 14
      src/views/ysjl/db_list.vue
  27. 15
      src/views/ysjl/yb_list.vue

11
src/api/ysjl.js

@ -134,6 +134,17 @@ export function getNeedRecordList(query) {
}) })
} }
/**
* 待办原始记录列表查询
*/
export function getListUnDoneYsjl(params) {
return api({
url: '/ysjl/getListUnDoneYsjl',
method: 'get',
params
})
}
export function exportExcel(params) { export function exportExcel(params) {
return preview({ return preview({
url: '/download/downloadGrantList' + '?' + qs.stringify(params, { indices: false }), url: '/download/downloadGrantList' + '?' + qs.stringify(params, { indices: false }),

40
src/views/bggl/banjie_list.vue

@ -1,12 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="filter-container"> <div class="filter-container">
<div v-show="hasPerm('bggl:update') || hasPerm('bggl:regenerate')" class="sub-navbar"> <div v-show="hasPerm('bggl:banjie:update') || hasPerm('bggl:banjie:regenerate')" class="sub-navbar">
<sticky> <sticky>
<el-button v-if="hasPerm('bggl:update')" type="danger" icon="el-icon-refresh" @click="resetFlow"> <el-button v-if="hasPerm('bggl:banjie:update')" type="danger" icon="el-icon-refresh" @click="resetFlow">
重启流程 重启流程
</el-button> </el-button>
<template v-if="hasPerm('bggl:regenerate')"> <template v-if="hasPerm('bggl:banjie:regenerate')">
<el-button type="warning" icon="el-icon-refresh" @click="generatePdf('YSJL')"> <el-button type="warning" icon="el-icon-refresh" @click="generatePdf('YSJL')">
生成记录 生成记录
</el-button> </el-button>
@ -50,15 +50,6 @@
@keyup.enter.native="handleFilter" @keyup.enter.native="handleFilter"
/> />
<br> <br>
<span class="radio-group-label">查看类型</span>
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
<el-radio :label="undefined">
全部
</el-radio>
</el-radio-group>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -530,11 +521,8 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'shenpiriqi desc,id', // orderBy: 'shenpiriqi desc,id desc', //
sort: 'desc', // hasChild: true
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
}, },
multipleSelection: [], multipleSelection: [],
dialogQueryVisible: false, dialogQueryVisible: false,
@ -564,13 +552,11 @@ export default {
listQueryExport: { listQueryExport: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'shenpiriqi desc,id', // orderBy: 'shenpiriqi desc,id desc', //
sort: 'desc', //
searchYsjl: { searchYsjl: {
createBy: this.$store.getters.userId createBy: this.$store.getters.userId
}, },
hasChild: false, hasChild: false
hasFinish: true
}, },
totalExport: 0, totalExport: 0,
outFile: '', // el outFile: '', // el
@ -630,7 +616,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListBanjie',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -692,8 +678,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -902,11 +887,8 @@ export default {
this.listQuery = { this.listQuery = {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'shenpiriqi desc,id', // orderBy: 'shenpiriqi desc,id desc', //
sort: 'desc', // hasChild: true
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
} }
this.getList() this.getList()
}, },

1213
src/views/bggl/components/boiler_db_list.vue

File diff suppressed because it is too large

7
src/views/bggl/components/original_db_list.vue

@ -6,7 +6,7 @@
<el-button type="success" @click="batchSend"> <el-button type="success" @click="batchSend">
<svg-icon icon-class="send" /> 批量发送 <svg-icon icon-class="send" /> 批量发送
</el-button> </el-button>
<el-button v-if="hasPerm('bggl:reject')" type="primary" @click="batchBohui"> <el-button v-if="hasPerm('bggl:un-done-jybg:reject')" type="primary" @click="batchBohui">
<svg-icon icon-class="reject" /> 批量驳回 <svg-icon icon-class="reject" /> 批量驳回
</el-button> </el-button>
<el-button type="success" @click="batchSign"> <el-button type="success" @click="batchSign">
@ -18,9 +18,6 @@
<el-button type="danger" icon="el-icon-delete" @click="delReport"> <el-button type="danger" icon="el-icon-delete" @click="delReport">
退回到记录 退回到记录
</el-button> </el-button>
<el-button v-if="$store.getters.departmentId === 68 || $store.getters.username === 'admin'" type="success" @click="batchEnd">
<svg-icon icon-class="send" /> 办结报告
</el-button>
</div> </div>
</sticky> </sticky>
<el-form> <el-form>
@ -566,7 +563,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListUnDoneJybg',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {

12
src/views/bggl/daiban_list.vue

@ -1,17 +1,11 @@
<template> <template>
<boiler-db-list v-if="ifBoiler" /> <original-db-list />
<original-db-list v-else />
</template> </template>
<script> <script>
import originalDbList from './components/original_db_list' import originalDbList from './components/original_db_list'
import boilerDbList from './components/boiler_db_list'
export default { export default {
name: 'TODOReport', name: 'TODOReport',
components: { originalDbList, boilerDbList }, components: { originalDbList }
data() {
return {
ifBoiler: this.$store.getters.departmentId === 75
}
}
} }
</script> </script>

2
src/views/bggl/eliminatingred_list.vue

@ -365,7 +365,7 @@ export default {
}, },
getTemplateList() { getTemplateList() {
this.api({ this.api({
url: '/template/getAll', url: '/template/all',
method: 'get', method: 'get',
params: { params: {
bglx: 1, bglx: 1,

28
src/views/bggl/yiban_list.vue

@ -1,19 +1,19 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="filter-container"> <div class="filter-container">
<sticky style="margin-bottom: 10px;"> <!-- <sticky style="margin-bottom: 10px;">
<div class="sub-navbar"> <div class="sub-navbar">
<el-button type="danger" icon="el-icon-back" @click="withDraw"> <el-button type="danger" icon="el-icon-back" @click="withDraw">
撤回报告 撤回报告
</el-button> </el-button>
</div> </div>
</sticky> </sticky>-->
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 300px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.ownRoles" placeholder="请选择所处角色" style="width: 165px" clearable @change="changeOwnRoles"> <el-select v-model="listQuery.flowstatus" placeholder="请选择所处角色" style="width: 165px" clearable @change="changeOwnRoles">
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@ -23,15 +23,6 @@
清空条件 清空条件
</el-button> </el-button>
<br> <br>
<span class="radio-group-label">查看类型</span>
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
<el-radio :label="undefined">
全部
</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -106,12 +97,12 @@
</template> </template>
<script> <script>
import Sticky from '@/components/Sticky' // import Sticky from '@/components/Sticky'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import Utils from '../../utils/contact.js' import Utils from '../../utils/contact.js'
export default { export default {
name: 'OwnDoneReport', name: 'OwnDoneReport',
components: { Sticky, Pagination }, components: { /* Sticky, */Pagination },
data() { data() {
return { return {
total: 0, total: 0,
@ -130,15 +121,12 @@ export default {
sbzlList: [], sbzlList: [],
statusList: [ statusList: [
{ {
value: 1,
label: '检验人员'
}, {
value: 2, value: 2,
label: '审核人员' label: '审核人员'
}/*, { }, {
value: 3, value: 3,
label: '审批人员' label: '审批人员'
}*/ }
], ],
userList: this.$store.getters.allUser, userList: this.$store.getters.allUser,
userId: this.$store.getters.userId userId: this.$store.getters.userId
@ -158,7 +146,7 @@ export default {
getList() { getList() {
this.listQuery.cjState = 'bggl' this.listQuery.cjState = 'bggl'
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListDoneJybg',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {

6
src/views/print/1000/grant_create.vue

@ -150,8 +150,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
@ -202,8 +201,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {

9
src/views/print/1000/grant_list_yff.vue

@ -96,8 +96,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
@ -147,8 +146,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -168,8 +166,7 @@ export default {
}, },
clearQuery() { clearQuery() {
this.listQuery = { this.listQuery = {
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined, flowstatus: undefined,

64
src/views/print/1000/print_list.vue

@ -42,11 +42,11 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -54,14 +54,14 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态</span> <span class="radio-group-label">发放状态</span>
<el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter"> <el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未发放 未发放
</el-radio> </el-radio>
@ -158,15 +158,11 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
searchYsjl: {
shebeizhongleidaima: '1000', shebeizhongleidaima: '1000',
fafangState: 0 fafangState: 0
}
}, },
flowUserList: [], flowUserList: [],
dialogFormVisible: false, dialogFormVisible: false,
@ -199,7 +195,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -208,8 +204,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -260,7 +255,6 @@ export default {
}) })
}, },
batchToPrint(type) { batchToPrint(type) {
const ysjl = this.multipleSelection[0]
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message('请选择单条或者多条设备进行打印。') this.$message('请选择单条或者多条设备进行打印。')
return false return false
@ -280,27 +274,6 @@ export default {
return false return false
} }
} }
this.api({ //
url: '/ysjl/getListBanjie',
method: 'get',
params: {
pageNum: 1,
pageRow: 20,
searchYsjl: {
baogaobianhao: '(' + new Date().getFullYear() + ')',
shiyongdanwei: ysjl.shiyongdanwei,
jfState: false,
shebeizhongleidaima: '1000'
}
}
}).then(data => {
if (data.total !== 0) {
this.$message({
type: 'warning',
message: '该单位名下存在未收费的检验项,请确认后在进行操作!'
})
return false
} else {
this.preview({ this.preview({
url: '/print/createXml', url: '/print/createXml',
method: 'post', method: 'post',
@ -329,13 +302,16 @@ export default {
}) })
} }
}) })
}
})
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.$set(this, 'listQuery', {
pageNum: 1, //
pageRow: 20, //
orderBy: 'id desc', //
hasChild: false,
flowstatus: undefined,
shebeizhongleidaima: '1000', shebeizhongleidaima: '1000',
printState: 0 fafangState: 0
}) })
this.getList() this.getList()
}, },

39
src/views/print/2000/print_list.vue

@ -42,11 +42,11 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -54,11 +54,11 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @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.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态</span> <span class="radio-group-label">发放状态</span>
<el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter"> <el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未发放 未发放
</el-radio> </el-radio>
@ -155,16 +155,11 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
searchYsjl: {
shebeizhongleidaima: '2000', shebeizhongleidaima: '2000',
jianyanleibie: 'DJ',
fafangState: 0 fafangState: 0
}
}, },
flowUserList: [], flowUserList: [],
dialogFormVisible: false, dialogFormVisible: false,
@ -197,7 +192,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -206,8 +201,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -315,9 +309,14 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.$set(this, 'listQuery', {
pageNum: 1, //
pageRow: 20, //
orderBy: 'id desc', //
hasChild: false,
flowstatus: undefined,
shebeizhongleidaima: '2000', shebeizhongleidaima: '2000',
printState: 0 fafangState: 0
}) })
this.getList() this.getList()
}, },

37
src/views/print/3000/print_list.vue

@ -45,11 +45,11 @@
</sticky> </sticky>
<el-form ref="testrefprint"> <el-form ref="testrefprint">
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -57,15 +57,15 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">打印状态</span> <span class="radio-group-label">打印状态</span>
<el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter"> <el-radio-group v-model="listQuery.printState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未打印 未打印
</el-radio> </el-radio>
@ -149,12 +149,9 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
searchYsjl: {
shebeizhongleidaima: '3000', shebeizhongleidaima: '3000',
printState: 0 printState: 0
}
}, },
flowUserList: [], flowUserList: [],
dialogFormVisible: false, dialogFormVisible: false,
@ -206,7 +203,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/report/getList', url: '/ysjl/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -215,8 +212,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -322,7 +318,10 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.$set(this, 'listQuery', {
pageNum: 1, //
pageRow: 20, //
orderBy: 'id desc', //
shebeizhongleidaima: '3000', shebeizhongleidaima: '3000',
printState: 0 printState: 0
}) })

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

@ -60,11 +60,11 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -72,14 +72,14 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.name" /> <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.name" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">打印状态</span> <span class="radio-group-label">打印状态</span>
<el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter"> <el-radio-group v-model="listQuery.printState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未打印 未打印
</el-radio> </el-radio>
@ -163,12 +163,9 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
searchYsjl: {
shebeizhongleidaima: '4000', shebeizhongleidaima: '4000',
printState: 0 printState: 0
}
}, },
flowUserList: [], flowUserList: [],
dialogFormVisible: false, dialogFormVisible: false,
@ -213,7 +210,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/report/getList', url: '/ysjl/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -222,8 +219,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -313,7 +309,10 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.$set(this, 'listQuery', {
pageNum: 1, //
pageRow: 20, //
orderBy: 'id desc', //
shebeizhongleidaima: '4000', shebeizhongleidaima: '4000',
printState: 0 printState: 0
}) })

35
src/views/print/5000/print_list.vue

@ -42,11 +42,11 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="(全部)报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.sfdSerialNumber" placeholder="(全部)收费单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -54,14 +54,14 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">打印状态</span> <span class="radio-group-label">打印状态</span>
<el-radio-group v-model="listQuery.searchYsjl.printState" @change="handleFilter"> <el-radio-group v-model="listQuery.printState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未打印 未打印
</el-radio> </el-radio>
@ -142,12 +142,9 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
searchYsjl: {
shebeizhongleidaima: '5000', shebeizhongleidaima: '5000',
printState: 0 printState: 0
}
}, },
flowUserList: [], flowUserList: [],
dialogFormVisible: false, dialogFormVisible: false,
@ -186,7 +183,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/report/getList', url: '/report/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -195,8 +192,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -302,7 +298,10 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.$set(this, 'listQuery', {
pageNum: 1, //
pageRow: 20, //
orderBy: 'id desc', //
shebeizhongleidaima: '5000', shebeizhongleidaima: '5000',
printState: 0 printState: 0
}) })

19
src/views/print/8000/print_list.vue

@ -149,8 +149,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
@ -188,7 +187,7 @@ export default {
}, },
getList() { getList() {
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListPrint',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -197,8 +196,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -298,13 +296,14 @@ export default {
}, },
clearQuery() { clearQuery() {
this.listQuery = { this.listQuery = {
shebeizhongleidaima: '8000', pageNum: 1, //
printState: 0, pageRow: 20, //
order: 'id', // orderBy: 'id desc', //
sort: 'desc', //
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined flowstatus: undefined,
shebeizhongleidaima: '8000',
fafangState: 0
} }
this.getList() this.getList()
}, },

3
src/views/print/grant/grant_list_chengya.vue

@ -83,8 +83,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageSize: 20, // pageSize: 20, //
orderBy: 'create_time desc', // orderBy: 'create_time desc' //
sort: 'desc' //
}, },
total: 0, total: 0,
list: [], list: [],

3
src/views/print/grant/grant_list_jidian.vue

@ -72,8 +72,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageSize: 20, // pageSize: 20, //
orderBy: 'create_time desc', // orderBy: 'create_time desc' //
sort: 'desc' //
}, },
total: 0, total: 0,
list: [], list: [],

3
src/views/print/grant_list.vue

@ -73,8 +73,7 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageSize: 20, // pageSize: 20, //
orderBy: 'create_time desc', // orderBy: 'create_time desc' //
sort: 'desc' //
}, },
total: 0, total: 0,
list: [], list: [],

9
src/views/ysjl/2000/sfqk.vue

@ -12,15 +12,6 @@
查询 查询
</el-button> </el-button>
<br> <br>
<span class="radio-group-label">查看类型</span>
<el-radio-group v-model="listQuery.printStatus" @change="handleFilter">
<el-radio :label="!isPrint">
未打印
</el-radio>
<el-radio :label="isPrint">
已打印
</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

368
src/views/ysjl/components/gascylinder_db_list.vue

@ -1,368 +0,0 @@
<template>
<div class="app-container">
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button type="danger" icon="el-icon-delete" @click="delYsjl">
删除记录
</el-button>
</div>
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
<el-button size="small" type="info" icon="el-icon-close" @click="clearQuery">
清空条件
</el-button>
<br>
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="出厂编号" clearable style="width: 240px" @keyup.enter.native="handleFilter" />
<span class="radio-group-label">编辑类型</span>
<el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
<el-radio :label="undefined">
全部
</el-radio>
</el-radio-group>&nbsp;&nbsp;&nbsp;&nbsp;
</el-form-item>
</el-form>
</div>
<el-table
ref="list"
v-adaptive="{bottomOffset: 50}"
height="0"
:data="list"
:default-sort="{prop:'jilubianhao', order:'descending'}"
:row-class-name="tableRowClassName"
element-loading-text="拼命加载中"
border
fit
highlight-current-row
stripe
width="100%"
size="small"
@row-click="onRowClick"
@selection-change="handleSelectionChange"
@sort-change="sortChange"
>
<el-table-column type="selection" width="40" />
<el-table-column fixed="left" align="center" label="序号" width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
<el-table-column align="center" label="安装单位" prop="shigongdanwei" width="240" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
<el-table-column align="center" label="设备代码" prop="shebeidaima" width="140" />
<el-table-column fixed="right" align="center" label="操作" prop="" width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" />
<el-button type="success" size="mini" circle icon="el-icon-view" title="预览" @click="common.viewYsjl(scope.row.id, 'JYBG')" />
<el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
<div style="float: right;margin-top:8px;">
<div style="width: 80px;float:left;margin-left: 50px;">
重启流程
</div>
<div class="identification" style="background-color:red;" />
<div style="width: 50px;float:left;margin-left: 20px;">
驳回
</div>
<div class="identification" style="background-color: orange;" />
<div style="width: 50px;float:left;margin-left: 20px;">
复制
</div>
<div class="identification" style="background-color:#690cff;" />
</div>
<!-- 驳回意见 -->
<el-dialog :visible.sync="dialogBohuiyijianVisible" title="驳回意见" width="50%">
<el-table :data="infoNotes">
<el-table-column align="center" label="驳回人" prop="infoSend" />
<el-table-column align="center" label="驳回意见" prop="infoNotes" />
<el-table-column align="center" label="驳回时间" prop="createTime" />
</el-table>
</el-dialog>
</div>
</template>
<script>
import Sticky from '@/components/Sticky'
import Pagination from '@/components/Pagination'
import { getNeedRecordList } from '@/api/ysjl'
import Utils from '@/utils/contact'
export default {
components: { Sticky, Pagination },
data() {
return {
total: 0,
list: [],
listQuery: {
pageNum: 1, //
pageRow: 20, //
order: undefined, //
sort: undefined, //
searchYsjl: {
createBy: this.$store.getters.userId
},
hasChild: true
},
multipleSelection: [],
ysjlId: '',
sbzlList: [],
sblbList: [],
sbpzList: [],
modelList: [],
sbzldm: '',
sblbdm: '',
sbpzdm: '',
modelId: '',
isQm: true,
infoNotes: '',
dialogBohuiyijianVisible: false
}
},
created() {
this.getList()
},
mounted() {
const that = this
this.common.$on('ysjl-list', function() {
that.handleFilter()
})
},
methods: {
getList() {
this.listQuery.searchYsjl.cjState = 'ysjl'
getNeedRecordList(this.listQuery).then(data => {
this.list = data.list
this.total = data.total
this.common.switchInspection(this.list)
})
},
sortChange(column) {
this.listQuery.order = column.prop
this.listQuery.sort = column.order.replace('ending', '')
this.getList()
},
getIndex($index) {
//
return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1
},
handleFilter() {
//
this.listQuery.pageNum = 1
this.getList()
},
onRowClick(row) {
this.$refs.list.toggleRowSelection(row)
},
handleSelectionChange: function(val) {
this.multipleSelection = val
},
delYsjl() {
for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bglx !== 1) {
this.$message({
message: '请选择主原始记录进行删除!',
type: 'warning'
})
return false
}
}
this.ysjlId = ''
let oldRwIds = '' // 16
let newRwIds = '' // 18
for (let i = 0; i < this.multipleSelection.length; i++) {
this.ysjlId = this.multipleSelection[i].id + ',' + this.ysjlId
// 16
if (this.multipleSelection[i].shebeizhongleidaima === '1000') {
if (this.multipleSelection[i].source === 'pad') {
oldRwIds += this.multipleSelection[i].renwuId + ','
} else {
newRwIds += this.multipleSelection[i].renwuId + ','
}
}
if (i + 1 === this.multipleSelection.length) {
this.ysjlId = this.ysjlId.substring(0, this.ysjlId.length - 1)
}
}
//
this.api({
url: '/ysjl/judgeState',
method: 'get',
params: {
ysjlIds: this.ysjlId,
bglx: '2',
isDel: true
}
}).then(data => {
if (data === 0) {
this.$confirm('已有无损原始记录生成报告, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.del(this.ysjlId, oldRwIds, newRwIds)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
return false
})
} else {
this.$confirm('确定删除当前选中记录?', '提示', {
confirmButtonText: '确定',
type: 'warning'
}).then(() => {
this.del(this.ysjlId, oldRwIds, newRwIds)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
return false
})
}
})
},
del(ids, oldRwIds, newRwIds) {
this.api({
url: '/ysjl',
method: 'delete',
params: {
ids: ids
}
}).then(() => {
this.$message({
message: '删除成功',
type: 'success',
duration: 1000,
onClose: () => {
this.getList()
Utils.$emit('task-list')
}
})
})
},
editYsjl($index) {
const ysjl = this.list[$index]
this.api({
url: '/template/getById',
method: 'get',
params: {
id: ysjl.modelId
}
}).then(data => {
const queryParam = this.common.buildEditYsjlRouterParam(ysjl)
if (ysjl.bglx === 1) {
this.$router.push({ path: data.tempPath + '/' + ysjl.id, query: queryParam })
} else {
this.$router.push({ path: data.tempPath, query: queryParam })
}
})
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
bglx: 1,
createBy: this.$store.getters.userId
})
this.getList()
},
tableRowClassName({ row, rowIndex }) {
if (row.retreatState === 1) {
return 'reject-row'
} else if (row.retreatState === 2) {
return 'restart-row'
} else if (row.copyState === true) {
return 'copy-row'
}
return ''
},
closeDialog() {
this.isQm = true
},
getModelList(val) {
let tempJylb = ''
let category = ''
let nbleibie = ''
if (val === '7310') {
tempJylb = 'DJ'
category = 'YSJL'
nbleibie = 'DQ'
}
this.api({
url: '/template/getTemplateBySbpz',
method: 'get',
params: {
sbpz: val,
jianyanleibie: tempJylb,
category: category,
neibuleibie: nbleibie
}
}).then(data => {
this.modelList = data
this.modelId = data[0].value
})
},
/**
* 根据报告ID查看驳回原因
* @param ysjlId
*/
viewAllRejection(ysjlId) {
this.api({
url: '/taskinfo/viewAllRejection',
method: 'get',
params: {
ysjlId: ysjlId
}
}).then(data => {
this.infoNotes = data
if (!this.infoNotes.length) {
this.$alert('暂无驳回意见!', '驳回意见', {
confirmButtonText: '关闭'
})
} else {
this.dialogBohuiyijianVisible = true
}
})
}
}
}
</script>
<style>
.el-table .reject-row {
color: orange;
}
.el-table .restart-row {
color: red;
}
.el-table .copy-row {
color: #690cff;
}
.identification{
width: 30px;
height:15px;
display: inline-block;
border:gray 1px solid;
border-radius:15px;
float: left;
}
button.el-button.el-button--mini.is-circle{
margin: 1px;
}
</style>

149
src/views/ysjl/components/gascylinder_yb_list.vue

@ -1,149 +0,0 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-form>
<el-form-item>
<el-input v-model="listQuery.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
<el-button size="small" type="info" icon="el-icon-close" @click="clearQuery">
清空条件
</el-button>
<br>
<el-input v-model="listQuery.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="出厂编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<span class="radio-group-label">编辑类型</span>
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
<el-radio :label="undefined">
全部
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<el-table
ref="list"
v-adaptive="{bottomOffset: 50}"
height="0"
:data="list"
:default-sort="{prop:'jilubianhao', order:'descending'}"
element-loading-text="拼命加载中"
border
fit
highlight-current-row
stripe
width="100%"
size="small"
@row-click="onRowClick"
@selection-change="handleSelectionChange"
@sort-change="sortChange"
>
<el-table-column type="selection" width="40" />
<el-table-column fixed="left" align="center" label="序号" width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
<el-table-column align="center" label="安装单位" prop="shigongdanwei" width="240" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
<el-table-column align="center" label="设备代码" prop="shebeidaima" width="140" />
<el-table-column align="center" label="操作" prop="" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.id, 'JYBG')" />
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
export default {
components: { Pagination },
data() {
return {
total: 0,
list: [],
listQuery: {
pageNum: 1, //
pageRow: 20, //
order: undefined, //
sort: undefined, //
createBy: this.$store.getters.userId,
hasChild: true,
link: 2
},
multipleSelection: [],
bglxOptions: [{
value: '1',
label: '主报告'
}, {
value: '2',
label: '无损报告'
}]
}
},
created() {
this.getList()
},
mounted() {
const that = this
this.common.$on('ysjl-yb-list', function() {
that.handleFilter()
})
},
methods: {
getList() {
this.listQuery.cjState = 'bggl'
this.api({
url: '/ysjl/getList',
method: 'get',
params: this.listQuery
}).then(data => {
this.list = data.list
this.total = data.total
this.common.switchInspection(this.list)
})
},
sortChange(column) {
this.listQuery.order = column.prop
this.listQuery.sort = column.order.replace('ending', '')
this.getList()
},
getIndex($index) {
//
return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1
},
handleFilter() {
//
this.listQuery.pageNum = 1
this.getList()
},
onRowClick(row) {
this.$refs.list.toggleRowSelection(row)
},
handleSelectionChange: function(val) {
this.multipleSelection = val
},
clearQuery() {
this.listQuery = {
order: undefined, //
sort: undefined, //
createBy: this.$store.getters.userId,
hasChild: true
}
this.getList()
}
}
}
</script>

1010
src/views/ysjl/components/manufacture_db_list.vue

File diff suppressed because it is too large

153
src/views/ysjl/components/manufacture_yb_list.vue

@ -1,153 +0,0 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-form>
<el-form-item>
<el-input v-model="listQuery.jilubianhao" placeholder="记录编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="单位名称" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="产品编号" clearable size="small" style="width: 200px" @keyup.enter.native="handleFilter" />
<el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
ref="list"
v-adaptive="{bottomOffset: 50}"
height="0"
:data="list"
:default-sort="{prop:'jilubianhao', order:'descending'}"
border
fit
highlight-current-row
stripe
size="mini"
width="100%"
@row-click="onRowClick"
@selection-change="handleSelectionChange"
@sort-change="sortChange"
>
<el-table-column type="selection" width="40px;" />
<el-table-column type="index" align="center" label="序号" width="60px;" />
<el-table-column align="center" label="记录编号" prop="jilubianhao" width="180px;" sortable="custom" />
<el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="130px;" sortable="custom" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="jianyanleibie" width="100px;" />
<el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="130px;" sortable="custom" />
<el-table-column align="center" label="单位名称" prop="zhizaodanwei" sortable="custom" width="250px;" />
<el-table-column align="center" label="产品编号" prop="chanpinbianhao" width="130px;" sortable="custom" />
<el-table-column align="center" label="产品名称" prop="shebeimingcheng" width="130px;" />
<el-table-column align="center" label="设备型号" prop="guigexinghao" width="130px" />
<el-table-column align="center" label="设计日期" prop="shejiriqi" width="140px;" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="100px;" />
<el-table-column align="center" label="操作" fixed="right" width="150px;">
<template slot-scope="{row}">
<el-dropdown trigger="click">
<el-button type="text" round plain class="el-dropdown-link" style="color: #13ce66">
下拉操作<i class="el-icon-arrow-down el-icon--right" />
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
<el-button type="text" @click="common.viewYsjl(row.id, 'YSJL')">
{{ row.shebeileibiedaima === '2100' && row.shengchanxingshi === '5' ? '预览批量原始记录' : '预览原始记录' }}
</el-button>
</el-dropdown-item>
<el-dropdown-item v-if="row.shebeileibiedaima === '2300'">
<el-button type="text" @click="common.viewYsjl(row.id, 'OTHER')">
预览批量证明
</el-button>
</el-dropdown-item>
<el-dropdown-item v-if="row.shebeileibiedaima === '2100'">
<el-button type="text" @click="common.viewYsjl(row.id, 'OTHER')">
预览数据表
</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text" @click="showVerification(row.renwuId)">
查看相关鉴证
</el-button>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
<el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogFormVisible">
<enclosure :relation-id.sync="currentRenwuId" :if-liaison.sync="ifLiaison" :view-button.sync="viewButton" />
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
import Enclosure from '@/views/common/Enclosure'
export default {
components: { Pagination, Enclosure },
data() {
return {
total: 0,
list: [],
listQuery: {
pageNum: 1, //
pageRow: 20, //
order: undefined, //
sort: undefined, //
shebeizhongleidaima: '2000',
jianyanleibie: 'ZJ',
hasLook: 2
},
multipleSelection: [],
dialogFormVisible: false,
fileList: [],
currentRenwuId: 0,
viewButton: false,
ifLiaison: false
}
},
created() {
this.getList()
},
mounted() {
const that = this
this.common.$on('manufacture-done-list', function() {
that.handleFilter()
})
},
methods: {
getList() {
this.listQuery.cjState = 'bggl'
this.api({
url: '/ysjl/getList',
method: 'get',
params: this.listQuery
}).then(data => {
this.list = data.list
this.total = data.total
})
},
sortChange(column) {
this.listQuery.order = column.prop
this.listQuery.sort = column.order.replace('ending', '')
this.getList()
},
handleFilter() {
//
this.listQuery.pageNum = 1
this.getList()
},
onRowClick(row) {
this.selection = row
this.$refs.list.toggleRowSelection(row)
},
handleSelectionChange: function(val) {
this.multipleSelection = val
},
showVerification(renwuId) {
this.dialogFormVisible = true
this.currentRenwuId = renwuId
}
}
}
</script>

139
src/views/ysjl/components/original_db_list.vue

@ -3,12 +3,6 @@
<div class="filter-container"> <div class="filter-container">
<sticky style="margin-bottom: 10px;"> <sticky style="margin-bottom: 10px;">
<div class="sub-navbar"> <div class="sub-navbar">
<el-button v-if="hasRole('GLQYD')" type="primary" icon="el-icon-check" @click="dialogRoleVisible = true">
提交
</el-button>
<el-button v-if="hasRole('GLZZJYY') || hasRole('GLZZKZ')" type="warning" icon="el-icon-back" @click="backToZzdw">
退回到企业
</el-button>
<el-button type="danger" icon="el-icon-delete" @click="delYsjl"> <el-button type="danger" icon="el-icon-delete" @click="delYsjl">
删除记录 删除记录
</el-button> </el-button>
@ -23,15 +17,6 @@
<el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 240px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 240px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<br> <br>
<span class="radio-group-label">编辑类型</span>
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
<el-radio :label="undefined">
全部
</el-radio>
</el-radio-group>&nbsp;&nbsp;&nbsp;&nbsp;
<el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter"> <el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -67,27 +52,14 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" /> <el-table-column align="center" label="记录编号" prop="jilubianhao" width="180" sortable="custom" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" /> <el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
<template v-if="$store.getters.departmentId === 69"> <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="220" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" /> <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="240" />
</template>
<template v-else-if="$store.getters.departmentId === 74">
<el-table-column align="center" label="制造单位" prop="zhizaodanwei" width="200" />
<el-table-column align="center" label="设备代码" prop="shebeidaima" width="200" />
<el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="200" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="130" />
</template>
<template v-else>
<el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" /> <el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
<el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="180" sortable="custom" />
<!-- <el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />-->
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" /> <el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
<!-- <el-table-column align="center" label="设备品种" prop="shebeipinzhong" width="220" />-->
<el-table-column align="center" label="设备名称" prop="shebeimingcheng" width="220" /> <el-table-column align="center" label="设备名称" prop="shebeimingcheng" width="220" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" /> <el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column align="center" label="规格型号" prop="guigexinghao" width="180" sortable="custom" />
<el-table-column align="center" label="单位内编号" prop="danweineibubianhao" width="150" sortable="custom" /> <el-table-column align="center" label="单位内编号" prop="danweineibubianhao" width="150" sortable="custom" />
</template>
<el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" /> <el-table-column :formatter="formatter.getChineseName" align="center" label="检验人员" prop="jianyanrenyuan" width="140" />
<el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" sortable="custom" /> <el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" sortable="custom" />
<el-table-column v-if="$store.getters.departmentId !== 74" align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" /> <el-table-column v-if="$store.getters.departmentId !== 74" align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" sortable="custom" />
@ -105,22 +77,12 @@
<el-table-column fixed="right" align="center" label="操作" prop="" width="200"> <el-table-column fixed="right" align="center" label="操作" prop="" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" />
<el-button <el-button type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.bglx === 1 ? scope.row.id : scope.row.parentId, 'YSJL')" />
v-show="scope.row.shebeizhongleidaima === '2000' || scope.row.shebeizhongleidaima === '7000'" <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
type="info"
size="mini"
circle
icon="el-icon-view"
:title="'预览' + (scope.row.shebeizhongleidaima === '2000' ? '原始资料' : '附件')"
@click="common.viewRawRecords(scope.row.renwuId)"
/>
<el-button v-if="scope.row.bglx === 1" type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.id, 'YSJL')" />
<el-button v-else type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.parentId, 'YSJL')" />
<el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" /> <pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" style="float: left;" @pagination="getList" />
<div style="float: right;margin-top:8px;"> <div style="float: right;margin-top:8px;">
<div style="width: 80px;float:left;margin-left: 50px;"> <div style="width: 80px;float:left;margin-left: 50px;">
重启流程 重启流程
@ -144,38 +106,24 @@
<el-table-column align="center" label="驳回时间" prop="createTime" /> <el-table-column align="center" label="驳回时间" prop="createTime" />
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-dialog title="提交" :visible.sync="dialogRoleVisible">
<template>
<el-select v-model="receiver" multiple :multiple-limit="1" collapse-tags>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</template>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogRoleVisible = false"> </el-button>
<el-button type="primary" @click="transferYsjl"> </el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import Sticky from '@/components/Sticky' import Sticky from '@/components/Sticky'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import { getNeedRecordList } from '@/api/ysjl' import { getListUnDoneYsjl } from '@/api/ysjl'
import Utils from '../../../utils/contact.js' import Utils from '../../../utils/contact.js'
export default { export default {
components: { Sticky, Pagination }, components: { Sticky, Pagination },
data() { data() {
return { return {
totalCount: 0, total: 0,
list: [], list: [],
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: undefined, // orderBy: undefined, //
sort: undefined, //
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true hasChild: true
}, },
multipleSelection: [], multipleSelection: [],
@ -190,16 +138,12 @@ export default {
modelId: '', modelId: '',
isQm: true, isQm: true,
infoNotes: '', infoNotes: '',
dialogBohuiyijianVisible: false, dialogBohuiyijianVisible: false
dialogRoleVisible: false,
userList: [],
receiver: null
} }
}, },
created() { created() {
this.getList() this.getList()
this.getSbzlList() this.getSbzlList()
this.userList = this.$store.getters.allUser.filter(user => user.departmentId === this.$store.getters.departmentId && user.clientType === 'System')
}, },
mounted() { mounted() {
const that = this const that = this
@ -210,15 +154,14 @@ export default {
methods: { methods: {
getList() { getList() {
this.listQuery.cjState = 'ysjl' this.listQuery.cjState = 'ysjl'
getNeedRecordList(this.listQuery).then(data => { getListUnDoneYsjl(this.listQuery).then(data => {
this.list = data.list this.list = data.list
this.totalCount = data.total this.total = data.total
this.common.switchInspection(this.list) this.common.switchInspection(this.list)
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {
@ -445,62 +388,6 @@ export default {
this.dialogBohuiyijianVisible = true this.dialogBohuiyijianVisible = true
} }
}) })
},
transferYsjl() {
if (!this.$refs.list.selection.length) {
this.$message.warning('请至少选择一条原始记录进行提交操作!')
return false
}
const qs = require('qs')
this.api({
url: '/ysjl/modifyRlr',
method: 'post',
data: {
ids: this.$refs.list.selection.map(row => row.id),
renlingren: this.receiver.join(',')
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then(() => {
this.$message.success('提交成功')
this.dialogRoleVisible = false
this.getList()
})
},
/**
* 退回到制造单位
*/
backToZzdw() {
if (!this.$refs.list.selection.length) {
this.$message.warning('请至少选择一条原始记录进行退回操作!')
return false
}
if (this.$refs.list.selection.filter(ysjl => ysjl.zzdwId !== this.$refs.list.selection[0].zzdwId).length) {
this.$message.warning('请选择同一制造单位的原始记录进行退回操作!')
return false
}
const qs = require('qs')
this.api({
url: '/dwxx/getById',
method: 'get',
params: { id: this.$refs.list.selection[0].zzdwId }
}).then(data => {
this.api({
url: '/ysjl/modifyRlr',
method: 'post',
data: {
ids: this.$refs.list.selection.map(row => row.id),
renlingren: data.userId
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then(() => {
this.$message.success('退回成功')
this.getList()
})
})
} }
} }
} }

17
src/views/ysjl/components/original_yb_list.vue

@ -1,9 +1,9 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="filter-container"> <div class="filter-container">
<sticky v-show="hasPerm('ysjl:regenerate')" style="margin-bottom: 10px;"> <sticky v-show="hasPerm('ysjl:done-ysjl:regenerate')" style="margin-bottom: 10px;">
<div class="sub-navbar"> <div class="sub-navbar">
<el-button v-if="hasPerm('ysjl:regenerate')" type="warning" icon="el-icon-view" @click="generatePdf('YSJL')"> <el-button v-if="hasPerm('ysjl:done-ysjl:regenerate')" type="warning" icon="el-icon-view" @click="generatePdf('YSJL')">
重新生成记录预览 重新生成记录预览
</el-button> </el-button>
</div> </div>
@ -119,12 +119,8 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // pageNum: 1, //
pageRow: 20, // pageRow: 20, //
order: undefined, // orderBy: undefined, //
sort: undefined, // hasChild: true
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
copyPage: false,
link: 2
}, },
multipleSelection: [], multipleSelection: [],
bglxOptions: [{ bglxOptions: [{
@ -149,7 +145,7 @@ export default {
getList() { getList() {
this.listQuery.cjState = 'bggl' this.listQuery.cjState = 'bggl'
this.api({ this.api({
url: '/ysjl/getList', url: '/ysjl/getListDoneYsjl',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then(data => {
@ -159,8 +155,7 @@ export default {
}) })
}, },
sortChange(column) { sortChange(column) {
this.listQuery.order = column.prop this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.listQuery.sort = column.order.replace('ending', '')
this.getList() this.getList()
}, },
getIndex($index) { getIndex($index) {

14
src/views/ysjl/db_list.vue

@ -1,21 +1,11 @@
<template> <template>
<manufacture-db-list v-if="ifManufacture" /> <original-db-list />
<gascylinder-db-list v-else-if="ifGasCylinder" />
<original-db-list v-else />
</template> </template>
<script> <script>
import manufactureDbList from './components/manufacture_db_list' //
import originalDbList from './components/original_db_list' // import originalDbList from './components/original_db_list' //
import gascylinderDbList from './components/gascylinder_db_list' //
export default { export default {
name: 'TODOYsjl', name: 'TODOYsjl',
components: { originalDbList, manufactureDbList, gascylinderDbList }, components: { originalDbList }
data() {
return {
ifManufacture: this.$store.getters.departmentId === 84 || this.hasRole('WZHM'),
ifGasCylinder: this.$store.getters.departmentId === 86
}
}
} }
</script> </script>

15
src/views/ysjl/yb_list.vue

@ -1,22 +1,13 @@
<template> <template>
<manufacture-yb-list v-if="ifManufacture" /> <original-yb-list />
<gascylinder-yb-list v-else-if="ifGasCylinder" />
<original-yb-list v-else />
</template> </template>
<script> <script>
import originalYbList from './components/original_yb_list' import originalYbList from './components/original_yb_list'
import manufactureYbList from './components/manufacture_yb_list'
import gascylinderYbList from './components/gascylinder_yb_list' //
export default { export default {
name: 'HasDoneYsjl', name: 'HasDoneYsjl',
components: { originalYbList, manufactureYbList, gascylinderYbList }, components: { originalYbList }
data() {
return {
ifManufacture: this.$store.getters.departmentId === 84,
ifGasCylinder: this.$store.getters.departmentId === 86
}
}
} }
</script> </script>

Loading…
Cancel
Save