xiaobai 3 years ago
parent
commit
c9109d0452
  1. 36
      src/service/bjdService.js
  2. 11
      src/utils/api.js
  3. 53
      src/utils/apibjd.js
  4. 1057
      src/views/allot/components/chengya_list.vue
  5. 784
      src/views/allot/components/jidian_list.vue
  6. 1003
      src/views/allot/list.vue
  7. 46
      src/views/archive/archive_info.vue
  8. 7
      src/views/archive/archive_scan.vue
  9. 9
      src/views/archive/list.vue
  10. 20
      src/views/bjd/dj_input.vue
  11. 102
      src/views/bjd/dj_list.vue
  12. 87
      src/views/bjd/dt_list.vue
  13. 10
      src/views/bjd/jj_input.vue
  14. 90
      src/views/bjd/jj_list.vue
  15. 21
      src/views/bjd/qy_list.vue
  16. 1
      src/views/print/1000/print_list.vue
  17. 1
      src/views/print/2000/print_list.vue
  18. 1
      src/views/print/3000/print_list.vue
  19. 1
      src/views/print/4000/print_list.vue
  20. 1
      src/views/print/5000/print_list.vue
  21. 67
      src/views/task/list.vue
  22. 39
      src/views/user/department.vue
  23. 111
      src/views/zjd/zjbg_list.vue
  24. 26
      src/views/zjd/zjd_list.vue

36
src/service/bjdService.js

@ -1,5 +1,7 @@
import XLSX from 'xlsx'
import common from '@/utils/common'
import qs from 'qs'
import preview from '@/utils/preview'
export default {
/**
@ -101,5 +103,39 @@ export default {
}
reader.readAsArrayBuffer(file)
loading.close()
},
/**
* 批量打印回执单
*
* @param bjdIds 报检单主键数组
* @return {Promise<AxiosResponse<any>>}
*/
batchPrintHzd(bjdIds) {
return new Promise(resolve => {
preview({
url: '/print/batchGeneratePdfHzd',
method: 'get',
params: {
bjdIds: bjdIds
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
preview({
url: '/print/createXmlOther',
method: 'post',
params: {
ids: bjdIds,
type: 'HZD'
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
resolve(data)
})
})
})
}
}

11
src/utils/api.js

@ -29,16 +29,7 @@ service.interceptors.response.use(
hideLoading()
const res = response.data
if (res.code === 1) {
if (res.data !== null) {
if (res.data.returnData !== undefined && JSON.stringify(res.data.returnData) !== '{}') {
return res.data.returnData
} else {
return res.data
}
}
return null
} else if (res.returnCode === 1) {
return res.returnData
return res.data
} else if (res.code === 20001) {
Notification({
showClose: true,

53
src/utils/apibjd.js

@ -1,6 +1,5 @@
import axios from 'axios'
import { Notification } from 'element-ui'
import store from '../store'
import { showLoading, hideLoading } from './apiHelper'
// 创建axios实例
const service = axios.create({
@ -27,55 +26,8 @@ service.interceptors.response.use(
response => {
hideLoading()
const res = response.data
if (res.returnCode === '1000') {
return res
}
if (res.code === 1) {
if (res.data !== null) {
if (res.data.returnCode) {
if (res.data.returnCode === 1) {
return res.data.returnData
} else if (res.data.returnCode === '20011') {
Notification({
showClose: true,
message: res.returnMsg,
type: 'error',
duration: 500,
onClose: () => {
store.dispatch('FedLogOut').then(() => {
location.reload()// 为了重新实例化vue-router对象 避免bug
})
}
})
return Promise.reject('未登录')
} else {
Notification({
message: res.data.returnMsg || '请求处理异常,请稍后再试',
type: 'error',
duration: 3 * 1000
})
return Promise.reject(res)
}
} else {
return res.data
}
}
return null
} if (res.returnCode === 1) {
return res.returnData
} else if (res.returnCode === '20011') {
Notification({
showClose: true,
message: res.returnMsg,
type: 'error',
duration: 500,
onClose: () => {
store.dispatch('FedLogOut').then(() => {
location.reload()// 为了重新实例化vue-router对象 避免bug
})
}
})
return Promise.reject('未登录')
return res.data
} else {
let msg = ''
if (res.message) {
@ -85,9 +37,6 @@ service.interceptors.response.use(
} else {
msg = res.returnMsg
}
if (res.data && res.data.constructor === String) {
msg = msg ? msg + ':' + res.data : res.data
}
Notification({
message: msg,
type: 'error',

1057
src/views/allot/components/chengya_list.vue

File diff suppressed because it is too large

784
src/views/allot/components/jidian_list.vue

@ -1,784 +0,0 @@
<template>
<div class="app-container">
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-show="this.$store.getters.username !== 'shiting'" type="primary" icon="el-icon-sold-out" @click="renwuFp">
批量分配
</el-button>
<el-button type="primary" icon="el-icon-edit" @click="openZhongjian">
标注现场检验
</el-button>
<el-button type="warning" @click="clearBaseZhongjian">
<svg-icon icon-class="clear" />
取消现场检验
</el-button>
<el-button type="primary" icon="el-icon-edit" @click="openBaseZhongjian">
标注部分设备现场检验
</el-button>
<el-button type="warning" @click="returnToBjd">
<svg-icon icon-class="reject" /> 异常退回
</el-button>
<el-button type="danger" icon="el-icon-error" @click="renwuZf">
作废数据
</el-button>
<div style="float: right;margin-top:8px;">
<div style="width: 210px;float:left;margin-left: 50px;">
申请现场检验<span style="background-color: #0831e4;">&emsp;</span>/<span style="background-color: #da6b83;">&emsp;</span>
</div>
</div>
</div>
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchRenwu.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchRenwu.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="handleFilter">
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-select v-model="listQuery.searchRenwu.quhuadaima" placeholder="请选择所属区划" clearable value="" @change="handleFilter">
<el-option
v-for="item in areas"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input v-model="listQuery.searchRenwu.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
<el-button type="info" icon="el-icon-clear" @click="clearSearch">
清除
</el-button>
<br>
<el-select v-model="listQuery.searchRenwu.jianyanleibie" placeholder="检验类别" clearable style="width:100px" value="" @change="handleFilter">
<el-option value="DJ" label="定期检验" />
<el-option value="JJ" label="监督检验" />
</el-select>
<el-date-picker v-model="listQuery.searchRenwu.shouliriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择报检日期" style="width: 150px" @change="handleFilter" />
<el-input v-model="listQuery.searchRenwu.shigongdanwei" placeholder="施工单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
<el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanStart" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期(起)" style="width: 180px;" />
<el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanEnd" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期(止)" style="width: 180px;" />
<el-select v-model="listQuery.searchRenwu.shouliren" filterable allow-create default-first-option clearable placeholder="请选择受理人员" style="width: 110px;">
<el-option v-for="user in users" :key="user.id" :label="user.nickname" :value="user.nickname" />
</el-select>
<span class="radio-group-label">申请现场检验</span>
<el-radio-group v-model="listQuery.searchRenwu.zhongjianState" @change="handleFilter">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<el-table
ref="list"
v-loading="showLoading"
element-loading-text="正在加载"
element-loading-spinner="el-icon-loading"
:data="list"
border
fit
highlight-current-row
stripe
width="100%"
height="600px"
:row-class-name="tableRowZhongjian"
@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="shebeizhonglei" width="130">
<template slot-scope="scope">
<span v-if="scope.row.shebeizhongleidaima === '3000' && scope.row.shebeileixing !== null">电梯({{ scope.row.shebeileixing }})</span>
<span v-else>{{ scope.row.shebeizhonglei }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="检验类别" prop="jianyanleibie" width="80">
<template slot-scope="scope">
<span v-if="scope.row.jianyanleibie === 'DJ'">定期检验</span>
<span v-else-if="scope.row.jianyanleibie === 'JJ'">监督检验</span>
<span v-else-if="scope.row.jianyanleibie === 'JJ' && scope.row.neibuleibie === 'SC'">首次检验</span>
<span v-else-if="scope.row.jianyanleibie === 'ZZ' && scope.row.neibuleibie === 'ZJ'">制造检验</span>
</template>
</el-table-column>
<el-table-column align="center" label="报检单号" prop="serialNumber" width="140" sortable="custom" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="300" />
<el-table-column align="center" label="施工单位/维保单位" prop="shigongdanwei" width="240">
<template slot-scope="scope">
<span v-if="scope.row.jianyanleibie === 'DJ' && scope.row.shebeizhongleidaima === '3000'">{{ scope.row.weibaodanwei }}</span>
<span v-else>{{ scope.row.shigongdanwei }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="维保电话" prop="weibaodanweiDianhua" width="110" />
<el-table-column align="center" label="使用单位地址" prop="shiyongdanweiDizhi" width="300" />
<el-table-column align="center" label="申请现场检验日期" prop="zhongjianriqi" width="160" sortable="custom" />
<el-table-column align="center" label="现场检验备注" prop="zhongjianBeizhu" width="110" />
<el-table-column fixed="right" align="center" label="区划名称" prop="quhuamingcheng" width="110" sortable />
<el-table-column fixed="right" align="center" label="报检日期" prop="shouliriqi" width="110" sortable />
<el-table-column fixed="right" align="center" label="受理人" prop="shouliren" width="100" />
<el-table-column fixed="right" align="center" label="备注" prop="bjdBeizhu" width="80" />
<el-table-column fixed="right" align="left" label="设备台数(待/总)" width="140">
<template slot-scope="scope">
<el-button type="success" size="small" circle icon="el-icon-view" title="预览报检单" @click="viewBjd(scope.row)" />
<el-button style="margin-left:1px" size="small" circle @click="viewBjdRenwu(scope.row.bjdId)">
<span style="color: #67C23A;font-weight: bold">{{ scope.row.allotNum }}</span> / <span style="color: #F56C6C;font-weight: bold">{{ scope.row.totalNum }}</span>
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="listQuery.pageNum"
:page-size="listQuery.pageSize"
:total="total"
:page-sizes="[10, 20, 40, 100]"
background
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
<el-dialog :visible.sync="dialogVisible" :title="title" width="70%" @close="closeDialog">
<el-container>
<el-form>
<el-form-item>
<el-select v-model="departmentId" placeholder="请选择科室" style="width: 150px;" @change="selectDepartmentUser">
<el-option v-for="dept in depts" :key="dept.id" :label="dept.name" :value="dept.id" />
</el-select>
<el-select v-model="renwudan.teamId" placeholder="请选择检验小组" style="width: 150px;" @change="selectTeamUser">
<el-option v-for="team in teams" :key="team.id" :label="team.name" :value="team.id" />
</el-select>
<el-select v-model="renlingren" :collapse-tags="true" placeholder="请选择人员" multiple style="width: 160px;">
<el-option v-for="user in users" :key="user.id" :label="user.nickname" :value="user.id" />
</el-select>
<el-button type="primary" @disabled="btnClick" @click="allotRenwu">
执行分配
</el-button>
</el-form-item>
<el-form-item>
<el-date-picker v-model="renwudan.xiadariqi" type="date" placeholder="选择下达日期" style="width: 150px;" />
<el-date-picker v-model="renwudan.yuejianriqi" type="date" placeholder="选择约检日期" style="width: 150px;" @blur="setWanchengqixian()" />
<el-date-picker v-model="renwudan.wanchengqixian" type="date" placeholder="选择完成期限" style="width: 150px;" />
<el-select v-model="renwudan.jianyanleixing" :collapse-tags="true" placeholder="请选择检验类型" style="width: 130px;">
<el-option key="初检" label="初检" value="初检" />
<el-option key="复检" label="复检" value="复检" />
</el-select>
<el-input v-model="renwudan.beizhu" type="text" style="width: 240px;" placeholder="请填写备注信息" />
</el-form-item>
</el-form>
</el-container>
<el-table ref="allotList" :data="allotList" size="small" style="width: 150%" border fit highlight-current-row :row-class-name="tableRowBfZhongjian" @row-click="onDialogRowClick" @selection-change="handleDialogSelectionChange">
<el-table-column type="selection" width="45" />
<el-table-column align="center" label="序号" width="50" fixed="left">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column v-if="allotSbzl === '2000'" align="center" label="设备名称" prop="shebeimingcheng" width="150" />
<el-table-column align="center" :formatter="formatter.formatterCategory" label="检验项目" prop="neibuleibie" width="100" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="100" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240px;" />
<el-table-column v-if="allotSbzl !== '8000'" align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="140" />
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
<el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" />
<el-table-column align="center" label="使用登记编号" prop="shiyongdengjibianhao" width="160" />
<template v-if="allotSbzl === '8000'">
<el-table-column align="center" label="管道长度(m)/数量(条)" prop="s32" width="140" />
<el-table-column align="center" label="管道级别" prop="s7" width="140" />
</template>
<el-table-column align="center" label="申请现场检验日期" prop="shenqingxianchangriqi" width="160" />
</el-table>
</el-dialog>
<el-dialog :visible.sync="dialogXianchangVisible" title="标注现场检验日期及备注填写" width="30%" @close="dialogXianchangVisible = false">
<el-form ref="bjdZhongjian" :model="bjdZhongjian">
<el-form-item v-if="this.$store.getters.username === 'yangyq' || this.$store.getters.username === 'shiting'" label="申请现场日期" prop="xianchangriqi">
<el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 100%;" disabled />
</el-form-item>
<el-form-item v-else label="申请现场日期" prop="xianchangriqi">
<el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 100%;" />
</el-form-item>
<el-form-item label="申请现场备注" prop="xianchangbeizhu">
<el-input v-model="bjdZhongjian.xianchangbeizhu" type="textarea" :rows="5" placeholder="请填写备注信息" />
</el-form-item>
</el-form>
<el-button type="primary" @disabled="btnClick" @click="tijiaoJianyan">
提交
</el-button>
</el-dialog>
<el-dialog :visible.sync="dialogXcjyVisible" title="标注设备申请现场检验" width="55%" @close="closeDialog">
<el-form ref="bjdZhongjian" :model="bjdZhongjian">
<el-row :gutter="20">
<el-col :span="10">
<el-form-item v-if="this.$store.getters.username === 'yangyq' || this.$store.getters.username === 'shiting'" label="申请现场日期" prop="xianchangriqi" style="width: 600px">
<el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 50%;" disabled />
</el-form-item>
<el-form-item v-else label="申请现场日期" prop="xianchangriqi">
<el-date-picker v-model="bjdZhongjian.xianchangriqi" type="date" value-format="yyyy-MM-dd" placeholder="申请现场检验日期" style="width: 50%;" />
</el-form-item>
</el-col>
</el-row>
<el-button type="primary" @disabled="btnClick" @click="tijiaoJianyanBf">
提交
</el-button>
</el-form>
<el-table ref="allotList" :data="allotList" size="small" style="width: 100%" border fit highlight-current-row :row-class-name="tableRowBfZhongjian" @row-click="onDialogRowClick" @selection-change="handleDialogSelectionChange">
<el-table-column type="selection" width="45" />
<el-table-column align="center" label="序号" width="50" fixed="left">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column align="center" :formatter="formatter.formatterCategory" label="检验项目" prop="neibuleibie" width="100" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240px;" />
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
<el-table-column align="center" label="产品编号" prop="chanpinbianhao" width="160" />
<el-table-column align="center" label="申请现场检验日期" prop="shenqingxianchangriqi" width="160" />
<el-table-column align="center" label="操作" width="140">
<template slot-scope="scope">
<el-button type="warning" size="small" circle @click="clearShenqingriqi(scope.$index)">
<svg-icon icon-class="clear" />
</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import Sticky from '@/components/Sticky'
import Utils from '@/utils/contact'
export default {
name: 'AllotListJiDian',
components: { Sticky },
data() {
return {
dialogVisible: false,
total: 0,
list: [],
sbzlList: [],
listQuery: {
pageNum: 1, //
pageSize: 20, //
orderBy: 'shouliriqi desc',
searchRenwu: {
shiyongdanwei: undefined,
shebeizhongleidaima: '',
bjState: '2'
}
},
renwudan: {
teamId: '',
xiadariqi: '',
yuejianriqi: '',
wanchengqixian: '',
jianyanleixing: '初检',
beizhu: ''
},
tempDepartment: {},
multipleSelection: [],
allotList: [],
depts: [],
users: [],
areas: [], //
departmentId: this.$store.getters.departmentId,
renlingren: [],
selection: [],
departmentUserList: [],
unAllotUserList: [],
btnClick: false,
showLoading: true,
allotSbzl: '',
teams: [],
bjdids: '',
dialogXianchangVisible: false,
dialogXcjyVisible: false,
bjdZhongjian: {
bjdid: '',
xianchangriqi: '',
xianchangbeizhu: '',
renwuIds: ''
},
title: '任务分配'
}
},
created() {
this.getList()
this.getDepartment()
this.getArea()
this.getSbzlList()
this.getUserList(this.departmentId)
this.getTeamList(this.departmentId)
},
mounted() {
const that = this
this.common.$on('AllotListJiDianListRefresh', function() {
that.handleFilter()
})
},
methods: {
getList() {
this.showLoading = true
this.apibjd({
url: '/renwu/list',
method: 'get',
params: this.listQuery
}).then(data => {
this.list = data.list
this.total = data.total
this.showLoading = false
})
},
getSbzlList() {
this.api({
url: '/sedirectory/getList',
method: 'get',
params: {
sbzl: undefined,
level: '1'
}
}).then(data => {
this.sbzlList = data
})
},
handleSizeChange(val) {
//
this.listQuery.pageSize = val
this.handleFilter()
},
handleCurrentChange(val) {
//
this.listQuery.pageNum = val
this.getList()
},
handleFilter() {
//
this.listQuery.pageNum = 1
this.getList()
},
getIndex($index) {
//
return (this.listQuery.pageNum - 1) * this.listQuery.pageSize + $index + 1
},
//
renwuFp() {
this.allotList = []
if (this.multipleSelection.length === 0) {
this.$message({ message: '请在列表选择要操作的数据。', type: 'warning' })
return false
}
for (let i = 0; i < this.multipleSelection.length; i++) {
if (i === 0) {
this.bjdIds = this.multipleSelection[i].bjdId
} else {
this.bjdIds = this.bjdIds + ',' + this.multipleSelection[i].bjdId
}
}
this.apibjd({
url: '/renwu/getAllotBaseList',
method: 'post',
data: {
bjdIds: this.bjdIds
}
}).then(data => {
this.allotList = data.list
this.allotSbzl = this.allotList[0].shebeizhongleidaima
this.renwudan = {
xiadariqi: new Date()
}
if (this.multipleSelection[0].shebeileixing !== undefined && this.multipleSelection[0].shebeileixing !== null) {
this.title = '任务分配(' + this.multipleSelection[0].shebeileixing + ')'
}
this.dialogVisible = true
this.$nextTick(() => {
this.$refs.allotList.toggleAllSelection()
this.selection = data.list
})
})
},
// 退
returnToBjd() {
if (this.multipleSelection.length === 0) {
this.$message({ message: '请在列表选择要退回的数据。', type: 'warning' })
return false
}
let bjdIds = ''
for (let i = 0; i < this.multipleSelection.length; i++) {
if (i === 0) {
bjdIds = this.multipleSelection[i].bjdId
} else {
bjdIds = bjdIds + ',' + this.multipleSelection[i].bjdId
}
}
//
for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].allotNum !== this.multipleSelection[i].totalNum) {
this.$message({ message: '有任务已经分配,请重新选择。', type: 'warning' })
return false
} else {
this.$prompt('请输入退回原因', '提示', {
inputType: 'textarea',
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
this.apibjd({
url: '/bjd/returnToBjd',
method: 'get',
params: {
bjdIds: bjdIds,
reason: value
}
}).then(data => {
this.getList()
this.$message({ message: '任务异常退回成功', type: 'success' })
})
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
})
})
}
}
},
//
renwuZf() {
if (this.multipleSelection.length === 0) {
this.$message({ message: '请在列表选择要作废的数据。', type: 'warning' })
return false
}
let bjdIds = ''
for (let i = 0; i < this.multipleSelection.length; i++) {
if (i === 0) {
bjdIds = this.multipleSelection[i].bjdId
} else {
bjdIds = bjdIds + ',' + this.multipleSelection[i].bjdId
}
}
this.$prompt('共选择了' + this.multipleSelection.length + '台设备进行作废,请输入作废原因!', '提示', {
inputType: 'textarea',
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
if (value === null) {
this.$message({ message: '请填写作废原因!', type: 'warning' })
return false
}
this.apibjd({
url: '/bjd/updBjdToZfByRw',
method: 'get',
params: {
bjdIds: this.$refs.list.selection.map(rw => {
return rw.bjdId
}).join(','),
reason: value
}
}).then(data => {
this.getList()
if (data.count > 0) {
this.$alert(data.count + '条任务作废成功!', '确认信息', {
confirmButtonText: '确定'
})
} else {
this.$message({ message: '任务作废失败!', type: 'warning' })
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '取消作废'
})
})
},
viewBjd(bjd) {
const type = '/finish'
if (bjd.jianyanleibie === 'DJ') {
this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
} else {
this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
}
},
viewBjdRenwu(bjdid) {
if (this.$store.getters.username === 'shiting') {
return false
}
this.allotList = []
this.bjdIds = bjdid
this.apibjd({
url: '/renwu/getAllotBaseList',
method: 'post',
data: {
bjdIds: bjdid
}
}).then(data => {
this.allotList = data.list
this.allotSbzl = this.allotList[0].shebeizhongleidaima
this.dialogVisible = true
this.$nextTick(() => {
this.$refs.allotList.toggleAllSelection()
this.selection = data.list
})
})
},
clearSearch() {
this.listQuery.searchRenwu = {
bjState: '2'
}
this.getList()
},
// getAllotListByBjdId
onRowClick(row) {
this.$refs.list.toggleRowSelection(row)
},
// bjdId
handleSelectionChange(val) {
this.multipleSelection = val
},
onDialogRowClick(row) {
this.$refs.allotList.toggleRowSelection(row)
},
handleDialogSelectionChange(val) {
this.selection = val
},
//
getDepartment() {
this.api({
url: '/department/all',
method: 'get'
}).then(data => {
this.depts = data
})
},
getArea() { //
this.api({
url: '/area/getShiArea',
method: 'get',
params: {
shidaima: '370100'
}
}).then(data => {
this.areas = data
})
},
selectDepartmentUser(val) {
this.renlingren = []
this.getUserList(val)
},
getUserList(val) {
this.api({
url: '/user/getUserListByDepartmentId',
method: 'get',
params: {
departmentId: val
}
}).then(data => {
this.users = data
})
},
openZhongjian() {
if (this.multipleSelection.length !== 1) {
this.$message({ message: '请在列表选择要进行现场检验的设备,只允许单台操作。', type: 'warning' })
return false
}
if (this.multipleSelection[0].zhongjianriqi) {
this.bjdZhongjian.xianchangriqi = this.multipleSelection[0].zhongjianriqi
} else {
this.bjdZhongjian.xianchangriqi = new Date()
}
this.bjdZhongjian.xianchangbeizhu = this.multipleSelection[0].zhongjianBeizhu
this.dialogXianchangVisible = true
},
openBaseZhongjian() {
if (this.multipleSelection.length !== 1) {
this.$message({ message: '请在列表选择要操作的数据,只能选择单台设备。', type: 'warning' })
return false
}
this.apibjd({
url: '/renwu/getAllotBaseList',
method: 'post',
data: {
bjdIds: this.multipleSelection[0].bjdId
}
}).then(data => {
this.allotList = data.list
this.dialogXcjyVisible = true
})
},
clearBaseZhongjian() {
if (this.multipleSelection.length !== 1) {
this.$message({ message: '请在列表选择要操作的数据,只能选择单台设备。', type: 'warning' })
return false
}
this.apibjd({
url: '/renwu/clearZhongjian',
method: 'get',
params: {
bjdId: this.multipleSelection[0].bjdId
}
}).then(data => {
if (data === '清除成功!') {
this.getList()
}
})
},
clearShenqingriqi(index) {
this.apibjd({
url: '/renwu/clearShenqingriqi',
method: 'get',
params: {
renwuId: this.allotList[index].id
}
}).then(data => {
if (data === '清除成功!') {
this.allotList[index].shenqingxianchangriqi = null
}
})
},
closeDialog() {
this.renlingren = []
this.departmentId = this.$store.getters.departmentId
this.users = this.getUserList(this.departmentId)
},
allotRenwu() {
this.btnClick = true
if (this.selection.length === 0) {
this.$message({ message: '请选择要分配的数据。', type: 'warning' })
return false
}
if (this.renlingren.length > 0) {
for (let i = 0; i < this.teams.length; i++) {
if (this.renwudan.teamId === this.teams[i].id) {
this.renwudan.teamName = this.teams[i].name
break
}
}
for (let i = 0; i < this.depts.length; i++) {
if (this.departmentId === this.depts[i].id) {
this.renwudan.departmentName = this.depts[i].name
break
}
}
this.apibjd({
url: '/renwu/completeAllot',
method: 'post',
data: {
renwuList: this.selection,
renlingren: this.renlingren,
renwudan: this.renwudan,
bjdids: this.bjdIds
}
}).then(() => {
this.multipleSelection = []
//
this.getList()
//
Utils.$emit('task-list')
this.$message({ message: '分配成功。', type: 'success' })
this.dialogVisible = false
this.showLoading = true
})
} else {
this.$message({ message: '请选择要分配的人员。', type: 'warning' })
return false
}
},
tijiaoJianyan() {
this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
this.apibjd({
url: '/bjd/updBjdEndState',
method: 'post',
data: this.bjdZhongjian
}).then(data => {
this.$message.success('添加成功。')
this.getList()
this.dialogXianchangVisible = false
})
},
tijiaoJianyanBf() {
if (this.selection.length === 0) {
this.$message({ message: '请在列表选择要操作的数据。', type: 'warning' })
return false
}
this.bjdZhongjian.bjdid = this.multipleSelection[0].bjdId
this.bjdZhongjian.renwuIds = this.$refs.allotList.selection.map(rw => {
return rw.id
}).join(',')
this.apibjd({
url: '/renwu/updBjdEndState',
method: 'post',
data: this.bjdZhongjian
}).then(data => {
this.$message.success('添加成功。')
this.getList()
this.dialogXcjyVisible = false
})
},
getTeamList(departmentId) { //
this.apibjd({
url: '/team/getTeamList',
method: 'get',
params: { departmentId }
}).then(data => {
this.teams = data
})
},
selectTeamUser(val) {
for (let i = 0; i < this.teams.length; i++) {
if (this.teams[i].id === val) {
this.renlingren = JSON.parse(this.teams[i].renyuans)
break
}
}
},
setWanchengqixian() {
var date = new Date(this.renwudan.yuejianriqi)
date.setMonth(date.getMonth() + 1)
this.$set(this.renwudan, 'wanchengqixian', date)
},
tableRowZhongjian({ row, rowIndex }) {
if (row.zhongjianState === 1) {
return 'qiyezhongjian-row'
} else if (row.zhongjianState === 2) {
return 'keshizhongjian-row'
}
return ''
},
tableRowBfZhongjian({ row, rowIndex }) {
if (row.shenqingxianchangriqi !== null) {
return 'xianchangriqi-row'
}
return ''
},
sortChange(column) {
if (column.order !== null) {
this.listQuery.orderBy = column.prop + ' '
this.listQuery.orderBy += column.order.replace('ending', '')
} else {
this.listQuery.orderBy = 'shouliriqi desc'
}
this.getList()
}
}
}
</script>
<style>
/** 允许终检 */
.el-table .qiyezhongjian-row {
color: #0831e4;
}
.el-table .keshizhongjian-row {
color: #da6b83;
}
.el-table .xianchangriqi-row {
color: #66e41e;
}
</style>

1003
src/views/allot/list.vue

File diff suppressed because it is too large

46
src/views/archive/archive_info.vue

@ -1,42 +1,46 @@
<template>
<el-dialog :visible.sync="dialog" append-to-body title="归档详情" width="50%">
<el-form :model="archive" size="small" label-width="100px">
<el-form-item label="归档单号" prop="archiveNum">
<el-input v-model="archive.archiveNum" disabled style="width: 200px;" />
</el-form-item>
<el-row :gutter="16">
<el-col :span="8">
<el-form-item label="归档人员" prop="archiveUser">
<el-input v-model="archive.archiveUser" disabled style="width: 150px;" />
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="归档单号" prop="archiveNum">
<el-input v-model="archive.archiveNum" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="归档日期" prop="archiveDate">
<el-input v-model="archive.archiveDate" disabled style="width: 150px;" />
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="归档人员" prop="createBy">
<el-input v-model="archive.createBy" disabled />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="归档日期" prop="createTime">
<el-input v-model="archive.createTime" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="8">
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="归档架号" prop="frameNum">
<el-input v-model="archive.frameNum" disabled style="width: 150px;" />
<el-input v-model="archive.frameNum" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="9">
<el-form-item label="列" prop="columnNum">
<el-input v-model="archive.columnNum" disabled style="width: 150px;" />
<el-input v-model="archive.columnNum" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="8">
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="归档盒号" prop="boxNum">
<el-input v-model="archive.boxNum" disabled style="width: 150px;" />
<el-input v-model="archive.boxNum" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="9">
<el-form-item label="报告数量" prop="archiveCount">
<el-input v-model="archive.archiveCount" disabled style="width: 150px;" />
<el-input v-model="archive.archiveCount" disabled />
</el-form-item>
</el-col>
</el-row>
@ -84,6 +88,8 @@ export default {
}
}).then(data => {
this.archive = data.archive
this.archive.createBy = this.formatter.getChineseName(null, null, this.archive.createBy)
this.archive.createTime = this.formatter.dateFormat('YYYY-MM-dd', new Date(this.archive.createTime))
this.paramList = data.paramList
})
}

7
src/views/archive/archive_scan.vue

@ -36,7 +36,7 @@
<el-table-column align="center" label="注册代码" prop="zhucedaima" />
<el-table-column align="center" label="使用登记证编号" prop="shiyongdengjibianhao" />
<el-table-column align="center" label="产品编号" prop="chanpinbianhao" />
<el-table-column align="center" label="操作" min-width="65">
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-button v-if="!scope.row.archiveId" type="danger" size="small" icon="el-icon-delete" @click="removeInfo(scope.$index)" />
</template>
@ -161,11 +161,10 @@ export default {
this.api({
url: '/archive',
method: 'post',
method: this.isAppend ? 'put' : 'post',
data: {
archive: this.archive,
params: archiveParamList,
isAppend: this.isAppend
params: archiveParamList
}
}).then(() => {
this.$message.success('添加成功。')

9
src/views/archive/list.vue

@ -50,15 +50,15 @@
</el-form>
</div>
<el-table ref="list" :data="list" size="mini" border fit highlight-current-row stripe width="100%" @row-click="onRowClick" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="15" />
<el-table-column align="center" type="selection" />
<el-table-column type="index" fixed="left" align="center" label="序号" min-width="30" />
<el-table-column align="center" label="归档单号" prop="archiveNum" />
<el-table-column align="center" label="归档架号" prop="frameNum" />
<el-table-column align="center" label="列" prop="columnNum" />
<el-table-column align="center" label="归档盒号" prop="boxNum" />
<el-table-column align="center" label="报告数量" prop="archiveCount" />
<el-table-column align="center" label="归档人" prop="archiveUser" />
<el-table-column align="center" label="归档日期" prop="archiveDate" min-width="40" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="归档人" prop="createBy" />
<el-table-column :formatter="formatterDate" align="center" label="归档日期" prop="createTime" />
<el-table-column align="center" label="操作" min-width="50">
<template slot-scope="scope">
<el-button type="text" size="small" @click="showAddDialog(scope.row.id)">
@ -166,6 +166,9 @@ export default {
this.archiveId = id
this.$refs.archive_scan.dialog = true
this.$refs.archive_scan.doInit()
},
formatterDate(row, column, cellValue) {
return this.formatter.dateFormat('YYYY-MM-dd', new Date(cellValue))
}
}
}

20
src/views/bjd/dj_input.vue

@ -2352,25 +2352,7 @@ export default {
Utils.$emit('allot-list')
if (audit) {
this.$message({ message: '审核成功', type: 'success' })
//
if (this.$store.getters.departmentId !== 75) {
this.$confirm('是否打印回执单?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.printHzd()
})
.catch(() => {
this.$store.dispatch('delCurrentViews', {
view: this.$route,
$router: this.$router
})
})
} else {
this.deleteCurrentView()
}
this.deleteCurrentView()
//
this.apisjse({
url: '/baseInfo/updateStateAndRiqiByIds',

102
src/views/bjd/dj_list.vue

@ -98,12 +98,6 @@
<el-radio :label="2">
已审核
</el-radio>
<el-radio :label="3">
不予受理
</el-radio>
<el-radio :label="4">
补证通知
</el-radio>
<el-radio :label="5">
异常收回
</el-radio>
@ -399,51 +393,31 @@ export default {
})
return false
} else {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.$prompt(
'请输入作废原因',
'共' +
this.multipleSelection.length +
'条报检项目将作废,是否继续?',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}
)
.then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.ids.push(this.multipleSelection[i].id)
this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废,是否继续?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}).then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.apibjd({
url: '/bjd/updBjdToZf',
method: 'get',
params: { reason: value, bjdId: this.multipleSelection[i].id },
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
this.apibjd({
url: '/bjd/updBjdToZf',
method: 'get',
params: { reason: value, bjdId: this.ids },
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.$message({
message:
(data.bianhao !== null && data.bianhao !== undefined
? '流水号为' +
data.bianhao +
'的项目关联的任务已经分配不能作废!'
: '') +
(data.count === 0 ? '' : data.count + '条项目作废成功'),
type: 'info'
})
this.getList()
})
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
}).then((data) => {
this.$notify.success('操作成功!')
this.getList()
})
}
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
})
}
},
// ---
@ -542,33 +516,9 @@ export default {
})
return false
}
const arr = this.$refs.bjdList.selection.map((bjd) => {
return bjd.id
})
console.log(arr)
this.preview({
url: '/print/batchGeneratePdfHzd',
method: 'get',
params: {
bjdIds: arr
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.preview({
url: '/print/createXmlOther',
method: 'post',
params: {
ids: arr,
type: 'HZD'
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.printbutton = 'ReportPrintApp://' + data
})
const bjdIds = this.$refs.bjdList.selection.map(bjd => bjd.id)
this.bjdService.batchPrintHzd(bjdIds).then((data) => {
this.printbutton = 'ReportPrintApp://' + data
})
},
//

87
src/views/bjd/dt_list.vue

@ -53,12 +53,6 @@
<el-radio :label="2">
已审核
</el-radio>
<el-radio :label="3">
不予受理
</el-radio>
<el-radio :label="4">
补证通知
</el-radio>
<el-radio :label="5">
异常收回
</el-radio>
@ -79,7 +73,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="radio-group-label">受理人员</span>
<el-radio-group v-model="listQuery.shouliren" @change="handleFilter">
<el-radio :label="this.$store.getters.nickname">
<el-radio :label="$store.getters.userId">
只看自己
</el-radio>
<el-radio :label="undefined">
@ -154,9 +148,8 @@
<script>
import Sticky from '@/components/Sticky'
import Pagination from '@/components/Pagination'
import store from '../../store'
import qs from 'qs'
// import router from '../../router'
export default {
name: 'ProjectDtList',
components: { Sticky, Pagination },
@ -169,8 +162,8 @@ export default {
pageRow: 20, //
orderBy: 'id desc',
zfState: false,
shoulikeshi: store.getters.departmentId,
shouliren: store.getters.nickname,
shoulikeshi: this.$store.getters.departmentId,
shouliren: this.$store.getters.userId,
bjState: undefined,
dataSource: 0
},
@ -252,53 +245,31 @@ export default {
})
return false
} else {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.$prompt(
'请输入作废原因',
'共' +
this.multipleSelection.length +
'条报检项目将作废,是否继续?',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}
)
.then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.ids.push(this.multipleSelection[i].id)
this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废,是否继续?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}).then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.apibjd({
url: '/bjd/updBjdToZf',
method: 'get',
params: { reason: value, bjdId: this.multipleSelection[i].id },
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
this.apibjd({
url: '/bjd/updBjdToZf',
method: 'get',
params: { reason: value, bjdId: this.multipleSelection.map(rw => {
return rw.id
}) },
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.$message({
message:
(data.bianhao !== null && data.bianhao !== undefined
? '流水号为' +
data.bianhao +
'的项目关联的任务已经分配不能作废!'
: '') +
(data.count === 0 ? '' : data.count + '条项目作废成功'),
type: 'info'
})
this.getList()
})
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
}).then((data) => {
this.$notify.success('操作成功!')
this.getList()
})
}
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
})
}
},
@ -364,7 +335,7 @@ export default {
editBjd($index) {
const bjd = this.list[$index]
let type = '/update'
if (bjd.bjState === '2') {
if (bjd.bjState === 2) {
type = '/finish'
}
if (bjd.jianyanleibie === 'DJ') {
@ -473,7 +444,7 @@ export default {
this.$message({ message: '只允许单台报检单收回', type: 'error' })
return false
}
if (this.multipleSelection[0].bjState !== '2') {
if (this.multipleSelection[0].bjState !== 2) {
this.$message({ message: '非审核通过数据不允许异常收回!', type: 'error' })
return false
}

10
src/views/bjd/jj_input.vue

@ -1411,16 +1411,8 @@ export default {
Utils.$emit('bjd-list')
Utils.$emit('allot-list')
if (audit) {
this.$store.dispatch('delCurrentViews', {
view: this.$route,
$router: this.$router
})
this.deleteCurrentView()
this.$message({ message: '审核成功', type: 'success' })
if (this.bjd.dataSource === 1) {
this.smsSendResult('已通过', '根据施工进度', '【申请现场检验】')
// ${project}${status}${action}${action1}${phone}
// 43[]:89738113
}
} else {
this.tableData = data.renwus
for (const tableObj of this.tableData) {

90
src/views/bjd/jj_list.vue

@ -52,12 +52,6 @@
<el-radio :label="2">
已审核
</el-radio>
<el-radio :label="3">
不予受理
</el-radio>
<el-radio :label="4">
补证通知
</el-radio>
<el-radio :label="5">
异常收回
</el-radio>
@ -91,7 +85,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="radio-group-label">受理人员</span>
<el-radio-group v-model="listQuery.shouliren" @change="handleFilter">
<el-radio :label="this.$store.getters.nickname">
<el-radio :label="$store.getters.userId">
只看自己
</el-radio>
<el-radio :label="undefined">
@ -223,7 +217,7 @@ export default {
orderBy: 'id desc',
zfState: false,
shoulikeshi: store.getters.departmentId,
shouliren: store.getters.nickname,
shouliren: this.$store.getters.userId,
jianyanleibie: 'JJ',
bjState: undefined
},
@ -310,51 +304,31 @@ export default {
return false
} else {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.$prompt(
'请输入作废原因',
'共' +
this.multipleSelection.length +
'条报检项目将作废,是否继续?',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}
)
.then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.ids.push(this.multipleSelection[i].id)
}
this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废,是否继续?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空'
}).then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) {
this.apibjd({
url: '/bjd/updBjdToZf',
method: 'get',
params: { reason: value, bjdId: this.multipleSelection.map(rw => {
return rw.id
}) },
params: { reason: value, bjdId: this.multipleSelection[i].id },
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.$message({
message:
(data.bianhao !== null && data.bianhao !== undefined
? '流水号为' +
data.bianhao +
'的项目关联的任务已经分配不能作废!'
: '') +
(data.count === 0 ? '' : data.count + '条项目作废成功'),
type: 'info'
})
this.$notify.success('操作成功!')
this.getList()
})
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消作废'
})
})
})
}
}
},
@ -428,33 +402,9 @@ export default {
this.$message({ message: '请选择至少一条数据进行打印!', type: 'error' })
return false
}
const arr = this.$refs.bjdList.selection.map((bjd) => {
return bjd.id
})
console.log(arr)
this.preview({
url: '/print/batchGeneratePdfHzd',
method: 'get',
params: {
bjdIds: arr
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.preview({
url: '/print/createXmlOther',
method: 'post',
params: {
ids: arr,
type: 'HZD'
},
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.printbutton = 'ReportPrintApp://' + data
})
const bjdIds = this.$refs.bjdList.selection.map((bjd) => bjd.id)
this.bjdService.batchPrintHzd(bjdIds).then((data) => {
this.printbutton = 'ReportPrintApp://' + data
})
},
//

21
src/views/bjd/qy_list.vue

@ -47,12 +47,6 @@
<el-radio :label="2">
已审核
</el-radio>
<el-radio :label="3">
不予受理
</el-radio>
<el-radio :label="4">
补证通知
</el-radio>
<el-radio :label="5">
异常收回
</el-radio>
@ -256,17 +250,8 @@ export default {
paramsSerializer: function(params) {
return qs.stringify(params, { indices: false })
}
}).then((data) => {
this.$message({
message:
(data.bianhao !== null && data.bianhao !== undefined
? '流水号为' +
data.bianhao +
'的项目关联的任务已经分配不能作废!'
: '') +
(data.count === 0 ? '' : data.count + '条项目作废成功'),
type: 'info'
})
}).then(() => {
this.$notify.success('操作成功!')
this.getList()
})
})
@ -391,7 +376,7 @@ export default {
this.$message({ message: '只允许单台报检单收回', type: 'error' })
return false
}
if (this.multipleSelection[0].bjState !== '2') {
if (this.multipleSelection[0].bjState !== 2) {
this.$message({ message: '非审核通过数据不允许异常收回!', type: 'error' })
return false
}

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

@ -43,7 +43,6 @@
<el-form>
<el-form-item>
<el-input v-model="listQuery.serialNumber" 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.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.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />

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

@ -43,7 +43,6 @@
<el-form>
<el-form-item>
<el-input v-model="listQuery.serialNumber" 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.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.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />

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

@ -46,7 +46,6 @@
<el-form ref="testrefprint">
<el-form-item>
<el-input v-model="listQuery.serialNumber" 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.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.weibaodanwei" placeholder="维保单位" clearable style="width: 250px" @keyup.enter.native="handleFilter" />

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

@ -61,7 +61,6 @@
<el-form>
<el-form-item>
<el-input v-model="listQuery.serialNumber" 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.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.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />

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

@ -43,7 +43,6 @@
<el-form>
<el-form-item>
<el-input v-model="listQuery.serialNumber" 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.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.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />

67
src/views/task/list.vue

@ -3,22 +3,22 @@
<div class="filter-container">
<sticky style="margin-bottom: 10px;">
<div class="sub-navbar">
<el-button v-if="notHasDepartmentId(86)" type="primary" icon="el-icon-edit" @click="editYsjl('YSJL')">
<el-button type="primary" icon="el-icon-edit" @click="editYsjl('YSJL')">
起草原始记录
</el-button>
<el-button v-if="notHasDepartmentId([69, 74])" type="primary" icon="el-icon-edit" @click="editYsjl('JYBG')">
<el-button type="primary" icon="el-icon-edit" @click="editYsjl('JYBG')">
起草报告
</el-button>
<el-button type="success" icon="el-icon-tickets" @click="copyYsjl">
复制数据
</el-button>
<el-button v-if="notHasDepartmentId([86, 74])" type="warning" @click="turnBack">
<el-button type="warning" @click="turnBack">
<svg-icon icon-class="reject" /> 任务退回
</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteRenwu">
作废任务
</el-button>
<el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
<el-button type="success" icon="el-icon-success" @click="completeRenwu">
任务完成
</el-button>
<el-button type="danger" @click="terminationFn">
@ -61,54 +61,19 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="40" />
<el-table-column align="center" label="序号" width="60" fixed="left" type="index">
<!-- <template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template> -->
</el-table-column>
<el-table-column v-if="$store.getters.departmentId !== 75" align="center" label="设备种类" prop="shebeizhonglei" width="100" />
<el-table-column align="center" label="序号" width="60" fixed="left" type="index" />
<el-table-column align="center" label="设备种类" prop="shebeizhonglei" width="100" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="neibuleibie" width="100" />
<template v-if="$store.getters.departmentId === 69 || $store.getters.departmentId === 86">
<el-table-column v-if="$store.getters.departmentId === 69" align="center" label="使用单位" prop="shiyongdanwei" width="240" />
<el-table-column v-if="$store.getters.departmentId === 86" 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 align="center" label="区划名称" prop="quhuamingcheng" width="150" />
<el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
</template>
<template v-else-if="$store.getters.departmentId === 74">
<el-table-column align="center" label="制造单位" prop="zhizaodanwei" />
<el-table-column align="center" label="设备代码" prop="shebeidaima" sortable="custom" />
<el-table-column align="center" label="锅炉型号" prop="guigexinghao" sortable="custom" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" />
<el-table-column align="center" label="操作" prop="acces" fixed="right">
<template slot-scope="scope">
<el-button type="info" size="small" circle icon="el-icon-info" title="相关鉴证" @click="showVerification(scope.row.id)" />
</template>
</el-table-column>
</template>
<template v-if="$store.getters.departmentId === 75">
<el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" 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="shebeimingcheng" width="180" />
<el-table-column align="center" label="锅炉型号" prop="guigexinghao" width="150" />
<el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="100" sortable />
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
</template>
<template v-else>
<el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
<el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="240" />
<el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="180" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column v-if="$store.getters.departmentId === 68" align="center" label="管道级别" prop="s7" width="140" />
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="150" />
<el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
</template>
<el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="180" sortable="custom" />
<el-table-column align="center" label="注册代码" prop="zhucedaima" width="180" sortable="custom" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="240" />
<el-table-column align="center" label="产品名称/设备名称" prop="shebeimingcheng" width="180" />
<el-table-column align="center" label="产品编号/出厂编号" prop="chanpinbianhao" width="220" />
<el-table-column v-if="$store.getters.departmentId === 68" align="center" label="管道级别" prop="s7" width="140" />
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="150" />
<el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
</el-table>
<pagination v-show="total>0" :total="total" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />

39
src/views/user/department.vue

@ -84,6 +84,11 @@
<el-form-item label="部门代码(选填)">
<el-input v-model="tempDepartment.code" type="text" size="small" style="width: 200px" />
</el-form-item>
<el-form-item label="上级科室">
<el-select v-model="tempDepartment.parentId" filterable clearable>
<el-option v-for="dept in departments" :key="dept.id" :value="dept.id" :label="dept.name" />
</el-select>
</el-form-item>
<el-form-item label="成员">
<template>
<el-transfer v-model="departmentUserList" :props="{key: 'id', label: 'nickname'}" :button-texts="['移除', '添加']" :titles="['未分配员工', '部门成员']" :data="unAllotUserList" />
@ -134,15 +139,31 @@ export default {
multipleSelection: [],
isIndeterminate: true,
sbzlList: [],
areas: []
areas: [],
departmentAll: []
}
},
computed: {
departments: function() {
return this.departmentAll.filter(row => row.id !== this.tempDepartment.id)
}
},
created() {
this.getList()
this.getSbzlList()
this.getArea()
this.getAllDepartment()
},
methods: {
getAllDepartment() {
this.api({
url: '/department/all',
method: 'get'
}).then(data => {
this.departmentAll = [{ id: 0, name: '顶级科室' }]
this.departmentAll = this.departmentAll.concat(data)
})
},
getSbzlList() {
this.api({
url: '/sedirectory/getList',
@ -181,7 +202,9 @@ export default {
},
showCreate() {
this.leaders = this.$store.getters.allUser
this.tempDepartment = {}
this.tempDepartment = {
parentId: 0
}
this.getUserListByDepartmentIdOrNull(0)
this.dialogStatus = 'create'
this.dialogFormVisible = true
@ -189,9 +212,9 @@ export default {
showUpdate(item) {
this.leaders = this.$store.getters.allUser
this.tempDepartment = item
this.tempDepartment.quhuadaima = item.quhuadaima.split(',')
this.tempDepartment.shebeizhongleidaima = item.shebeizhongleidaima.split(',')
this.tempDepartment.jianyanleibie = item.jianyanleibie.split(',')
this.tempDepartment.quhuadaima = item.quhuadaima && item.quhuadaima.split(',')
this.tempDepartment.shebeizhongleidaima = item.shebeizhongleidaima && item.shebeizhongleidaima.split(',')
this.tempDepartment.jianyanleibie = item.jianyanleibie && item.jianyanleibie.split(',')
this.getUserListByDepartmentIdOrNull(item.id)
this.getUserListByDepartmentId(item.id)
this.dialogStatus = 'update'
@ -227,9 +250,9 @@ export default {
const form = {}
form.department = this.tempDepartment
form.userIds = this.departmentUserList
form.department.quhuadaima = form.department.quhuadaima.toString()
form.department.shebeizhongleidaima = form.department.shebeizhongleidaima.toString()
form.department.jianyanleibie = form.department.jianyanleibie.toString()
form.department.quhuadaima = form.department.quhuadaima && form.department.quhuadaima.toString()
form.department.shebeizhongleidaima = form.department.shebeizhongleidaima && form.department.shebeizhongleidaima.toString()
form.department.jianyanleibie = form.department.jianyanleibie && form.department.jianyanleibie.toString()
this.$refs['tempDepartment'].validate(valid => {
if (valid) {
addDepartmentFn(form).then(() => {

111
src/views/zjd/zjbg_list.vue

@ -6,7 +6,7 @@
<el-button type="primary" icon="el-icon-printer" @click="createZjdShow">
生成转交单
</el-button>
<div style="float:right;">
<!-- <div style="float:right;">
<el-badge :value="shoppingSize" :max="99" class="item">
<el-popover placement="bottom" width="800" trigger="click">
<div class="filter-container" style="padding-bottom: 3px;">
@ -34,14 +34,14 @@
</el-button>
</el-popover>
</el-badge>
</div>
</div>-->
</div>
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" 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.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<!-- <el-input v-model="listQuery.serialNumber" 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: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -49,13 +49,13 @@
清空
</el-button>
<br>
<el-input v-model="listQuery.searchYsjl.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.searchYsjl.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-option v-for="item in jylbList" :key="item.code" :label="item.name" :value="item.code" />
<el-input v-model="listQuery.baogaobianhao" 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.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.neibuleibie" 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-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" />
<el-date-picker
v-model="jianyanriqi"
type="daterange"
@ -88,7 +88,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="报告编号" prop="baogaobianhao" width="120" sortable="custom" />
<el-table-column align="center" label="检验类别" prop="jianyanleibie" width="90" />
<el-table-column :formatter="formatter.formatterCategory" align="center" label="检验类别" prop="jianyanleibie" width="90" />
<el-table-column align="center" label="使用登记证号" prop="shiyongdengjibianhao" width="140" sortable="custom" />
<el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" sortable="custom" />
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" width="240" />
@ -100,28 +100,28 @@
<el-table-column align="center" label="监检结束日期" prop="jianyanjieshuriqi" width="130" 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 fixed="right" align="center" label="操作" min-width="80">
<!-- <el-table-column fixed="right" align="center" label="操作" min-width="80">
<template slot-scope="scope">
<el-button type="primary" @click="addToCart(scope.$index)">
<svg-icon icon-class="shoppingCard" />
</el-button>
</template>
</el-table-column>
</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="生成转交单" :visible.sync="zhuanjiaoVisible" width="30%">
<el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="转交人" prop="zhuanjiaoren">
<el-input v-model="zhuanjiao.zhuanjiaoren" type="text" />
<el-form-item label="转交人" prop="createBy">
<el-input v-model="zhuanjiao.createBy" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="转交日期" prop="zhuanjiaoriqi">
<el-date-picker v-model="zhuanjiao.zhuanjiaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
<el-form-item label="转交日期" prop="createTime">
<el-date-picker v-model="zhuanjiao.createTime" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
@ -135,19 +135,19 @@
</el-button>
</div>
</el-dialog>
<el-dialog title="生成转交单" :visible.sync="zhuanjiaoCartVisible" width="30%">
<!-- <el-dialog title="生成转交单" :visible.sync="zhuanjiaoCartVisible" width="30%">
<el-form ref="zhuanjiao" :model="zhuanjiao" :rules="rules" class="el-form" label-position="right" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="转交人" prop="zhuanjiaoren">
<el-input v-model="zhuanjiao.zhuanjiaoren" type="text" />
<el-form-item label="转交人" prop="createBy">
<el-input v-model="zhuanjiao.createBy" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="转交日期" prop="zhuanjiaoriqi">
<el-date-picker v-model="zhuanjiao.zhuanjiaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
<el-form-item label="转交日期" prop="createTime">
<el-date-picker v-model="zhuanjiao.createTime" type="date" value-format="yyyy-MM-dd" placeholder="转交日期" style="width: 100%;" />
</el-form-item>
</el-col>
</el-row>
@ -160,7 +160,7 @@
</el-button>
</div>
</el-dialog>
</el-dialog>-->
</div>
</template>
@ -179,11 +179,7 @@ export default {
listQuery: {
pageNum: 1, //
pageRow: 20, //
order: 'id', //
sort: 'desc',
searchYsjl: {
departmentId: this.$store.getters.departmentId
}
orderBy: 'id desc' //
},
flowUserList: [],
dialogFormVisible: false,
@ -192,33 +188,24 @@ export default {
multipleSelection: [],
multipleCartSelection: [],
jianyanriqi: '',
jylbList: [{
code: '定期检验',
name: '定期检验'
}, {
code: '监督检验',
name: '监督检验'
}, {
code: '首次检验',
name: '首次检验'
}],
jylbList: [],
userList: [],
zhuanjiaoVisible: false,
zhuanjiaoCartVisible: false,
zhuanjiao: {
zhuanjiaoren: '',
zhuanjiaoriqi: '',
createBy: '',
createTime: '',
ysjlId: ''
},
rules: {
zhuanjiaoren: [{ required: true, message: '转交人不能为空', trigger: 'blur', validator: this.validator }],
zhuanjiaoriqi: [{ required: true, message: '转交日期不能为空', trigger: 'blur', validator: this.validator }]
createBy: [{ required: true, message: '转交人不能为空', trigger: 'blur', validator: this.validator }],
createTime: [{ required: true, message: '转交日期不能为空', trigger: 'blur', validator: this.validator }]
}
}
},
created() {
this.getList()
// this.jylbList = this.$store.getters.allCategory
this.jylbList = this.$store.getters.allCategory.filter(row => row.parentId)
this.userList = this.$store.getters.allUser
},
mounted() {
@ -238,14 +225,14 @@ export default {
getList() {
if (this.jianyanriqi) {
//
this.listQuery.searchYsjl.jianyankaishiriqi = this.jianyanriqi[0]
this.listQuery.searchYsjl.jianyanjieshuriqi = this.jianyanriqi[1]
this.listQuery.jianyankaishiriqi = this.jianyanriqi[0]
this.listQuery.jianyanjieshuriqi = this.jianyanriqi[1]
} else {
this.listQuery.searchYsjl.jianyankaishiriqi = ''
this.listQuery.searchYsjl.jianyanjieshuriqi = ''
this.listQuery.jianyankaishiriqi = ''
this.listQuery.jianyanjieshuriqi = ''
}
this.api({
url: '/report/getList',
url: '/ysjl/getListCanZj',
method: 'get',
params: this.listQuery
}).then(data => {
@ -254,8 +241,7 @@ export default {
})
},
sortChange(column) {
this.listQuery.order = column.prop
this.listQuery.sort = column.order.replace('ending', '')
this.listQuery.orderBy = column.prop + ' ' + column.order.replace('ending', '')
this.getList()
},
getIndex($index) {
@ -277,10 +263,10 @@ export default {
this.selection = val
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
departmentId: this.$store.getters.departmentId,
createBy: this.$store.getters.userId,
printState: 0
this.$set(this, 'listQuery', {
pageNum: 1,
pageRow: 20,
orderBy: 'id desc'
})
this.jianyanriqi = ''
this.getList()
@ -297,9 +283,18 @@ export default {
return false
}
}
this.zhuanjiao.zhuanjiaoriqi = new Date()
this.zhuanjiao.zhuanjiaoren = this.$store.getters.nickname
this.zhuanjiaoVisible = true
this.api({
url: '/zjd',
method: 'post',
data: {
ysjlIds: this.$refs.list.selection.map(row => row.id),
sbzldm: this.$refs.list.selection[0].shebeizhongleidaima,
neibuleibie: this.$refs.list.selection[0].neibuleibie
}
}).then(data => {
this.getList()
Utils.$emit('zjd-list')
})
},
commitZjd() {
if (this.multipleSelection.length === 0) {

26
src/views/zjd/zjd_list.vue

@ -52,10 +52,10 @@
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column align="center" label="转交单编号" prop="bianhao" width="120" sortable="custom" />
<el-table-column align="center" label="转交人" prop="zhuanjiaoren" width="90" />
<el-table-column align="center" label="转交日期" prop="zhuanjiaoriqi" width="140" sortable="custom" />
<el-table-column align="center" label="确认人" prop="querenren" width="160" sortable="custom" />
<el-table-column align="center" label="转交单编号" prop="serialNumber" width="120" sortable="custom" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="转交人" prop="createBy" width="90" />
<el-table-column align="center" label="转交日期" prop="createTime" width="140" sortable="custom" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="确认人" prop="querenren" width="160" sortable="custom" />
<el-table-column align="center" label="确认日期" prop="querenriqi" width="240" />
<el-table-column align="center" label="操作" min-width="60">
<template slot-scope="scope">
@ -103,7 +103,7 @@
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="80" />
<el-table-column align="center" label="注册代码" prop="zhucedaima" width="160" />
<el-table-column align="center" label="使用登记编号" prop="shiyongdengjibianhao" width="160" />
<el-table-column align="center" label="检验日期" prop="jianyanriqi" width="160" />
<el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="160" />
</el-table>
</el-dialog>
<iframe :src="printbutton" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
@ -170,7 +170,7 @@ export default {
},
getList() {
this.api({
url: '/zjd',
url: '/zjd/list',
method: 'get',
params: this.listQuery
}).then(data => {
@ -220,9 +220,15 @@ export default {
return false
}
}
this.zhuanjiao.querenriqi = new Date()
this.zhuanjiao.querenren = this.$store.getters.nickname
this.zhuanjiaoVisible = true
this.api({
url: '/zjd/complete',
method: 'post',
data: {
zjdIds: this.$refs.list.selection.map(row => row.id)
}
}).then(data => {
this.getList()
})
},
commitZjd() {
if (this.multipleSelection.length === 0) {
@ -260,7 +266,7 @@ export default {
zjdId: this.list[$index].id
}
}).then(data => {
this.zjdList = data.list
this.zjdList = data
this.zjdInfoVisible = true
})
},

Loading…
Cancel
Save