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

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

master
xiaobai 3 years ago
parent
59dc399361
commit
008a9f9c3f
20 changed files with 1062 additions and 444 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

18
src/views/assign/missionList.vue
View File

@ -26,13 +26,13 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <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-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
<el-input v-model="listQuery.searchOwnRw.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.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.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.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.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @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>
@ -196,8 +196,7 @@ export default {
modelList: [], modelList: [],
listQuery: { listQuery: {
pageNum: 1, // 页码 pageNum: 1, // 页码
pageRow: 20, // 每页条数 pageRow: 20 // 每页条数
searchOwnRw: {}
}, },
listQueryCopy: { listQueryCopy: {
pageNum: 1, // 页码 pageNum: 1, // 页码
@ -569,7 +568,10 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchOwnRw', {}) this.listQuery = {
pageNum: 1, // 页码
pageRow: 20
}
this.getList() this.getList()
}, },
clearCopyQuery() { clearCopyQuery() {

18
src/views/audit/list.vue
View File

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

50
src/views/bggl/banjie_list.vue
View File

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

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

@ -23,17 +23,17 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="报告编号:" prop="baogaobianhao"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="使用单位:" prop="shiyongdanwei"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="设备种类:" prop="shebeizhonglei"> <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-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -42,17 +42,17 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="注册代码:" prop="zhucedaima"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品编号:" prop="chanpinbianhao"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="设备品种:" prop="shebeipinzhongdaima"> <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-option v-for="item in sbpzs" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -199,61 +199,61 @@
<el-container> <el-container>
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;"> <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-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备种类:" style="width: 240px;"> <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-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="当前环节:" style="width: 240px;"> <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-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审核人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审批人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验日期:" style="width: 240px;"> <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>
<el-form-item label="审核日期:" style="width: 240px;"> <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>
<el-form-item label="审批日期:" style="width: 240px;"> <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>
<el-form-item label="设备/产品名称:" style="width: 290px;"> <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>
<el-form-item label="内部编号:" style="width: 240px;"> <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>
<el-form-item label="下次检验日期:" style="width: 280px;"> <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>
<el-form-item label="制造单位:" style="width: 400px;"> <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>
<el-form-item label="产品/出厂编号:" style="width: 290px;"> <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>
<el-form-item label="使用登记证编号:" style="width: 320px;"> <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-item>
</el-form> </el-form>
</el-container> </el-container>
@ -352,9 +352,7 @@ export default {
pageRow: 20, // 每页条数 pageRow: 20, // 每页条数
order: 'update_time', // 排序字段 order: 'update_time', // 排序字段
sort: 'asc', // 排序方式 sort: 'asc', // 排序方式
searchYsjl: { flowStatus: 1,
flowStatus: 1
},
hasChild: true, hasChild: true,
hasFinish: false hasFinish: false
}, },
@ -982,7 +980,13 @@ export default {
this.dialogQueryVisible = true this.dialogQueryVisible = true
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {}) this.listQuery = {
order: 'update_time', // 排序字段
sort: 'asc', // 排序方式
flowStatus: 1,
hasChild: true,
hasFinish: false
}
this.getList() this.getList()
}, },
clearCopyQuery() { clearCopyQuery() {

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

@ -25,10 +25,10 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.bglx" placeholder="报告类型" style="width: 160px"> <el-select v-model="listQuery.bglx" placeholder="报告类型" style="width: 160px">
<el-option <el-option
v-for="item in bglxOptions" v-for="item in bglxOptions"
:key="item.value" :key="item.value"
@ -37,7 +37,7 @@
/> />
</el-select><br> </el-select><br>
<span class="radio-group-label">当前环节：</span> <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 :label="undefined">
全部 全部
</el-radio> </el-radio>
@ -192,61 +192,61 @@
<el-container> <el-container>
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="检验类别:" style="width: 240px;"> <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-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备种类:" style="width: 240px;"> <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-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="当前环节:" style="width: 240px;"> <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-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审核人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审批人员:" style="width: 240px;"> <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-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验日期:" style="width: 240px;"> <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>
<el-form-item label="审核日期:" style="width: 240px;"> <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>
<el-form-item label="审批日期:" style="width: 240px;"> <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>
<el-form-item label="设备/产品名称:" style="width: 290px;"> <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>
<el-form-item label="内部编号:" style="width: 240px;"> <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>
<el-form-item label="下次检验日期:" style="width: 280px;"> <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>
<el-form-item label="制造单位:" style="width: 400px;"> <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>
<el-form-item label="产品/出厂编号:" style="width: 290px;"> <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>
<el-form-item label="使用登记证编号:" style="width: 320px;"> <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-item>
</el-form> </el-form>
</el-container> </el-container>
@ -420,7 +420,6 @@ export default {
pageRow: 20, // 每页条数 pageRow: 20, // 每页条数
order: 'update_time', // 排序字段 order: 'update_time', // 排序字段
sort: 'asc', // 排序方式 sort: 'asc', // 排序方式
searchYsjl: {},
hasChild: true, hasChild: true,
hasFinish: false hasFinish: false
}, },
@ -1181,13 +1180,19 @@ export default {
this.dialogQueryVisible = true this.dialogQueryVisible = true
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', {}) this.listQuery = {
order: 'update_time', // 排序字段
sort: 'asc', // 排序方式
hasChild: true,
hasFinish: false
}
this.getList() this.getList()
}, },
clearCopyQuery() { clearCopyQuery() {
this.$set(this.listQueryCopy, 'searchYsjl', { this.$set(this.listQueryCopy, 'searchYsjl', {
bglx: 1 bglx: 1
}) })
this.handleFilterCopy() this.handleFilterCopy()
}, },
closeDialog() { closeDialog() {

18
src/views/bggl/daishen_list.vue
View File

@ -21,12 +21,12 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="报告编号:" prop="baogaobianhao"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="使用单位:" prop="shiyongdanwei"> <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-form-item>
</el-col> </el-col>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
@ -178,9 +178,7 @@ export default {
pageRow: 20, // 每页条数 pageRow: 20, // 每页条数
order: 'update_time', // 排序字段 order: 'update_time', // 排序字段
sort: 'asc', // 排序方式 sort: 'asc', // 排序方式
searchYsjl: { hasTrial: true,
hasTrial: true
},
hasChild: true, hasChild: true,
hasFinish: false hasFinish: false
}, },
@ -673,7 +671,15 @@ export default {
} }
}, },
clearQuery() { 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() this.getList()
}, },
closeDialog() { closeDialog() {

57
src/views/bggl/eliminatingred_list.vue
View File

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

35
src/views/bggl/sign_list.vue
View File

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

27
src/views/bggl/yiban_list.vue
View File

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

38
src/views/document/index.vue
View File

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

7
src/views/flow/template.vue
View File

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

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

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

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

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

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

@ -33,10 +33,10 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchYsjl.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="（全部）报检单编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 350px" @keyup.enter.native="handleFilter" />
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -44,14 +44,14 @@
清空 清空
</el-button> </el-button>
<br> <br>
<el-input v-model="listQuery.searchYsjl.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="请输入使用登记证编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.searchYsjl.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.chanpinbianhao" placeholder="请输入产品编号" clearable style="width: 185px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchYsjl.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" placeholder="请选择检验类别" style="width: 165px" filterable clearable @change="handleFilter">
<el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" /> <el-option v-for="item in jylbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchYsjl.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" /> <el-date-picker v-model="listQuery.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" placeholder="请选择下次检验日期" style="width:145px" />
<span class="radio-group-label">发放状态：</span> <span class="radio-group-label">发放状态：</span>
<el-radio-group v-model="listQuery.searchYsjl.fafangState" @change="handleFilter"> <el-radio-group v-model="listQuery.fafangState" @change="handleFilter">
<el-radio :label="0"> <el-radio :label="0">
未发放 未发放
</el-radio> </el-radio>
@ -154,10 +154,8 @@ export default {
hasChild: false, hasChild: false,
hasFinish: true, hasFinish: true,
flowstatus: undefined, flowstatus: undefined,
searchYsjl: { shebeizhongleidaima: '8000',
shebeizhongleidaima: '8000', fafangState: 0
fafangState: 0
}
}, },
flowUserList: [], flowUserList: [],
fafangVisible: false, fafangVisible: false,
@ -299,10 +297,15 @@ export default {
}) })
}, },
clearQuery() { clearQuery() {
this.$set(this.listQuery, 'searchYsjl', { this.listQuery = {
shebeizhongleidaima: '8000', shebeizhongleidaima: '8000',
printState: 0 printState: 0,
}) order: 'id', // 排序字段
sort: 'desc', // 排序方式
hasChild: false,
hasFinish: true,
flowstatus: undefined
}
this.getList() this.getList()
}, },
viewBaogao(id, viewType, generateType = false) { viewBaogao(id, viewType, generateType = false) {

32
src/views/statistics/gldj.vue
View File

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

2
src/views/task/list.vue
View File

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

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

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

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

File diff suppressed because it is too large

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

@ -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>
Write Preview
Loading…
Cancel
Save