Browse Source

修改ysjl, 添加电梯模板,修改模板配置

master
xiaobai 3 years ago
parent
commit
008a9f9c3f
  1. 49
      src/components/drawerDialog/index.vue
  2. 18
      src/views/assign/missionList.vue
  3. 18
      src/views/audit/list.vue
  4. 50
      src/views/bggl/banjie_list.vue
  5. 54
      src/views/bggl/components/boiler_db_list.vue
  6. 49
      src/views/bggl/components/original_db_list.vue
  7. 18
      src/views/bggl/daishen_list.vue
  8. 57
      src/views/bggl/eliminatingred_list.vue
  9. 35
      src/views/bggl/sign_list.vue
  10. 27
      src/views/bggl/yiban_list.vue
  11. 38
      src/views/document/index.vue
  12. 7
      src/views/flow/template.vue
  13. 32
      src/views/print/1000/grant_create.vue
  14. 41
      src/views/print/1000/grant_list_yff.vue
  15. 35
      src/views/print/8000/print_list.vue
  16. 32
      src/views/statistics/gldj.vue
  17. 2
      src/views/task/list.vue
  18. 26
      src/views/ysjl/components/gascylinder_yb_list.vue
  19. 864
      src/views/ysjl/elevator/common/index.vue
  20. 54
      src/views/ysjl/elevator/yeyin/index.vue

49
src/components/drawerDialog/index.vue

@ -27,7 +27,7 @@
style="margin-left: 50px"
>
<el-form-item label="模板名称" prop="tempName" required>
<el-input v-model="formTemplate.tempName" type="text" />
<el-input v-model="formTemplate.tempName" type="text" style="width:400px" />
</el-form-item>
<el-form-item label="模板类型" prop="tempCategory" required>
<el-select
@ -142,10 +142,10 @@
</el-select>
</el-form-item>
<el-form-item label="模板路径" prop="tempPath">
<el-input v-model="formTemplate.tempPath" type="text" />
<el-input v-model="formTemplate.tempPath" type="text" style="width:400px" />
</el-form-item>
<el-form-item label="检验依据" prop="jianyanyiju">
<el-input v-model="formTemplate.jianyanyiju" type="text" />
<el-input v-model="formTemplate.jianyanyiju" type="text" style="width:400px" />
</el-form-item>
<el-form-item label="对应字典" prop="withDicCode">
<el-select
@ -752,7 +752,8 @@ export default {
totalCount: 0,
listQuery: {
pageNum: 1, //
pageRow: 20 //
pageRow: 20, //
templateId: null
},
list: [],
gridData: [],
@ -828,13 +829,30 @@ export default {
this.$refs.templateJyxmForm.resetFields()
},
open() {
console.log(this.id, 'hahahh')
this.listQuery.templateId = this.id
this.form.templateId = this.id
this.formLabelAlign.templateId = this.id
this.getList()
if (this.id) {
this.loadFormData(this.index)
} else {
this.$refs['formTemplate'].resetFields()
this.formTemplate = {
tempName: '',
tempCategory: '',
bglx: null,
jianyanleibie: '',
shebeizhongleidaima: '',
shebeileibiedaima: '',
tempPath: '',
jianyanyiju: '',
withDicCode: '',
parentId: '',
version: '',
sort: null,
cleanState: false,
showPageStatus: true
}
}
this.getSbList(undefined, undefined, 1)
this.getBglxList()
@ -855,6 +873,7 @@ export default {
this.dialogVisible = true
},
getList() {
this.listQuery.templateId = this.id
//
this.api({
url: '/templateSetting/list',
@ -1121,7 +1140,7 @@ export default {
update() {
let methods = ''
if (this.id) {
if (this.type === 1) {
if (this.type === 1 || this.type === 2) {
delete this.formTemplate.id
methods = 'post'
} else {
@ -1139,7 +1158,6 @@ export default {
})
},
rowClick(row) {
console.log(row, '选择')
if (!row) {
return false
}
@ -1150,6 +1168,23 @@ export default {
beforeClose(done) {
this.list.length = 0
this.gridData.length = 0
this.formTemplate = Object.assign({
tempName: '',
tempCategory: '',
bglx: 1,
jianyanleibie: '',
shebeizhongleidaima: '',
shebeileibiedaima: '',
tempPath: '',
jianyanyiju: '',
withDicCode: '',
parentId: '',
version: '',
sort: 0,
cleanState: false,
showPageStatus: true
}, this.formTemplate)
this.$refs['formTemplate'].resetFields()
this.$emit('closeTemplateDrawer')
}
}

18
src/views/assign/missionList.vue

@ -26,13 +26,13 @@
</sticky>
<el-form>
<el-form-item>
<el-select v-model="listQuery.searchOwnRw.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-input v-model="listQuery.searchOwnRw.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchOwnRw.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchOwnRw.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<!--<el-input v-model="listQuery.searchOwnRw.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<!--<el-input v-model="listQuery.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
<el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -196,8 +196,7 @@ export default {
modelList: [],
listQuery: {
pageNum: 1, //
pageRow: 20, //
searchOwnRw: {}
pageRow: 20 //
},
listQueryCopy: {
pageNum: 1, //
@ -569,7 +568,10 @@ export default {
})
},
clearQuery() {
this.$set(this.listQuery, 'searchOwnRw', {})
this.listQuery = {
pageNum: 1, //
pageRow: 20
}
this.getList()
},
clearCopyQuery() {

18
src/views/audit/list.vue

@ -20,8 +20,8 @@
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -165,9 +165,7 @@ export default {
sort: 'asc', //
link: 8,
hasChild: true,
hasLook: 3,
searchYsjl: {
}
hasLook: 3
},
flowUserList: [],
isQm: true,
@ -637,7 +635,15 @@ export default {
}
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {})
this.listQuery = {
pageNum: 1, //
pageRow: 20, //
order: 'update_time', //
sort: 'asc', //
link: 8,
hasChild: true,
hasLook: 3
}
this.getList()
},
closeDialog() {

50
src/views/bggl/banjie_list.vue

@ -41,21 +41,21 @@
<el-form style="margin-top: 10px;">
<el-form-item>
<el-input
v-model="listQuery.searchYsjl.baogaobianhao"
v-model="listQuery.baogaobianhao"
placeholder="报告编号"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.zhucedaima"
v-model="listQuery.zhucedaima"
placeholder="注册代码"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.shiyongdanwei"
v-model="listQuery.shiyongdanwei"
placeholder="使用单位"
clearable
style="width: 350px"
@ -63,7 +63,7 @@
/>
<br>
<span class="radio-group-label">查看类型</span>
<el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
@ -189,7 +189,7 @@
<el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.neibuleibie"
v-model="listQuery.neibuleibie"
placeholder="请选择检验类别"
style="width: 165px"
clearable
@ -200,7 +200,7 @@
</el-form-item>
<el-form-item label="设备种类:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.shebeizhongleidaima"
v-model="listQuery.shebeizhongleidaima"
placeholder="请选择设备种类"
style="width: 165px"
clearable
@ -211,7 +211,7 @@
</el-form-item>
<el-form-item label="检验人员:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.jianyanrenyuan"
v-model="listQuery.jianyanrenyuan"
placeholder="请选择检验人员"
style="width: 165px"
filterable
@ -221,18 +221,18 @@
</el-select>
</el-form-item>
<el-form-item label="审核人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审批人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="检验日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.jianyanjieshuriqi"
v-model="listQuery.jianyanjieshuriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择检验日期"
@ -241,7 +241,7 @@
</el-form-item>
<el-form-item label="审核日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.shenheriqi"
v-model="listQuery.shenheriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审核日期"
@ -250,7 +250,7 @@
</el-form-item>
<el-form-item label="审批日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.shenpiriqi"
v-model="listQuery.shenpiriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审批日期"
@ -259,7 +259,7 @@
</el-form-item>
<el-form-item label="下次检验日期:" style="width: 250px;">
<el-date-picker
v-model="listQuery.searchYsjl.xiacijianyanriqi"
v-model="listQuery.xiacijianyanriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入日期"
@ -268,25 +268,25 @@
</el-form-item>
<el-form-item label="设备/产品名称:" style="width: 290px;">
<el-input
v-model="listQuery.searchYsjl.shebeimingcheng"
v-model="listQuery.shebeimingcheng"
placeholder="请输入设备/产品名称"
clearable
style="width: 185px"
/>
</el-form-item>
<el-form-item label="制造单位:" style="width: 450px;">
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
</el-form-item>
<el-form-item label="使用登记证编号:" style="width: 350px;">
<el-input
v-model="listQuery.searchYsjl.shiyongdengjibianhao"
v-model="listQuery.shiyongdengjibianhao"
placeholder="请输入使用登记证编号"
clearable
style="width: 200px"
/>
</el-form-item>
<el-form-item label="产品/出厂编号:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
</el-form-item>
</el-form>
</el-container>
@ -544,9 +544,7 @@ export default {
pageRow: 20, //
order: 'shenpiriqi desc,id', //
sort: 'desc', //
searchYsjl: {
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
},
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
},
@ -913,9 +911,15 @@ export default {
})
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
createBy: this.$store.getters.userId
})
this.listQuery = {
pageNum: 1, //
pageRow: 20, //
order: 'shenpiriqi desc,id', //
sort: 'desc', //
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
}
this.getList()
},
clearExportReportQuery() {

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

@ -23,17 +23,17 @@
<el-row :gutter="10">
<el-col :span="5">
<el-form-item label="报告编号:" prop="baogaobianhao">
<el-input v-model="listQuery.searchYsjl.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="使用单位:" prop="shiyongdanwei">
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备种类:" prop="shebeizhonglei">
<el-select v-model="listQuery.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="sbzlChange">
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="sbzlChange">
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -42,17 +42,17 @@
<el-row :gutter="10">
<el-col :span="5">
<el-form-item label="注册代码:" prop="zhucedaima">
<el-input v-model="listQuery.searchYsjl.zhucedaima" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhucedaima" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品编号:" prop="chanpinbianhao">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.chanpinbianhao" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备品种:" prop="shebeipinzhongdaima">
<el-select v-model="listQuery.searchYsjl.shebeipinzhongdaima" placeholder="请选择设备品种" clearable>
<el-select v-model="listQuery.shebeipinzhongdaima" placeholder="请选择设备品种" clearable>
<el-option v-for="item in sbpzs" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -199,61 +199,61 @@
<el-container>
<el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
<el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
</el-form-item>
<el-form-item label="设备种类:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="当前环节:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
<el-select v-model="listQuery.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="检验人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审核人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审批人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="检验日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
<el-date-picker v-model="listQuery.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
</el-form-item>
<el-form-item label="审核日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
<el-date-picker v-model="listQuery.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
</el-form-item>
<el-form-item label="审批日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
<el-date-picker v-model="listQuery.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
</el-form-item>
<el-form-item label="设备/产品名称:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
<el-input v-model="listQuery.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
</el-form-item>
<el-form-item label="内部编号:" style="width: 240px;">
<el-input v-model="listQuery.searchYsjl.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
<el-input v-model="listQuery.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
</el-form-item>
<el-form-item label="下次检验日期:" style="width: 280px;">
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
</el-form-item>
<el-form-item label="制造单位:" style="width: 400px;">
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
</el-form-item>
<el-form-item label="产品/出厂编号:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
</el-form-item>
<el-form-item label="使用登记证编号:" style="width: 320px;">
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
<el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
</el-form-item>
</el-form>
</el-container>
@ -352,9 +352,7 @@ export default {
pageRow: 20, //
order: 'update_time', //
sort: 'asc', //
searchYsjl: {
flowStatus: 1
},
flowStatus: 1,
hasChild: true,
hasFinish: false
},
@ -982,7 +980,13 @@ export default {
this.dialogQueryVisible = true
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {})
this.listQuery = {
order: 'update_time', //
sort: 'asc', //
flowStatus: 1,
hasChild: true,
hasFinish: false
}
this.getList()
},
clearCopyQuery() {

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

@ -25,10 +25,10 @@
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.bglx" placeholder="报告类型" style="width: 160px">
<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" />
<el-select v-model="listQuery.bglx" placeholder="报告类型" style="width: 160px">
<el-option
v-for="item in bglxOptions"
:key="item.value"
@ -37,7 +37,7 @@
/>
</el-select><br>
<span class="radio-group-label">当前环节</span>
<el-radio-group v-model="listQuery.searchYsjl.flowstatus" @change="handleFilter">
<el-radio-group v-model="listQuery.flowstatus" @change="handleFilter">
<el-radio :label="undefined">
全部
</el-radio>
@ -192,61 +192,61 @@
<el-container>
<el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
<el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" style="width: 165px" clearable>
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
</el-form-item>
<el-form-item label="设备种类:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
<el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" style="width: 165px" clearable>
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="当前环节:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
<el-select v-model="listQuery.flowstatus" placeholder="请选择当前环节" style="width: 165px" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="检验人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审核人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审批人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="检验日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
<el-date-picker v-model="listQuery.jianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择检验日期" style="width: 165px" />
</el-form-item>
<el-form-item label="审核日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
<el-date-picker v-model="listQuery.shenheriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审核日期" style="width: 165px" />
</el-form-item>
<el-form-item label="审批日期:" style="width: 240px;">
<el-date-picker v-model="listQuery.searchYsjl.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
<el-date-picker v-model="listQuery.shenpiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择审批日期" style="width: 165px" />
</el-form-item>
<el-form-item label="设备/产品名称:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
<el-input v-model="listQuery.shebeimingcheng" placeholder="请输入设备/产品名称" clearable style="width: 185px" />
</el-form-item>
<el-form-item label="内部编号:" style="width: 240px;">
<el-input v-model="listQuery.searchYsjl.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
<el-input v-model="listQuery.danweineibubianhao" placeholder="请输入内部编号" clearable style="width: 165px" />
</el-form-item>
<el-form-item label="下次检验日期:" style="width: 280px;">
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请输入日期" style="width: 165px" />
</el-form-item>
<el-form-item label="制造单位:" style="width: 400px;">
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" clearable style="width: 300px" />
</el-form-item>
<el-form-item label="产品/出厂编号:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" />
</el-form-item>
<el-form-item label="使用登记证编号:" style="width: 320px;">
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
<el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" />
</el-form-item>
</el-form>
</el-container>
@ -420,7 +420,6 @@ export default {
pageRow: 20, //
order: 'update_time', //
sort: 'asc', //
searchYsjl: {},
hasChild: true,
hasFinish: false
},
@ -1181,13 +1180,19 @@ export default {
this.dialogQueryVisible = true
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {})
this.listQuery = {
order: 'update_time', //
sort: 'asc', //
hasChild: true,
hasFinish: false
}
this.getList()
},
clearCopyQuery() {
this.$set(this.listQueryCopy, 'searchYsjl', {
bglx: 1
})
this.handleFilterCopy()
},
closeDialog() {

18
src/views/bggl/daishen_list.vue

@ -21,12 +21,12 @@
<el-row :gutter="10">
<el-col :span="5">
<el-form-item label="报告编号:" prop="baogaobianhao">
<el-input v-model="listQuery.searchYsjl.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.baogaobianhao" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="使用单位:" prop="shiyongdanwei">
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shiyongdanwei" clearable @keyup.enter.native="handleFilter" />
</el-form-item>
</el-col>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@ -178,9 +178,7 @@ export default {
pageRow: 20, //
order: 'update_time', //
sort: 'asc', //
searchYsjl: {
hasTrial: true
},
hasTrial: true,
hasChild: true,
hasFinish: false
},
@ -673,7 +671,15 @@ export default {
}
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {})
this.listQuery = {
pageNum: 1, //
pageRow: 20, //
order: 'update_time', //
sort: 'asc', //
hasTrial: true,
hasChild: true,
hasFinish: false
}
this.getList()
},
closeDialog() {

57
src/views/bggl/eliminatingred_list.vue

@ -11,7 +11,7 @@
<el-form style="margin-top: 10px;">
<el-form-item>
<el-select
v-model="listQuery.searchYsjl.modelId"
v-model="listQuery.modelId"
placeholder="模板"
filterable
clearable
@ -21,21 +21,21 @@
<el-option v-for="item in templates" :key="item.id" :label="item.tempName" :value="item.id" />
</el-select>
<el-input
v-model="listQuery.searchYsjl.baogaobianhao"
v-model="listQuery.baogaobianhao"
placeholder="报告编号"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.zhucedaima"
v-model="listQuery.zhucedaima"
placeholder="注册代码"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.shiyongdengjibianhao"
v-model="listQuery.shiyongdengjibianhao"
placeholder="使用登记证编号"
clearable
style="width: 350px"
@ -43,7 +43,7 @@
/>
<br>
<span class="radio-group-label">消红状态</span>
<el-radio-group v-model="listQuery.searchYsjl.updateState" @change="handleFilter">
<el-radio-group v-model="listQuery.updateState" @change="handleFilter">
<el-radio :label="0">
未消红
</el-radio>
@ -99,7 +99,7 @@
<el-table-column align="center" label="检验日期" prop="jianyanjieshuriqi" width="110" />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="130" />
<el-table-column align="center" label="检验结论" prop="jianyanjielun" width="120" />
<el-table-column v-if="listQuery.searchYsjl.updateState === undefined" fixed="right" align="center" label="消红状态" prop="updateState" width="120">
<el-table-column v-if="listQuery.updateState === undefined" fixed="right" align="center" label="消红状态" prop="updateState" width="120">
<template slot-scope="scope">
<el-tag v-if="scope.row.updateState === -1" type="info">
不可消红
@ -149,7 +149,7 @@
<el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.neibuleibie"
v-model="listQuery.neibuleibie"
placeholder="请选择检验类别"
style="width: 165px"
clearable
@ -160,7 +160,7 @@
</el-form-item>
<el-form-item label="设备种类:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.shebeizhongleidaima"
v-model="listQuery.shebeizhongleidaima"
placeholder="请选择设备种类"
style="width: 165px"
clearable
@ -171,7 +171,7 @@
</el-form-item>
<el-form-item label="检验人员:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.jianyanrenyuan"
v-model="listQuery.jianyanrenyuan"
placeholder="请选择检验人员"
style="width: 165px"
filterable
@ -181,18 +181,18 @@
</el-select>
</el-form-item>
<el-form-item label="审核人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenheren" placeholder="请选择审核人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="审批人员:" style="width: 240px;">
<el-select v-model="listQuery.searchYsjl.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-select v-model="listQuery.shenpiren" placeholder="请选择审批人员" style="width: 165px" filterable clearable>
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="检验日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.jianyanjieshuriqi"
v-model="listQuery.jianyanjieshuriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择检验日期"
@ -201,7 +201,7 @@
</el-form-item>
<el-form-item label="审核日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.shenheriqi"
v-model="listQuery.shenheriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审核日期"
@ -210,7 +210,7 @@
</el-form-item>
<el-form-item label="审批日期:" style="width: 240px;">
<el-date-picker
v-model="listQuery.searchYsjl.shenpiriqi"
v-model="listQuery.shenpiriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审批日期"
@ -219,7 +219,7 @@
</el-form-item>
<el-form-item label="下次检验日期:" style="width: 250px;">
<el-date-picker
v-model="listQuery.searchYsjl.xiacijianyanriqi"
v-model="listQuery.xiacijianyanriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入日期"
@ -228,25 +228,25 @@
</el-form-item>
<el-form-item label="设备/产品名称:" style="width: 290px;">
<el-input
v-model="listQuery.searchYsjl.shebeimingcheng"
v-model="listQuery.shebeimingcheng"
placeholder="请输入设备/产品名称"
clearable
style="width: 185px"
/>
</el-form-item>
<el-form-item label="制造单位:" style="width: 450px;">
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
</el-form-item>
<el-form-item label="使用登记证编号:" style="width: 350px;">
<el-input
v-model="listQuery.searchYsjl.shiyongdengjibianhao"
v-model="listQuery.shiyongdengjibianhao"
placeholder="请输入使用登记证编号"
clearable
style="width: 200px"
/>
</el-form-item>
<el-form-item label="产品/出厂编号:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
</el-form-item>
</el-form>
</el-container>
@ -308,9 +308,8 @@ export default {
pageNum: 1, //
pageSize: 20, //
orderBy: 'shenpiriqi desc,id desc', //
searchYsjl: {
updateState: 0
}
updateState: 0
},
multipleSelection: [],
dialogQueryVisible: false,
@ -324,7 +323,7 @@ export default {
}
},
watch: {
'listQuery.searchYsjl.updateState': function(val) {
'listQuery.updateState': function(val) {
this.showUpdateState = val === undefined || val === 3
}
},
@ -434,11 +433,13 @@ export default {
this.dialogQueryVisible = true
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
createBy: this.$store.getters.userId,
updateState: 2,
bglx: 1
})
this.listQuery = {
bglx: 1,
pageNum: 1, //
pageSize: 20, //
orderBy: 'shenpiriqi desc,id desc', //
updateState: 0
}
this.getList()
},
cleanRed() {

35
src/views/bggl/sign_list.vue

@ -4,21 +4,21 @@
<el-form style="margin-top: 10px;">
<el-form-item>
<el-input
v-model="listQuery.searchYsjl.baogaobianhao"
v-model="listQuery.baogaobianhao"
placeholder="报告编号"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.zhucedaima"
v-model="listQuery.zhucedaima"
placeholder="注册代码"
clearable
style="width: 200px"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.searchYsjl.shiyongdanwei"
v-model="listQuery.shiyongdanwei"
placeholder="使用单位"
clearable
style="width: 350px"
@ -105,7 +105,7 @@
<el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;">
<el-select
v-model="listQuery.searchYsjl.neibuleibie"
v-model="listQuery.neibuleibie"
placeholder="请选择检验类别"
style="width: 165px"
clearable
@ -116,25 +116,25 @@
</el-form-item>
<el-form-item label="设备/产品名称:" style="width: 290px;">
<el-input
v-model="listQuery.searchYsjl.shebeimingcheng"
v-model="listQuery.shebeimingcheng"
placeholder="请输入设备/产品名称"
clearable
style="width: 185px"
/>
</el-form-item>
<el-form-item label="制造单位:" style="width: 450px;">
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="请输入制造单位" style="width: 370px" />
</el-form-item>
<el-form-item label="使用登记证编号:" style="width: 350px;">
<el-input
v-model="listQuery.searchYsjl.shiyongdengjibianhao"
v-model="listQuery.shiyongdengjibianhao"
placeholder="请输入使用登记证编号"
clearable
style="width: 200px"
/>
</el-form-item>
<el-form-item label="产品/出厂编号:" style="width: 290px;">
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" style="width: 185px" />
</el-form-item>
</el-form>
</el-container>
@ -164,10 +164,8 @@ export default {
pageRow: 20, //
order: 'jianyanjieshuriqi desc,id', //
sort: 'desc', //
searchYsjl: {
bglx: 2, //
jianyanrenyuan: this.$store.getters.userId
},
bglx: 2, //
jianyanrenyuan: this.$store.getters.userId,
hasFinish: null,
hasLook: 1, //
ownRoles: 1 //
@ -218,10 +216,15 @@ export default {
this.dialogQueryVisible = true
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
bglx: 2,
jianyanrenyuan: this.$store.getters.userId
})
this.listQuery = {
order: 'jianyanjieshuriqi desc,id', //
sort: 'desc', //
bglx: 2, //
jianyanrenyuan: this.$store.getters.userId,
hasFinish: null,
hasLook: 1, //
ownRoles: 1 //
}
this.getList()
},
formatterHuanjie(row) {

27
src/views/bggl/yiban_list.vue

@ -10,9 +10,9 @@
</sticky>
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 300px" @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: 300px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.ownRoles" placeholder="请选择所处角色" style="width: 165px" clearable @change="changeOwnRoles">
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
@ -24,7 +24,7 @@
</el-button>
<br>
<span class="radio-group-label">查看类型</span>
<el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
@ -121,9 +121,7 @@ export default {
pageRow: 20, //
order: undefined, //
sort: undefined, //
searchYsjl: {
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
},
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true, //
ownRoles: undefined, //
link: 7 //
@ -158,7 +156,7 @@ export default {
},
methods: {
getList() {
this.listQuery.searchYsjl.cjState = 'bggl'
this.listQuery.cjState = 'bggl'
this.api({
url: '/ysjl/getList',
method: 'get',
@ -216,9 +214,14 @@ export default {
}
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
createBy: this.$store.getters.userId
})
this.listQuery = {
order: undefined, //
sort: undefined, //
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true, //
ownRoles: undefined, //
link: 7 //
}
this.getList()
},
createQrcode() {
@ -274,7 +277,7 @@ export default {
},
changeOwnRoles(val) {
if (val === 2 || val === 3) {
this.listQuery.searchYsjl.createBy = undefined
this.listQuery.createBy = undefined
}
}
}

38
src/views/document/index.vue

@ -13,21 +13,20 @@
/>
<query :crud="crud" />
<el-upload
ref="upload"
slot="right"
class="upload-demo"
:show-file-list="false"
:before-upload="beforeUpload"
accept=".pdf"
action=""
>
<el-button slot="trigger" size="middle" type="primary">
上传文件
</el-button>
</el-upload>
<el-upload
ref="upload"
slot="right"
class="upload-demo"
:show-file-list="false"
:before-upload="beforeUpload"
accept=".pdf"
action=""
>
<el-button slot="trigger" size="middle" type="primary">
上传文件
</el-button>
</el-upload>
</div>
</div>
<!--表格内容-->
<CustomTable
@ -130,11 +129,12 @@ export default {
pageSize: 10
},
gridData: [],
subTotal: 0
subTotal: 0,
url: process.env.VUE_APP_PREVIEW_API + process.env.VUE_APP_PROJECT_NAME
}
},
mounted() {},
mounted() {
},
methods: {
handleRemove(file, fileList) {
console.log(file, fileList)
@ -178,10 +178,10 @@ export default {
})
},
downLoad(item) {
downloadFileUrl('http://test.sdma.mingansei.com/sdma-preview/SJJY/inspectionSystemFile/' + item.id + item.suffix, item.filename, item.suffix)
downloadFileUrl(this.url + '/' + item.id + item.suffix, item.filename, item.suffix)
},
downLoadFn(item) {
download('http://test.sdma.mingansei.com/sdma-preview/SJJY/inspectionSystemFile/' + item.id + item.suffix)
download(this.url + '/' + item.id + item.suffix)
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`)

7
src/views/flow/template.vue

@ -269,7 +269,7 @@ export default {
nblbList: [],
bglxList: [],
dicCodeList: [],
temType: '',
temType: null,
categoryList: [
{
value: 'YSJL',
@ -497,7 +497,9 @@ export default {
showPageStatus: false,
hasCheckedPage: false
}
this.templateIndex = ''
this.temType = 2
this.templateIndex = null
this.id = null
this.dialogStatus = 'create'
this.drawer = true
},
@ -512,6 +514,7 @@ export default {
console.log(row, $index, '行')
this.dialogStatus = 'update'
this.id = row.id
this.temType = 0
this.templateIndex = $index
this.drawer = true
console.log(this.drawer, $index, '打开')

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

@ -17,10 +17,10 @@
</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.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.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.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" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -28,13 +28,13 @@
清空
</el-button>
<br>
<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-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.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<el-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
@ -155,12 +155,10 @@ export default {
hasChild: false,
hasFinish: true,
flowstatus: undefined,
searchYsjl: {
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 0,
departmentId: this.$store.getters.departmentId === 75 ? 75 : null
}
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 0,
departmentId: this.$store.getters.departmentId === 75 ? 75 : null
},
flowUserList: [],
dialogFormVisible: false,
@ -231,11 +229,11 @@ export default {
this.multipleSelection = val
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
this.listQuery = {
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 0
})
}
this.getList()
},
openGrant() {

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

@ -3,10 +3,10 @@
<div class="filter-container">
<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.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.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.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" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -14,13 +14,13 @@
清空
</el-button>
<br>
<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-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.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<el-select v-model="listQuery.searchYsjl.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<el-select v-model="listQuery.jianyanrenyuan" placeholder="请选择检验人员" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
@ -101,12 +101,11 @@ export default {
hasChild: false,
hasFinish: true,
flowstatus: undefined,
searchYsjl: {
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 1,
departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
}
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 1,
departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
},
flowUserList: [],
dialogFormVisible: false,
@ -175,11 +174,17 @@ export default {
this.multipleSelection = val
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
this.listQuery = {
order: 'id', //
sort: 'desc', //
hasChild: false,
hasFinish: true,
flowstatus: undefined,
shebeizhongleidaima: '1000',
printState: 1,
fafangState: 0
})
fafangState: 1,
departmentId: this.$store.getters.departmentId === 77 ? null : this.$store.getters.departmentId
}
this.getList()
},
openGrant() {

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

@ -33,10 +33,10 @@
</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.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.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.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" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -44,14 +44,14 @@
清空
</el-button>
<br>
<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-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.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态</span>
<el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter">
<el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0">
未发放
</el-radio>
@ -154,10 +154,8 @@ export default {
hasChild: false,
hasFinish: true,
flowstatus: undefined,
searchYsjl: {
shebeizhongleidaima: '8000',
fafangState: 0
}
shebeizhongleidaima: '8000',
fafangState: 0
},
flowUserList: [],
fafangVisible: false,
@ -299,10 +297,15 @@ export default {
})
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
this.listQuery = {
shebeizhongleidaima: '8000',
printState: 0
})
printState: 0,
order: 'id', //
sort: 'desc', //
hasChild: false,
hasFinish: true,
flowstatus: undefined
}
this.getList()
},
viewBaogao(id, viewType, generateType = false) {

32
src/views/statistics/gldj.vue

@ -4,7 +4,7 @@
<el-form style="margin-top: 10px;">
<el-form-item>
<el-select
v-model="listQuery.searchYsjl.neibuleibie"
v-model="listQuery.neibuleibie"
placeholder="请选择检验类别"
style="width: 165px"
clearable
@ -13,7 +13,7 @@
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-select
v-model="listQuery.searchYsjl.shebeileibiedaima"
v-model="listQuery.shebeileibiedaima"
placeholder="请选择设备类别"
style="width: 165px"
clearable
@ -22,9 +22,9 @@
>
<el-option v-for="item in sblbList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="请输入使用单位" style="width: 165px" />
<el-input v-model="listQuery.shiyongdanwei" placeholder="请输入使用单位" style="width: 165px" />
<el-select
v-model="listQuery.searchYsjl.jianyanrenyuan"
v-model="listQuery.jianyanrenyuan"
placeholder="请选择检验人员"
style="width: 165px"
filterable
@ -33,18 +33,18 @@
<el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
<el-date-picker
v-model="listQuery.searchYsjl.jianjiankaishiriqi"
v-model="listQuery.jianjiankaishiriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="开始日期"
/>
<el-date-picker
v-model="listQuery.searchYsjl.jianjianjieshuriqi"
v-model="listQuery.jianjianjieshuriqi"
type="date"
value-format="yyyy-MM-dd"
placeholder="结束日期"
/>
<el-select v-model="listQuery.searchYsjl.quhuadaima" placeholder="请选择" style="width: 240px;" clearable @change="handleFilter">
<el-select v-model="listQuery.quhuadaima" placeholder="请选择" style="width: 240px;" clearable @change="handleFilter">
<el-option v-for="item in areas" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@ -128,9 +128,7 @@ export default {
pageRow: 20, //
order: 'shenpiriqi desc,id', //
sort: 'desc', //
searchYsjl: {
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined
},
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
},
@ -224,9 +222,13 @@ export default {
this.multipleSelection = val
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
createBy: this.$store.getters.userId
})
this.listQuery = {
order: 'shenpiriqi desc,id', //
sort: 'desc', //
createBy: this.$store.getters.departmentId === 70 ? this.$store.getters.userId : undefined,
hasChild: true,
hasFinish: true
}
this.getList()
},
getArea() { //
@ -263,8 +265,8 @@ export default {
})
},
changeSbpz() {
const sblb = this.sblbList.filter(sblb => sblb.value === this.listQuery.searchYsjl.shebeileibiedaima)[0]
this.$set(this.listQuery.searchYsjl, 'shebeipinzhongdaima', '')
const sblb = this.sblbList.filter(sblb => sblb.value === this.listQuery.shebeileibiedaima)[0]
this.$set(this.listQuery, 'shebeipinzhongdaima', '')
if (sblb) {
this.sbpzList = sblb.children
} else {

2
src/views/task/list.vue

@ -568,7 +568,7 @@ export default {
}
}
if (!this.dialogFormCopyVisible) {
this.listQueryCopy.searchYsjl.neibuleibie = this.multipleSelection[0].neibuleibie
this.listQueryCopy.neibuleibie = this.multipleSelection[0].neibuleibie
this.handleFilterCopy()
this.dialogFormCopyVisible = true
} else {

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

@ -3,8 +3,8 @@
<div class="filter-container">
<el-form>
<el-form-item>
<el-input v-model="listQuery.searchYsjl.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.jilubianhao" placeholder="记录编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.shigongdanwei" placeholder="安装单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-button size="small" type="primary" icon="el-icon-search" @click="handleFilter">
查询
</el-button>
@ -12,10 +12,10 @@
清空条件
</el-button>
<br>
<el-input v-model="listQuery.searchYsjl.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="出厂编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhizaodanwei" placeholder="制造单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.chanpinbianhao" placeholder="出厂编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<span class="radio-group-label">编辑类型</span>
<el-radio-group v-model="listQuery.searchYsjl.createBy" @change="handleFilter">
<el-radio-group v-model="listQuery.createBy" @change="handleFilter">
<el-radio :label="$store.getters.userId">
只看创建人
</el-radio>
@ -79,9 +79,7 @@ export default {
pageRow: 20, //
order: undefined, //
sort: undefined, //
searchYsjl: {
createBy: this.$store.getters.userId
},
createBy: this.$store.getters.userId,
hasChild: true,
link: 2
},
@ -106,7 +104,7 @@ export default {
},
methods: {
getList() {
this.listQuery.searchYsjl.cjState = 'bggl'
this.listQuery.cjState = 'bggl'
this.api({
url: '/ysjl/getList',
method: 'get',
@ -138,10 +136,12 @@ export default {
this.multipleSelection = val
},
clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {
bglx: 1,
createBy: this.$store.getters.userId
})
this.listQuery = {
order: undefined, //
sort: undefined, //
createBy: this.$store.getters.userId,
hasChild: true
}
this.getList()
}
}

864
src/views/ysjl/elevator/common/index.vue

File diff suppressed because it is too large

54
src/views/ysjl/elevator/yeyin/index.vue

@ -0,0 +1,54 @@
<template>
<div class="app-container">
<baseInfo />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/elevator/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
}
},
computed: {
},
created() {
},
methods: {
}
}
</script>
<style>
.el-input__inner {
border: 1px solid #00000075;
border-radius: 4px;
}
.el-textarea__inner {
border: 1px solid #91393975;
border-radius: 4px;
}
.el-form-item__error {
padding-top: 0;
position: absolute;
}
.el-input.is-disabled .el-input__inner {
color: #606266;
}
.el-textarea.is-disabled .el-textarea__inner {
color: #606266;
}
.el-dialog__body {
padding-top: 10px;
}
.myTable .el-input__inner{
padding: 0 5px;
text-align: center;
}
</style>
Loading…
Cancel
Save