Browse Source

apibjd

master
xiaobai 3 years ago
parent
commit
06c208447b
  1. 35
      src/api/common.js
  2. 21
      src/api/renwu.js
  3. 17
      src/components/drawerDialog/index.vue
  4. 2
      src/views/allot/components/chengya_list.vue
  5. 10
      src/views/allot/hasAllot.vue
  6. 10
      src/views/assign/hasAssign.vue
  7. 15
      src/views/assign/missionList.vue
  8. 527
      src/views/bjd/dj_create.vue
  9. 47
      src/views/bjd/dj_input.vue
  10. 26
      src/views/bjd/dj_list.vue
  11. 20
      src/views/bjd/dt_list.vue
  12. 24
      src/views/bjd/jj_list.vue
  13. 20
      src/views/bjd/qy_list.vue
  14. 14
      src/views/bjd/wx_list.vue
  15. 10
      src/views/bjd/zf_list.vue
  16. 20
      src/views/bjd/zj_list.vue
  17. 20
      src/views/bjd/zlsc_list.vue
  18. 20
      src/views/bjd/zlsc_list_all.vue
  19. 13
      src/views/flow/template.vue
  20. 36
      src/views/task/list.vue

35
src/api/common.js

@ -0,0 +1,35 @@
import api from '@/utils/api'
import apibjd from '@/utils/apibjd'
export function getOwnList(query) {
return api({
url: '/renwu/ownList',
method: 'get',
params: query
})
}
/**
* 任务列表 综合调用
* @param query
* @param urlPath
*/
export function completeRenwuFn(params) {
return apibjd({
url: 'renwu/completeRenwu',
method: 'post',
params: params,
paramsSerializer: function(data) {
return require('qs').stringify(data, { indices: false })
}
})
}
export function backToLeaderFn(params) {
return apibjd({
url: 'renwu/backToLeader',
method: 'get',
params: params,
paramsSerializer: function(data) {
return require('qs').stringify(data, { indices: false })
}
})
}

21
src/api/renwu.js

@ -24,3 +24,24 @@ export function getRenwuListByPath(query, urlPath) {
params: query params: query
}) })
} }
export function terminateRenwu(data) {
console.log(data)
return apibjd({
url: 'renwu/terminateRenwu',
method: 'put',
data: data,
paramsSerializer: function(data) {
return require('qs').stringify(data, { indices: false })
}
})
}
export function completeRenwuFn(params) {
return apibjd({
url: 'renwu/completeRenwu',
method: 'post',
params: params,
paramsSerializer: function(data) {
return require('qs').stringify(data, { indices: false })
}
})
}

17
src/components/drawerDialog/index.vue

@ -177,23 +177,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col>
<el-form-item label="模板标识" prop="ifAbroad">
<el-select
v-model="formTemplate.ifAbroad"
style="width: 100%"
clearable
placeholder="请选择"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-form-item label="排序号" prop="sort"> <el-form-item label="排序号" prop="sort">
<el-input <el-input

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

@ -398,7 +398,7 @@ export default {
return false return false
} }
this.apibjd({ this.apibjd({
url: '/bjd/updBjdToZfByRw', url: '/bjd/zfDbRenwuByBjdId',
method: 'get', method: 'get',
params: { params: {
bjdIds: this.$refs.list.selection.map(rw => { bjdIds: this.$refs.list.selection.map(rw => {

10
src/views/allot/hasAllot.vue

@ -100,19 +100,19 @@
<el-table-column align="center" label="约检日期" prop="yuejianriqi" width="100" fixed="right" sortable="custom" /> <el-table-column align="center" label="约检日期" prop="yuejianriqi" width="100" fixed="right" sortable="custom" />
<el-table-column align="center" label="任务状态" prop="rwState" width="90" fixed="right"> <el-table-column align="center" label="任务状态" prop="rwState" width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.rwState === '0'" type="brand"> <el-tag v-if="scope.row.rwState === 0" type="brand">
待办 待办
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '1'" type="info"> <el-tag v-if="scope.row.rwState === 1" type="info">
已约检 已约检
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '2'" type="success"> <el-tag v-if="scope.row.rwState === 2" type="success">
已完成 已完成
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '3'" type="danger"> <el-tag v-if="scope.row.rwState === 3" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '4'" type="warning"> <el-tag v-if="scope.row.rwState === 4" type="warning">
已终止 已终止
</el-tag> </el-tag>
</template> </template>

10
src/views/assign/hasAssign.vue

@ -78,19 +78,19 @@
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="180" /> <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="180" />
<el-table-column align="center" label="任务状态" prop="rwState" width="90" fixed="right"> <el-table-column align="center" label="任务状态" prop="rwState" width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.rwState === '0'" type="brand"> <el-tag v-if="scope.row.rwState === 0" type="brand">
待办 待办
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '1'" type="info"> <el-tag v-if="scope.row.rwState === 1" type="info">
已约检 已约检
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '2'" type="success"> <el-tag v-if="scope.row.rwState === 2" type="success">
已完成 已完成
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '3'" type="danger"> <el-tag v-if="scope.row.rwState === 3" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
<el-tag v-if="scope.row.rwState === '4'" type="warning"> <el-tag v-if="scope.row.rwState === 4" type="warning">
已终止 已终止
</el-tag> </el-tag>
</template> </template>

15
src/views/assign/missionList.vue

@ -178,6 +178,7 @@
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' import Utils from '@/utils/contact'
import { backToLeaderFn } from '@/api/common'
export default { export default {
name: 'MyTask', name: 'MyTask',
components: { Sticky, Pagination }, components: { Sticky, Pagination },
@ -555,15 +556,11 @@ export default {
}) })
return false return false
} }
this.apibjd({ const arr = []
url: 'renwu/backToLeader', this.$refs.list.selection.map(rw => {
method: 'get', arr.push(rw.id)
params: { })
ids: this.$refs.list.selection.map(rw => { backToLeaderFn({ renwuIds: arr }).then(data => {
return rw.id
}).join(',')
}
}).then(data => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '任务退回成功' message: '任务退回成功'

527
src/views/bjd/dj_create.vue

@ -1,9 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container root">
<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 icon="el-icon-edit" type="primary" size="medium" @click="convertBjd"> <el-button
icon="el-icon-edit"
type="primary"
size="medium"
@click="convertBjd"
>
生成报检项目 生成报检项目
</el-button> </el-button>
<el-button type="primary" size="medium" @click="insertCart"> <el-button type="primary" size="medium" @click="insertCart">
@ -14,33 +19,70 @@
新建报检单<i class="el-icon-arrow-down el-icon--right" /> 新建报检单<i class="el-icon-arrow-down el-icon--right" />
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="item in sbzlList" :key="item.value" :command="item"> <el-dropdown-item
v-for="item in sbzlList"
:key="item.value"
:command="item"
>
{{ item.label }} {{ item.label }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div style="float:right;"> <div style="float: right">
<el-badge :value="shoppingSize" :max="99" class="item"> <el-badge :value="shoppingSize" :max="99" class="item">
<el-popover placement="bottom" width="600" trigger="hover"> <el-popover placement="bottom" width="600" trigger="hover">
<div class="filter-container" style="padding-bottom: 3px;"> <div class="filter-container" style="padding-bottom: 3px">
<el-button icon="el-icon-sold-out" type="primary" @click="convertBjdByCart"> <el-button
icon="el-icon-sold-out"
type="primary"
@click="convertBjdByCart"
>
生成项目 生成项目
</el-button> </el-button>
<el-button type="danger" icon="el-icon-circle-close-outline" @click="clearCart"> <el-button
type="danger"
icon="el-icon-circle-close-outline"
@click="clearCart"
>
清空购物车 清空购物车
</el-button> </el-button>
</div> </div>
<el-table ref="shoppingTable" v-adaptive="{bottomOffset: 50}" height="0" :data="shoppingCartData" border style="width: 100%;" @selection-change="handleCartSelectionChange" @row-click="checkCartSelection"> <el-table
ref="shoppingTable"
v-adaptive="{ bottomOffset: 50 }"
height="0"
:data="shoppingCartData"
border
style="width: 100%"
@selection-change="handleCartSelectionChange"
@row-click="checkCartSelection"
>
<el-table-column type="selection" width="40" /> <el-table-column type="selection" width="40" />
<el-table-column align="center" label="操作" min-width="65"> <el-table-column align="center" label="操作" min-width="65">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="danger" icon="el-icon-delete" @click="removeCart(scope.$index)" /> <el-button
type="danger"
icon="el-icon-delete"
@click="removeCart(scope.$index)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备种类" prop="shebeizhonglei" /> <el-table-column label="设备种类" prop="shebeizhonglei" />
<el-table-column prop="zhucedaima" label="注册代码" min-width="120" /> <el-table-column
<el-table-column prop="chanpinbianhao" label="出厂编号" min-width="90" /> prop="zhucedaima"
<el-table-column prop="shiyongdengjibianhao" label="使用登记证号" min-width="90" /> label="注册代码"
min-width="120"
/>
<el-table-column
prop="chanpinbianhao"
label="出厂编号"
min-width="90"
/>
<el-table-column
prop="shiyongdengjibianhao"
label="使用登记证号"
min-width="90"
/>
</el-table> </el-table>
<el-button slot="reference" type="primary"> <el-button slot="reference" type="primary">
<svg-icon icon-class="shoppingCard" /> <svg-icon icon-class="shoppingCard" />
@ -52,14 +94,54 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable style="width: 160px"> <el-select
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" /> v-model="listQuery.shebeizhongleidaima"
placeholder="请选择设备种类"
clearable
style="width: 160px"
>
<el-option
v-for="item in sbzlList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input
<el-input v-model="listQuery.shigongdanwei" placeholder="施工单位名称" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> v-model="listQuery.shiyongdanwei"
<el-input v-model="listQuery.zhucedaima" placeholder="请从第一位开始输入注册代码" clearable style="width: 220px" @keyup.enter.native="handleFilter" /> placeholder="使用单位名称"
<el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> clearable
<el-input v-model="listQuery.danweineibubianhao" placeholder="单位内部编号" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.shigongdanwei"
placeholder="施工单位名称"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.zhucedaima"
placeholder="请从第一位开始输入注册代码"
clearable
style="width: 220px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.shiyongdengjibianhao"
placeholder="使用登记证编号"
clearable
style="width: 160px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.danweineibubianhao"
placeholder="单位内部编号"
clearable
style="width: 160px"
@keyup.enter.native="handleFilter"
/>
<el-button type="primary" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -67,9 +149,28 @@
清除 清除
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.zhizaodanwei" placeholder="制造单位名称" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input
<el-input v-model="listQuery.chanpinbianhao" placeholder="出厂编号" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> v-model="listQuery.zhizaodanwei"
<el-select v-model="listQuery.quhuadaima" placeholder="请选择所属区划" clearable value="" style="width: 140px;" @change="handleFilter"> placeholder="制造单位名称"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.chanpinbianhao"
placeholder="出厂编号"
clearable
style="width: 160px"
@keyup.enter.native="handleFilter"
/>
<el-select
v-model="listQuery.quhuadaima"
placeholder="请选择所属区划"
clearable
value=""
style="width: 140px"
@change="handleFilter"
>
<el-option <el-option
v-for="item in areas" v-for="item in areas"
:key="item.value" :key="item.value"
@ -77,23 +178,42 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-date-picker v-model="listQuery.xiacijianyanriqiStart" type="date" placeholder="下次检验日期(起)" style="width: 150px;" /> <el-date-picker
<el-date-picker v-model="listQuery.xiacijianyanriqiEnd" type="date" placeholder="下次检验日期(止)" style="width: 150px;" /> v-model="listQuery.xiacijianyanriqiStart"
<el-input v-model="listQuery.zhucedaimaqi" placeholder="注册代码起始(全)" clearable style="width: 220px" /> type="date"
<el-input v-model="listQuery.zhucedaimazhi" placeholder="注册代码截止(全)" clearable style="width: 220px" /> placeholder="下次检验日期(起)"
style="width: 150px"
/>
<el-date-picker
v-model="listQuery.xiacijianyanriqiEnd"
type="date"
placeholder="下次检验日期(止)"
style="width: 150px"
/>
<el-input
v-model="listQuery.zhucedaimaqi"
placeholder="注册代码起始(全)"
clearable
style="width: 220px"
/>
<el-input
v-model="listQuery.zhucedaimazhi"
placeholder="注册代码截止(全)"
clearable
style="width: 220px"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table <el-table
ref="baseTable" ref="baseTable"
v-adaptive="{bottomOffset: 50}" v-adaptive="{ bottomOffset: 50 }"
height="0" height="0"
:data="list" :data="list"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
fit fit
highlight-current-row highlight-current-row
stripe
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="checkSelection" @row-click="checkSelection"
> >
@ -103,18 +223,90 @@
<span v-text="getIndex(scope.$index)" /> <span v-text="getIndex(scope.$index)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :formatter="clearBlank" align="center" label="报告编号" prop="baogaobianhao" min-width="100" /> <el-table-column
<el-table-column align="center" label="设备种类" prop="shebeizhonglei" min-width="60" /> :formatter="clearBlank"
<el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="150" /> align="center"
<el-table-column v-if="departmentId !== 75" :formatter="clearBlank" align="center" label="注册代码" prop="zhucedaima" min-width="130" /> label="报告编号"
<el-table-column :formatter="clearBlank" align="center" label="使用登记证编号" prop="shiyongdengjibianhao" min-width="90" /> prop="baogaobianhao"
<el-table-column v-if="departmentId === 70" :formatter="clearBlank" align="center" label="设备名称" prop="shebeimingcheng" min-width="90" /> min-width="100"
<el-table-column :formatter="clearBlank" align="center" label="规格型号" prop="guigexinghao" min-width="110" /> />
<el-table-column :formatter="clearBlank" align="center" label="出厂编号" prop="chanpinbianhao" min-width="80" /> <el-table-column
<el-table-column :formatter="clearBlank" align="center" label="单位内部编号" prop="danweineibubianhao" min-width="60" /> align="center"
<el-table-column :formatter="clearBlank" align="center" label="下次检验日期" prop="xiacijianyanriqi" min-width="70" /> label="设备种类"
<el-table-column :formatter="clearBlank" align="center" label="区划名称" prop="quhuamingcheng" min-width="50" /> prop="shebeizhonglei"
<el-table-column :formatter="formmatState" align="center" label="流转状态" prop="state" min-width="50" /> min-width="60"
/>
<el-table-column
align="center"
label="使用单位"
prop="shiyongdanwei"
min-width="150"
/>
<el-table-column
v-if="departmentId !== 75"
:formatter="clearBlank"
align="center"
label="注册代码"
prop="zhucedaima"
min-width="130"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="使用登记证编号"
prop="shiyongdengjibianhao"
min-width="90"
/>
<el-table-column
v-if="departmentId === 70"
:formatter="clearBlank"
align="center"
label="设备名称"
prop="shebeimingcheng"
min-width="90"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="规格型号"
prop="guigexinghao"
min-width="110"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="出厂编号"
prop="chanpinbianhao"
min-width="80"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="单位内部编号"
prop="danweineibubianhao"
min-width="60"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="下次检验日期"
prop="xiacijianyanriqi"
min-width="70"
/>
<el-table-column
:formatter="clearBlank"
align="center"
label="区划名称"
prop="quhuamingcheng"
min-width="50"
/>
<el-table-column
:formatter="formmatState"
align="center"
label="流转状态"
prop="state"
min-width="50"
/>
<el-table-column align="center" label="操作" min-width="50"> <el-table-column align="center" label="操作" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" @click="addToCart(scope.$index)"> <el-button type="primary" @click="addToCart(scope.$index)">
@ -123,7 +315,23 @@
</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" @pagination="getList" /> <div class="uFlex mt-10">
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page-num.sync="listQuery.pageNum"
:page-row.sync="listQuery.pageRow"
@pagination="getList"
/>
<div class="uFlex">
<div class="tips1">
超期预警
</div>
<div class="tips2">
到期标注
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
@ -160,22 +368,22 @@ export default {
}, },
mounted() { mounted() {
switch (this.departmentId) { switch (this.departmentId) {
case 68 : case 68:
this.listQuery.shebeizhongleidaima = '8000' this.listQuery.shebeizhongleidaima = '8000'
break break
case 70 : case 70:
this.listQuery.shebeizhongleidaima = '2000' this.listQuery.shebeizhongleidaima = '2000'
break break
case 75 : case 75:
this.listQuery.shebeizhongleidaima = '1000' this.listQuery.shebeizhongleidaima = '1000'
break break
case 83 : case 83:
this.listQuery.shebeizhongleidaima = '2000' this.listQuery.shebeizhongleidaima = '2000'
break break
case 73 : case 73:
this.listQuery.shebeizhongleidaima = '3000' this.listQuery.shebeizhongleidaima = '3000'
break break
default : default:
this.listQuery.shebeizhongleidaima = '' this.listQuery.shebeizhongleidaima = ''
break break
} }
@ -187,27 +395,33 @@ export default {
url: '/se/list', url: '/se/list',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then((data) => {
if (data.list.length === 0) { if (data.list.length === 0) {
this.$confirm('省局监察未登记该设备信息,点“确定”执行本地查询或“取消”更换查询条件!!', '提示', { this.$confirm(
'省局监察未登记该设备信息,点“确定”执行本地查询或“取消”更换查询条件!!',
'提示',
{
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }
)
.then(() => {
this.apibjd({ this.apibjd({
url: '/baseinfo/listDating', url: '/baseinfo/listDating',
method: 'get', method: 'get',
params: this.listQuery params: this.listQuery
}).then(data => { }).then((data) => {
this.list = data.list this.list = data.list
this.totalCount = data.totalCount this.totalCount = data.total
}) })
}).catch(() => { })
.catch(() => {
return false return false
}) })
} else { } else {
this.list = data.list this.list = data.list
this.totalCount = data.totalCount this.totalCount = data.total
} }
}) })
}, },
@ -219,23 +433,31 @@ export default {
sbzl: undefined, sbzl: undefined,
level: '1' level: '1'
} }
}).then(data => { }).then((data) => {
this.sbzlList = data this.sbzlList = data
}) })
}, },
getArea() { // getArea() {
//
this.api({ this.api({
url: '/area/getShiArea', url: '/area/getShiArea',
method: 'get', method: 'get',
params: { params: {
shidaima: '370100' shidaima: '370100'
} }
}).then(data => { }).then((data) => {
this.areas = data this.areas = data
}) })
}, },
handleCommand(item) { handleCommand(item) {
this.$router.push({ path: '/bjd/bjd-dj-input/null/' + item.value + '/' + item.label + '/newBuild' }) this.$router.push({
path:
'/bjd/bjd-dj-input/null/' +
item.value +
'/' +
item.label +
'/newBuild'
})
}, },
getIndex($index) { getIndex($index) {
// //
@ -271,18 +493,19 @@ export default {
formmatState(row, column, cellValue) { formmatState(row, column, cellValue) {
if (cellValue !== null && cellValue !== '') { if (cellValue !== null && cellValue !== '') {
switch (cellValue) { switch (cellValue) {
case '0' : case '0':
cellValue = '未检验' cellValue = '未检验'
break break
case '1' : case '1':
case '2' : case '2':
cellValue = '检验中' cellValue = '检验中'
break break
case '3' : case '3':
case '4' : case '4':
cellValue = '已检验' cellValue = '已检验'
break break
default : cellValue = '未检验' default:
cellValue = '未检验'
break break
} }
return cellValue return cellValue
@ -293,14 +516,19 @@ export default {
const base = this.list[$index] const base = this.list[$index]
base.shebeidaima = base.shebeidaima === '' ? '/' : base.shebeidaima base.shebeidaima = base.shebeidaima === '' ? '/' : base.shebeidaima
base.zhucedaima = base.zhucedaima === '' ? '/' : base.zhucedaima base.zhucedaima = base.zhucedaima === '' ? '/' : base.zhucedaima
base.chanpinbianhao = base.chanpinbianhao === '' ? '/' : base.chanpinbianhao base.chanpinbianhao =
base.shiyongdengjibianhao = base.shiyongdengjibianhao === '' ? '/' : base.shiyongdengjibianhao base.chanpinbianhao === '' ? '/' : base.chanpinbianhao
base.shiyongdengjibianhao =
base.shiyongdengjibianhao === '' ? '/' : base.shiyongdengjibianhao
if (this.shoppingCartData.length === 0) { if (this.shoppingCartData.length === 0) {
this.shoppingCartData = [base] this.shoppingCartData = [base]
} else { } else {
for (let i = 0; i < this.shoppingCartData.length; i++) { for (let i = 0; i < this.shoppingCartData.length; i++) {
if (base.id === this.shoppingCartData[i].id) { if (base.id === this.shoppingCartData[i].id) {
this.$message({ message: '该设备已存在购物车中,请勿重复添加。', type: 'warning' }) this.$message({
message: '该设备已存在购物车中,请勿重复添加。',
type: 'warning'
})
return false return false
} }
if (base.shiyongdanwei !== this.shoppingCartData[i].shiyongdanwei) { if (base.shiyongdanwei !== this.shoppingCartData[i].shiyongdanwei) {
@ -308,13 +536,18 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { })
.then(() => {
return true return true
}).catch(() => { })
.catch(() => {
return false return false
}) })
} }
if (base.shebeizhongleidaima !== this.shoppingCartData[i].shebeizhongleidaima) { if (
base.shebeizhongleidaima !==
this.shoppingCartData[i].shebeizhongleidaima
) {
this.$message('请选择同“种类设备”进行报检。') this.$message('请选择同“种类设备”进行报检。')
return false return false
} }
@ -343,18 +576,26 @@ export default {
}, },
insertCart() { insertCart() {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[0].shiyongdanwei !== this.multipleSelection[i].shiyongdanwei) { if (
this.multipleSelection[0].shiyongdanwei !==
this.multipleSelection[i].shiyongdanwei
) {
this.$confirm('请确认“使用单位”是否同单位,是否继续??', '提示', { this.$confirm('请确认“使用单位”是否同单位,是否继续??', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { })
.then(() => {
return true return true
}).catch(() => { })
.catch(() => {
return false return false
}) })
} }
if (this.multipleSelection[0].shebeizhongleidaima !== this.multipleSelection[i].shebeizhongleidaima) { if (
this.multipleSelection[0].shebeizhongleidaima !==
this.multipleSelection[i].shebeizhongleidaima
) {
this.$message('请选择同“种类设备”进行报检。') this.$message('请选择同“种类设备”进行报检。')
return false return false
} }
@ -389,15 +630,24 @@ export default {
let stateFlag = false let stateFlag = false
let danweiFlag = false let danweiFlag = false
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[0].shebeizhongleidaima !== this.multipleSelection[i].shebeizhongleidaima) { if (
this.multipleSelection[0].shebeizhongleidaima !==
this.multipleSelection[i].shebeizhongleidaima
) {
this.$message('请选择同“种类设备”进行报检。') this.$message('请选择同“种类设备”进行报检。')
return false return false
} }
if (this.multipleSelection[i].state === '1' || this.multipleSelection[i].state === '2') { if (
this.multipleSelection[i].state === '1' ||
this.multipleSelection[i].state === '2'
) {
// 1 2 // 1 2
stateFlag = true stateFlag = true
} }
if (this.multipleSelection[0].shiyongdanwei !== this.multipleSelection[i].shiyongdanwei) { if (
this.multipleSelection[0].shiyongdanwei !==
this.multipleSelection[i].shiyongdanwei
) {
danweiFlag = true danweiFlag = true
} }
// this.multipleSelection[i].baseId = '' // 64id // this.multipleSelection[i].baseId = '' // 64id
@ -407,23 +657,53 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { })
.then(() => {
if (stateFlag) { if (stateFlag) {
this.$confirm('设备中存在已报检未完成设备,是否继续??', '提示', { this.$confirm(
'设备中存在已报检未完成设备,是否继续??',
'提示',
{
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }
this.$router.push({ path: '/bjd/bjd-dj-input/null/' + this.multipleSelection[0].shebeizhongleidaima + '/' + this.multipleSelection[0].shebeizhonglei + '/create', query: { params: this.multipleSelection }}) ).then(() => {
this.$router.push({
path:
'/bjd/bjd-dj-input/null/' +
this.multipleSelection[0].shebeizhongleidaima +
'/' +
this.multipleSelection[0].shebeizhonglei +
'/create',
query: { params: this.multipleSelection }
})
}) })
} else { } else {
this.$router.push({ path: '/bjd/bjd-dj-input/null/' + this.multipleSelection[0].shebeizhongleidaima + '/' + this.multipleSelection[0].shebeizhonglei + '/create', query: { params: this.multipleSelection }}) this.$router.push({
path:
'/bjd/bjd-dj-input/null/' +
this.multipleSelection[0].shebeizhongleidaima +
'/' +
this.multipleSelection[0].shebeizhonglei +
'/create',
query: { params: this.multipleSelection }
})
} }
}).catch(() => { })
.catch(() => {
return false return false
}) })
} else { } else {
this.$router.push({ path: '/bjd/bjd-dj-input/null/' + this.multipleSelection[0].shebeizhongleidaima + '/' + this.multipleSelection[0].shebeizhonglei + '/create', query: { params: this.multipleSelection }}) this.$router.push({
path:
'/bjd/bjd-dj-input/null/' +
this.multipleSelection[0].shebeizhongleidaima +
'/' +
this.multipleSelection[0].shebeizhonglei +
'/create',
query: { params: this.multipleSelection }
})
} }
}, },
convertBjdByCart() { convertBjdByCart() {
@ -432,18 +712,26 @@ export default {
return false return false
} }
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[0].shiyongdanwei !== this.multipleSelection[i].shiyongdanwei) { if (
this.multipleSelection[0].shiyongdanwei !==
this.multipleSelection[i].shiyongdanwei
) {
this.$confirm('请确认“使用单位”是否同单位,是否继续??', '提示', { this.$confirm('请确认“使用单位”是否同单位,是否继续??', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { })
.then(() => {
return true return true
}).catch(() => { })
.catch(() => {
return false return false
}) })
} }
if (this.multipleSelection[0].shebeizhongleidaima !== this.multipleSelection[i].shebeizhongleidaima) { if (
this.multipleSelection[0].shebeizhongleidaima !==
this.multipleSelection[i].shebeizhongleidaima
) {
this.$message('请选择同“种类设备”进行报检。') this.$message('请选择同“种类设备”进行报检。')
return false return false
} }
@ -451,13 +739,22 @@ export default {
const sbzldm = this.shoppingCartData[0].shebeizhongleidaima const sbzldm = this.shoppingCartData[0].shebeizhongleidaima
const sbzl = this.shoppingCartData[0].shebeizhonglei const sbzl = this.shoppingCartData[0].shebeizhonglei
const bjBase = this.shoppingCartData const bjBase = this.shoppingCartData
this.$router.push({ path: '/bjd/bjd-dj-input/null/' + sbzldm + '/' + sbzl + '/create', query: { params: bjBase }}) this.$router.push({
path: '/bjd/bjd-dj-input/null/' + sbzldm + '/' + sbzl + '/create',
query: { params: bjBase }
})
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (row.state === '1') { console.log(row, rowIndex)
return 'restart-row' // row.index = rowIndex
} else if (row.state === '2') { const nextTime = new Date(row.xiacijianyanriqi).getTime()
const currentTime = new Date().getTime()
console.log(nextTime, currentTime, nextTime - currentTime)
if (nextTime - currentTime < 7776000000) {
console.log('<3')
return 'restart-row' return 'restart-row'
} else if (nextTime - currentTime >= 7776000000) {
return 'reject-row'
} }
return '' return ''
} }
@ -465,10 +762,42 @@ export default {
} }
</script> </script>
<style> <style>
.el-table .reject-row { .root .el-table .reject-row {
color: orange; background: #e6a23c;
} }
.el-table .restart-row { .root .el-table .restart-row {
color: red; background: #f56c6c;
} }
.tips1 {
background: #e6a23c;
color: #ffffff;
width: 70px;
height: 30px;
border-radius: 5px;
float: left;
margin-right: 20px;
font-size: 14px;
text-align: center;
line-height: 30px;
}
.tips2 {
background: #f56c6c;
color: #ffffff;
width: 70px;
height: 30px;
font-size: 14px;
text-align: center;
border-radius: 5px;
float: left;
line-height: 30px;
}
.uFlex {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.mt-10 {
margin-top: 10px;
}
</style> </style>

47
src/views/bjd/dj_input.vue

@ -237,19 +237,13 @@
label="区划名称:" label="区划名称:"
prop="quhuadaima" prop="quhuadaima"
> >
<el-select <el-cascader
ref="editCascader"
v-model="bjd.quhuadaima" v-model="bjd.quhuadaima"
placeholder="请选择" placeholder="请选择"
style="width: 240px" :options="areaList"
@change="quhuaChange" @change="quhuaChange"
>
<el-option
v-for="item in areas"
:key="item.value"
:label="item.label"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
@ -1545,7 +1539,8 @@ export default {
fixedFlag: true, fixedFlag: true,
fixedWidth: '', fixedWidth: '',
isShengju: true, isShengju: true,
form: this.$route.params.form form: this.$route.params.form,
areaList: []
} }
}, },
watch: { watch: {
@ -1585,6 +1580,16 @@ export default {
this.getDepts() this.getDepts()
}, },
methods: { methods: {
getArea() {
this.api({
url: '/area/getAll',
method: 'get',
params: {}
}).then(res => {
this.areaList = res[0].children
console.log(this.areaList)
})
},
getParamList(renwus, init) { getParamList(renwus, init) {
this.apibjd({ this.apibjd({
url: '/bjd/getParams', url: '/bjd/getParams',
@ -1802,25 +1807,13 @@ export default {
this.jylbs = data this.jylbs = data
}) })
}, },
getArea() {
//
this.api({
url: '/area/getShiArea',
method: 'get',
params: {
shidaima: '370100'
}
}).then((data) => {
this.areas = data
})
},
getDepts() { getDepts() {
// //
this.api({ this.api({
url: '/department/getDepartmentByCode', url: '/department/all',
method: 'get', method: 'get',
params: { params: {
code: this.bjd.shebeizhongleidaima shebeizhongleidaima: this.bjd.shebeizhongleidaima
} }
}).then((data) => { }).then((data) => {
this.depts = data this.depts = data
@ -1848,10 +1841,8 @@ export default {
} }
}, },
quhuaChange(val) { quhuaChange(val) {
const obj = this.areas.find((item) => { const arr = this.$refs['editCascader'].getCheckedNodes()[0].pathLabels
return item.value === val this.bjd.quhuamingcheng = arr.toString()
})
this.bjd.quhuamingcheng = obj.label
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
row.index = rowIndex row.index = rowIndex

26
src/views/bjd/dj_list.vue

@ -133,25 +133,25 @@
<el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -177,7 +177,7 @@
<el-table-column align="center" label="操作" min-width="60"> <el-table-column align="center" label="操作" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -289,14 +289,14 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
inputPattern: /\S/, inputPattern: /\S/,
inputErrorMessage: '作废原因不能为空' inputErrorMessage: '作废原因不能为空'
}).then(() => { }).then(({ value }) => {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
this.ids.push(this.multipleSelection[i].id) this.ids.push(this.multipleSelection[i].id)
} }
this.apibjd({ this.apibjd({
url: '/bjd/updBjdToZf', url: '/bjd/updBjdToZf',
method: 'get', method: 'get',
params: { bjdIds: this.ids.join(',') } params: { reason: value, bjdIds: this.ids.join(',') }
}).then(data => { }).then(data => {
this.$message({ this.$message({
message: (data.bianhao !== null && data.bianhao !== undefined ? '流水号为' + data.bianhao + '的项目关联的任务已经分配不能作废!' : '') + (data.count === 0 ? '' : data.count + '条项目作废成功'), message: (data.bianhao !== null && data.bianhao !== undefined ? '流水号为' + data.bianhao + '的项目关联的任务已经分配不能作废!' : '') + (data.count === 0 ? '' : data.count + '条项目作废成功'),
@ -324,13 +324,13 @@ export default {
return false return false
} else { } else {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bjState === '2') { if (this.multipleSelection[i].bjState === 2) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '选择的数据中有办结的项目,请重新选择!' message: '选择的数据中有办结的项目,请重新选择!'
}) })
return false return false
} else if (this.multipleSelection[i].bjState === '5' || this.multipleSelection[i].bjState === '6') { } else if (this.multipleSelection[i].bjState === 5 || this.multipleSelection[i].bjState === 6) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!' message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!'
@ -374,7 +374,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2') { if (bjd.bjState === 2) {
type = '/finish' type = '/finish'
} }
this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhonglei + type }) this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhonglei + type })

20
src/views/bjd/dt_list.vue

@ -114,25 +114,25 @@
<el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -142,7 +142,7 @@
<el-table-column align="center" label="操作" min-width="60" fixed="right"> <el-table-column align="center" label="操作" min-width="60" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="small" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="small" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="small" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="small" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -292,13 +292,13 @@ export default {
return false return false
} else { } else {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bjState === '2') { if (this.multipleSelection[i].bjState === 2) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '选择的数据中有办结的项目,请重新选择!' message: '选择的数据中有办结的项目,请重新选择!'
}) })
return false return false
} else if (this.multipleSelection[i].bjState === '5' || this.multipleSelection[i].bjState === '6') { } else if (this.multipleSelection[i].bjState === 5 || this.multipleSelection[i].bjState === 6) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!' message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!'

24
src/views/bjd/jj_list.vue

@ -127,25 +127,25 @@
<el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补证通知 补证通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -171,8 +171,8 @@
<el-table-column align="center" label="操作" min-width="60"> <el-table-column align="center" label="操作" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '3' || scope.row.bjState === '4'" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" /> <el-button v-show="scope.row.bjState === 3 || scope.row.bjState === 4" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -349,13 +349,13 @@ export default {
return false return false
} else { } else {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bjState === '2') { if (this.multipleSelection[i].bjState === 2) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '选择的数据中有办结的项目,请重新选择!' message: '选择的数据中有办结的项目,请重新选择!'
}) })
return false return false
} else if (this.multipleSelection[i].bjState === '5' || this.multipleSelection[i].bjState === '6') { } else if (this.multipleSelection[i].bjState === 5 || this.multipleSelection[i].bjState === 6) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!' message: '异常收回跟异常退回的数据,请通过作废按钮进行处理!'
@ -394,7 +394,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2' || bjd.bjState === '3') { if (bjd.bjState === 2 || bjd.bjState === 3) {
type = '/finish' type = '/finish'
} }
this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhonglei + type }) this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhonglei + type })

20
src/views/bjd/qy_list.vue

@ -96,25 +96,25 @@
<el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="danger"> <el-tag v-else-if="scope.row.bjState===3" type="danger">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -124,8 +124,8 @@
<el-table-column align="center" label="操作" min-width="60"> <el-table-column align="center" label="操作" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '3' || scope.row.bjState === '4'" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" /> <el-button v-show="scope.row.bjState === 3 || scope.row.bjState === 4" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -263,7 +263,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2' || bjd.bjState === '3') { if (bjd.bjState === 2 || bjd.bjState === 3) {
type = '/finish' type = '/finish'
} }
if (bjd.jianyanleibie === 'DJ') { if (bjd.jianyanleibie === 'DJ') {

14
src/views/bjd/wx_list.vue

@ -89,25 +89,25 @@
<el-table-column align="center" label="报检日期" prop="createTime" min-width="60" /> <el-table-column align="center" label="报检日期" prop="createTime" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>

10
src/views/bjd/zf_list.vue

@ -56,16 +56,16 @@
<el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建 新建
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="info"> <el-tag v-else-if="scope.row.bjState===3" type="info">
已分配 已分配
</el-tag> </el-tag>
</template> </template>
@ -168,7 +168,7 @@ export default {
return false return false
} else { } else {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bjState === '2') { if (this.multipleSelection[i].bjState === 2) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '选择的数据中有办结的项目,请重新选择!' message: '选择的数据中有办结的项目,请重新选择!'

20
src/views/bjd/zj_list.vue

@ -78,25 +78,25 @@
<el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" /> <el-table-column align="center" label="报检日期" prop="shouliriqi" min-width="60" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建 新建
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -292,13 +292,13 @@ export default {
return false return false
} }
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].bjState === '2') { if (this.multipleSelection[i].bjState === 2) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '选择的数据中有办结的项目,请重新选择!' message: '选择的数据中有办结的项目,请重新选择!'
}) })
return false return false
} else if (this.multipleSelection[i].bjState === '5') { } else if (this.multipleSelection[i].bjState === 5) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '异常收回的数据,请通过作废按钮进行处理!' message: '异常收回的数据,请通过作废按钮进行处理!'
@ -352,7 +352,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2' || bjd.bjState === '3') { if (bjd.bjState === 2 || bjd.bjState === 3) {
type = '/finish' type = '/finish'
} }
this.$router.push({ path: '/bjd/bjd-zj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + type }) this.$router.push({ path: '/bjd/bjd-zj-input/' + bjd.id + '/' + bjd.shebeizhongleidaima + type })

20
src/views/bjd/zlsc_list.vue

@ -91,25 +91,25 @@
<el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="50" /> <el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="50" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="55"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="55">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -136,8 +136,8 @@
<el-table-column align="center" label="操作" min-width="40"> <el-table-column align="center" label="操作" min-width="40">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '3' || scope.row.bjState === '4'" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" /> <el-button v-show="scope.row.bjState === 3 || scope.row.bjState === 4" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -274,7 +274,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2' || bjd.bjState === '3') { if (bjd.bjState === 2 || bjd.bjState === 3) {
type = '/finish' type = '/finish'
} }
if (bjd.jianyanleibie === 'DJ') { if (bjd.jianyanleibie === 'DJ') {

20
src/views/bjd/zlsc_list_all.vue

@ -93,25 +93,25 @@
<el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="50" /> <el-table-column align="center" label="报检日期" prop="baojianriqi" min-width="50" />
<el-table-column align="center" label="报检状态" prop="bjState" min-width="50"> <el-table-column align="center" label="报检状态" prop="bjState" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.bjState==='0'" type="success"> <el-tag v-if="scope.row.bjState===0" type="success">
新建/预审 新建/预审
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='1'" type="primary"> <el-tag v-else-if="scope.row.bjState===1" type="primary">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='2'" type="info"> <el-tag v-else-if="scope.row.bjState===2" type="info">
已审核 已审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='3'" type="warning"> <el-tag v-else-if="scope.row.bjState===3" type="warning">
不予受理 不予受理
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='4'" type="warning"> <el-tag v-else-if="scope.row.bjState===4" type="warning">
补正通知 补正通知
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='5'" type="danger"> <el-tag v-else-if="scope.row.bjState===5" type="danger">
异常收回 异常收回
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.bjState==='6'" type="danger"> <el-tag v-else-if="scope.row.bjState===6" type="danger">
异常退回 异常退回
</el-tag> </el-tag>
</template> </template>
@ -148,8 +148,8 @@
<el-table-column align="center" label="操作" min-width="40"> <el-table-column align="center" label="操作" min-width="40">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" /> <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />
<el-button v-show="scope.row.bjState === '3' || scope.row.bjState === '4'" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" /> <el-button v-show="scope.row.bjState === 3 || scope.row.bjState === 4" size="mini" type="info" icon="el-icon-message" title="查看原因" circle @click="viewInfo(scope.row.bjdBeizhu)" />
<el-button v-show="scope.row.bjState === '2' || scope.row.bjState === '5' || scope.row.bjState === '6'" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" /> <el-button v-show="scope.row.bjState === 2 || scope.row.bjState === 5 || scope.row.bjState === 6" type="success" size="mini" circle icon="el-icon-view" title="预览回执单" @click="viewHzd(scope.row.id)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -321,7 +321,7 @@ export default {
editBjd($index) { editBjd($index) {
const bjd = this.list[$index] const bjd = this.list[$index]
let type = '/update' let type = '/update'
if (bjd.bjState === '2' || bjd.bjState === '3') { if (bjd.bjState === 2 || bjd.bjState === 3) {
type = '/finish' type = '/finish'
} }
if (bjd.jianyanleibie === 'DJ') { if (bjd.jianyanleibie === 'DJ') {

13
src/views/flow/template.vue

@ -63,19 +63,6 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select
v-model="listQuery.searchTemplate.ifAbroad"
clearable
style="width: 160px"
placeholder="请选择模板标识"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.value"
/>
</el-select>
<el-button type="primary" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>

36
src/views/task/list.vue

@ -227,7 +227,7 @@ import Sticky from '@/components/Sticky'
import SliceUpload from '@/components/SliceUpload' import SliceUpload from '@/components/SliceUpload'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import Utils from '../../utils/contact.js' import Utils from '../../utils/contact.js'
import { getOwnList } from '@/api/renwu' import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
import Enclosure from '@/views/common/Enclosure' import Enclosure from '@/views/common/Enclosure'
export default { export default {
name: 'MyTask', name: 'MyTask',
@ -675,15 +675,13 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apibjd({ console.log(111111111111)
url: 'renwu/completeRenwu', const arr = []
method: 'post', this.$refs.list.selection.map(rw => {
params: { arr.push(rw.id)
renwuIds: this.$refs.list.selection.map(rw => { })
return rw.id
}).join(',') completeRenwuFn({ renwuIds: arr }).then(res => {
}
}).then(data => {
this.$message.success('任务已完成') this.$message.success('任务已完成')
this.getList() this.getList()
}) })
@ -700,21 +698,21 @@ export default {
this.$message.error('请选择要终止的任务') this.$message.error('请选择要终止的任务')
return false return false
} }
const renwuIds = []
this.$refs.list.selection.map(rw => {
renwuIds.push(rw.id)
})
this.$prompt('请输入终止原因', '确认提前终止任务?', { this.$prompt('请输入终止原因', '确认提前终止任务?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
inputPattern: /\S/, inputPattern: /\S/,
inputErrorMessage: '终止原因不能为空' inputErrorMessage: '终止原因不能为空'
}).then(() => { }).then(({ value }) => {
this.apibjd({ const data = {
url: 'renwu/terminateRenwu', reason: value,
method: 'put', renwuIds
params: {
renwuIds: this.$refs.list.selection.map(rw => {
return rw.id
}).join(',')
} }
}).then(data => { terminateRenwu(data).then(data => {
this.$message.success('任务已终止') this.$message.success('任务已终止')
this.getList() this.getList()
}) })

Loading…
Cancel
Save