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

Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

master
xiaobai 3 years ago
parent
e4ef5e08dd bd12415a01
commit
146557d2de
25 changed files with 171 additions and 234 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. 8
      .env.production
  2. 8
      .env.test
  3. 2
      .gitignore
  4. 2
      public/index.html
  5. 13
      src/api/data.js
  6. 154
      src/components/Crud/crud.js
  7. 39
      src/components/drawerDialog/index.vue
  8. 1
      src/icons/svg/termination.svg
  9. 2
      src/store/modules/user.js
  10. 4
      src/views/bggl/2000/jj/cyqp.vue
  11. 4
      src/views/document/index.vue
  12. 25
      src/views/flow/template.vue
  13. 22
      src/views/task/list.vue
  14. 17
      src/views/ysjl/1000/dj/sy/sysy.vue
  15. 24
      src/views/ysjl/1000/dj/wb/gywb.vue
  16. 6
      src/views/ysjl/2000/2200/zbg/dj/edit.vue
  17. 6
      src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
  18. 4
      src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
  19. 4
      src/views/ysjl/2000/2400/common/ycjl.vue
  20. 4
      src/views/ysjl/2000/2400/zbg/jj/edit.vue
  21. 40
      src/views/ysjl/3000/common/index.vue
  22. 2
      src/views/ysjl/7000/jj/edit.vue
  23. 8
      src/views/ysjl/components/gascylinder_db_list.vue
  24. 4
      src/views/ysjl/components/manufacture_db_list.vue
  25. 2
      vue.config.js

8
.env.production
View File

@ -1,13 +1,13 @@
# 生产环境相关配置 # 生产环境相关配置
# 微服务IP # 微服务IP
VUE_APP_SERVER_ADDRESS = '192.168.1.130' VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
# 省局数据后台IP # 省局数据后台IP
VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130' VUE_APP_SJ_BASE_IP_ADDRESS = 'test.sdma.mingansei.com'
# 微服务地址 # 微服务地址
VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100' VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
# 业务后台访问地址 # 业务后台访问地址
VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/' VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/' VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
# websocket连接地址 # websocket连接地址
VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/' VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'

8
.env.test
View File

@ -1,13 +1,13 @@
# 测试环境相关配置 # 测试环境相关配置
# 微服务IP # 微服务IP
VUE_APP_SERVER_ADDRESS = 'test.mingansei.com' VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
# 省局数据后台IP # 省局数据后台IP
VUE_APP_SJ_BASE_IP_ADDRESS = 'test.mingansei.com' VUE_APP_SJ_BASE_IP_ADDRESS = 'test.sdma.mingansei.com'
# 微服务地址 # 微服务地址
VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100' VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
# 业务后台访问地址 # 业务后台访问地址
VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/' VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/' VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
# websocket连接地址 # websocket连接地址
VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/' VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'

2
.gitignore
View File

@ -1,6 +1,6 @@
.DS_Store .DS_Store
node_modules node_modules
/jinan /sdmaFront
# local env files # local env files
.env.local .env.local

2
public/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>JNFront</title> <title>SdmaFront</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

13
src/api/data.js
View File

@ -1,15 +1,10 @@
import api from '@/utils/api' import api from '@/utils/api'
import qs from 'qs' import qs from 'qs'
import preview from '@/utils/preview'
export function initData(url, params) { export function initData(apiRequest, url, params) {
return api({ const request = apiRequest || api
return request({
url: url + '?' + qs.stringify(params, { indices: false }), url: url + '?' + qs.stringify(params, { indices: false }),
method: 'get' method: 'get'
}) })
} }
export function initData1(url, params) {
return preview({
url: url + '?' + qs.stringify(params, { indices: false }),
method: 'get'
})
}

154
src/components/Crud/crud.js
View File

@ -1,4 +1,4 @@
import { initData, initData1 } from '@/api/data' import { initData } from '@/api/data'
import Vue from 'vue' import Vue from 'vue'
/** /**
@ -10,8 +10,10 @@ function CRUD(options) {
const defaultOptions = { const defaultOptions = {
// 标题 // 标题
title: '', title: '',
// 接口根路由 /**
rootApi: 0, * 请求接口工具
*/
api: undefined,
// 请求数据的url // 请求数据的url
url: '', url: '',
// 表格数据 // 表格数据
@ -92,8 +94,8 @@ function CRUD(options) {
} }
const methods = { const methods = {
/** /**
* 通用的提示 * 通用的提示
*/ */
submitSuccessNotify() { submitSuccessNotify() {
crud.notify(crud.msg.submit, CRUD.NOTIFICATION_TYPE.SUCCESS) crud.notify(crud.msg.submit, CRUD.NOTIFICATION_TYPE.SUCCESS)
}, },
@ -118,42 +120,22 @@ function CRUD(options) {
} }
return new Promise((resolve) => { return new Promise((resolve) => {
// 请求数据 // 请求数据
if (crud.rootApi) { initData(crud.api, crud.url, crud.getQueryParams()).then(data => {
initData1(crud.url, crud.getQueryParams()).then(data => { crud.page.total = data.total
crud.page.total = data.total if (data.list) {
if (data.list) { crud.data = data.list
crud.data = data.list } else {
} else { crud.data = data
crud.data = data }
} crud.resetDataStatus()
crud.resetDataStatus() callVmHook(crud, CRUD.HOOK.afterRefresh)
// time 毫秒后显示表格 resolve(data)
setTimeout(() => { })
callVmHook(crud, CRUD.HOOK.afterRefresh)
}, crud.time)
resolve(data)
})
} else {
initData(crud.url, crud.getQueryParams()).then(data => {
crud.page.total = data.total
if (data.list) {
crud.data = data.list
} else {
crud.data = data
}
crud.resetDataStatus()
// time 毫秒后显示表格
setTimeout(() => {
callVmHook(crud, CRUD.HOOK.afterRefresh)
}, crud.time)
resolve(data)
})
}
}) })
}, },
/** /**
* 启动添加 * 启动添加
*/ */
toAdd() { toAdd() {
if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
return return
@ -163,9 +145,9 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
}, },
/** /**
* 启动编辑 * 启动编辑
* @param {*} data 数据项 * @param {*} data 数据项
*/ */
toEdit(data) { toEdit(data) {
crud.resetForm(JSON.parse(JSON.stringify(data))) crud.resetForm(JSON.parse(JSON.stringify(data)))
if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
@ -177,16 +159,16 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
}, },
/** /**
* 启动删除 * 启动删除
* @param {*} data 数据项 * @param {*} data 数据项
*/ */
toDelete(data) { toDelete(data) {
crud.getDataStatus(data.id).delete = CRUD.STATUS.PREPARED crud.getDataStatus(data.id).delete = CRUD.STATUS.PREPARED
}, },
/** /**
* 取消删除 * 取消删除
* @param {*} data 数据项 * @param {*} data 数据项
*/ */
cancelDelete(data) { cancelDelete(data) {
if (!callVmHook(crud, CRUD.HOOK.beforeDeleteCancel, data)) { if (!callVmHook(crud, CRUD.HOOK.beforeDeleteCancel, data)) {
return return
@ -195,8 +177,8 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterDeleteCancel, data) callVmHook(crud, CRUD.HOOK.afterDeleteCancel, data)
}, },
/** /**
* 取消新增/编辑 * 取消新增/编辑
*/ */
cancelCU() { cancelCU() {
const addStatus = crud.status.add const addStatus = crud.status.add
const editStatus = crud.status.edit const editStatus = crud.status.edit
@ -226,8 +208,8 @@ function CRUD(options) {
} }
}, },
/** /**
* 提交新增/编辑 * 提交新增/编辑
*/ */
submitCU() { submitCU() {
if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
return return
@ -247,8 +229,8 @@ function CRUD(options) {
}) })
}, },
/** /**
* 执行添加 * 执行添加
*/ */
doAdd() { doAdd() {
if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
return return
@ -266,16 +248,13 @@ function CRUD(options) {
}) })
}, },
/** /**
* 执行编辑 * 执行编辑
*/ */
doEdit() { doEdit() {
console.log(581222)
if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) { if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
return return
} }
console.log(crud.crudMethod, crud.form)
crud.status.edit = CRUD.STATUS.PROCESSING crud.status.edit = CRUD.STATUS.PROCESSING
crud.crudMethod.edit(crud.form).then(() => { crud.crudMethod.edit(crud.form).then(() => {
crud.status.edit = CRUD.STATUS.NORMAL crud.status.edit = CRUD.STATUS.NORMAL
crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
@ -289,9 +268,9 @@ function CRUD(options) {
}) })
}, },
/** /**
* 执行删除 * 执行删除
* @param {*} data 数据项 * @param {*} data 数据项
*/ */
doDelete(data) { doDelete(data) {
let delAll = false let delAll = false
let dataStatus let dataStatus
@ -327,8 +306,8 @@ function CRUD(options) {
}) })
}, },
/** /**
* 获取查询参数 * 获取查询参数
*/ */
getQueryParams: function() { getQueryParams: function() {
return { return {
pageNum: crud.page.pageNum, pageNum: crud.page.pageNum,
@ -365,9 +344,9 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterRowClick, row) callVmHook(crud, CRUD.HOOK.afterRowClick, row)
}, },
/** /**
* 重置查询参数 * 重置查询参数
* @param {Boolean} toQuery 重置后进行查询操作 * @param {Boolean} toQuery 重置后进行查询操作
*/ */
resetQuery(toQuery = true) { resetQuery(toQuery = true) {
const defaultQuery = JSON.parse(JSON.stringify(crud.defaultQuery)) const defaultQuery = JSON.parse(JSON.stringify(crud.defaultQuery))
const query = crud.query const query = crud.query
@ -380,9 +359,9 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterResetQuery) callVmHook(crud, CRUD.HOOK.afterResetQuery)
}, },
/** /**
* 重置表单 * 重置表单
* @param {Array} data 数据 * @param {Array} data 数据
*/ */
resetForm(data) { resetForm(data) {
const form = data || (typeof crud.defaultForm === 'object' ? JSON.parse(JSON.stringify(crud.defaultForm)) : crud.defaultForm()) const form = data || (typeof crud.defaultForm === 'object' ? JSON.parse(JSON.stringify(crud.defaultForm)) : crud.defaultForm())
const crudFrom = crud.form const crudFrom = crud.form
@ -397,11 +376,10 @@ function CRUD(options) {
} }
}, },
/** /**
* 重置数据状态 * 重置数据状态
*/ */
resetDataStatus() { resetDataStatus() {
const dataStatus = {} const dataStatus = {}
function resetStatus(datas) { function resetStatus(datas) {
datas.forEach(e => { datas.forEach(e => {
dataStatus[e.id] = { dataStatus[e.id] = {
@ -417,17 +395,17 @@ function CRUD(options) {
crud.dataStatus = dataStatus crud.dataStatus = dataStatus
}, },
/** /**
* 获取数据状态 * 获取数据状态
* @param {Number | String} id 数据项id * @param {Number | String} id 数据项id
*/ */
getDataStatus(id) { getDataStatus(id) {
return crud.dataStatus[id] return crud.dataStatus[id]
}, },
/** /**
* 切换选中状态 * 切换选中状态
* @param selection * @param selection
* @param data * @param data
*/ */
toggleRowSelection(selection, data) { toggleRowSelection(selection, data) {
if (data.children) { if (data.children) {
data.children.forEach(val => { data.children.forEach(val => {
@ -463,11 +441,11 @@ function CRUD(options) {
// 预留4位存储：组件 主页、头部、分页、表单，调试查看也方便找 // 预留4位存储：组件 主页、头部、分页、表单，调试查看也方便找
vms: Array(4), vms: Array(4),
/** /**
* 注册组件实例 * 注册组件实例
* @param {String} type 类型 * @param {String} type 类型
* @param {*} vm 组件实例 * @param {*} vm 组件实例
* @param {Number} index 该参数内部使用 * @param {Number} index 该参数内部使用
*/ */
registerVM(type, vm, index = -1) { registerVM(type, vm, index = -1) {
const vmObj = { const vmObj = {
type, type,
@ -481,9 +459,9 @@ function CRUD(options) {
this.vms.splice(index, 1, vmObj) this.vms.splice(index, 1, vmObj)
}, },
/** /**
* 取消注册组件实例 * 取消注册组件实例
* @param {*} vm 组件实例 * @param {*} vm 组件实例
*/ */
unregisterVM(vm) { unregisterVM(vm) {
this.vms.splice(this.vms.findIndex(e => e && e.vm === vm), 1) this.vms.splice(this.vms.findIndex(e => e && e.vm === vm), 1)
} }
@ -759,4 +737,4 @@ export {
form, form,
pagination, pagination,
crud crud
} }

39
src/components/drawerDialog/index.vue
View File

@ -151,10 +151,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" style="width:400px" /> <el-input v-model="formTemplate.tempPath" clearable 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" style="width:400px" /> <el-input v-model="formTemplate.jianyanyiju" clearable 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
@ -188,12 +188,8 @@
</el-form-item> </el-form-item>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col> <el-col>
<el-form-item label="版本号" prop="version" required> <el-form-item label="版本号(上线日期)" label-width="120px" prop="version">
<el-input <el-date-picker v-model="formTemplate.version" type="date" value-format="yyyy-MM-dd" />
v-model="formTemplate.version"
type="text"
style="width: 200px"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -541,7 +537,7 @@
</el-radio> </el-radio>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="达到表格限定高度，将最后一行移除，在下一页继续写入" placement="top-start"> <el-tooltip class="item" effect="dark" content="达到表格限定高度，将最后一行移除，在下一页继续写入" placement="top-start">
<el-radio :label="1"> <el-radio :label="1" :disabled="form.writeMode === 2">
表格高度限制 表格高度限制
</el-radio> </el-radio>
</el-tooltip> </el-tooltip>
@ -643,7 +639,7 @@
label-width="150px" label-width="150px"
> >
<el-radio-group v-model="form.affiliatedAddMode"> <el-radio-group v-model="form.affiliatedAddMode">
<el-radio v-for="(item, affiliatedAddModeIndex) in affiliatedAddModes" :key="affiliatedAddModeIndex" :label="affiliatedAddModeIndex"> <el-radio v-for="(item, affiliatedAddModeIndex) in affiliatedAddModes" :key="affiliatedAddModeIndex" :label="affiliatedAddModeIndex" :disabled="affiliatedAddModeIndex !== 0 && form.writeMode === 2">
{{ item }} {{ item }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
@ -765,7 +761,7 @@ export default {
templateSettingId: '' // 配置id templateSettingId: '' // 配置id
}, },
form: { form: {
templateId: '', templateId: undefined,
writeMode: 0, writeMode: 0,
tableIndex: 1, tableIndex: 1,
tableMode: 0, tableMode: 0,
@ -886,11 +882,30 @@ export default {
getJylbList() { getJylbList() {
this.getNeibuList('jylb', null, null) this.getNeibuList('jylb', null, null)
}, },
initTemplateSettingForm() {
this.form = {
templateId: this.id,
writeMode: 0,
tableIndex: 1,
tableMode: 0,
tableRowFindMode: 0,
tableStartRow: 0,
tableRowCount: 0,
affiliatedTableStartRow: 0,
affiliatedTableRowCount: 0,
sort: 1,
tableType: 0,
isChild: false,
jyxmMode: 0,
affiliatedAddMode: 0
}
},
addTemFn() { addTemFn() {
this.initTemplateSettingForm()
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
editFnTem(row) { editFnTem(row) {
this.form = row this.form = this.common.deepCopy(row)
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
addtemFn() { addtemFn() {

1
src/icons/svg/termination.svg
View File

@ -0,0 +1 @@
<svg t="1629288862231" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11331" width="200" height="200"><path d="M151.379964 874.277018A511.17222 511.17222 0 0 1 861.398178 138.891882l12.907099 12.459823A511.17222 511.17222 0 1 1 151.379964 874.277018z m90.34969-632.575623a380.503822 380.503822 0 0 0-106.068236 206.385784h754.362405a380.503822 380.503822 0 0 0-93.48062-193.159203l-12.587616-13.226581a383.379165 383.379165 0 0 0-530.532868-11.181893l-11.693065 11.181893z m648.294169 335.840149H135.661418a380.503822 380.503822 0 0 0 93.48062 193.159202l12.587616 13.226582a383.379165 383.379165 0 0 0 530.532868 11.181892l11.629168-11.181892a380.503822 380.503822 0 0 0 106.068236-206.385784z" fill="#ffffff" opacity=".8" p-id="11332"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 796 B

2
src/store/modules/user.js
View File

@ -22,7 +22,7 @@ const user = {
allUser: [], allUser: [],
allCategory: [], allCategory: [],
messageCount: [], messageCount: [],
prodName: process.env.NODE_ENV === 'test' ? '/jinan' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist) prodName: process.env.NODE_ENV === 'test' ? '/sdmaFront' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
}, },
mutations: { mutations: {
SET_USER: (state, userInfo) => { SET_USER: (state, userInfo) => {

4
src/views/bggl/2000/jj/cyqp.vue
View File

@ -379,13 +379,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }

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

@ -87,13 +87,15 @@ import CrudDocumentArchives from '@/api/document_archives'
import { uploadFileFn, updateInspectionSystemFile } from '@/api/common' import { uploadFileFn, updateInspectionSystemFile } from '@/api/common'
import { downloadFileUrl } from '@/utils' import { downloadFileUrl } from '@/utils'
import download from 'downloadjs' import download from 'downloadjs'
import preview from '@/utils/preview'
// crud交由presenter持有 // crud交由presenter持有
const defaultCrud = presenter( const defaultCrud = presenter(
CRUD({ CRUD({
title: '检验机构体系文件管理', title: '检验机构体系文件管理',
url: '/inspectionSystemFile/list', url: '/inspectionSystemFile/list',
orderBy: ['id desc'], orderBy: ['id desc'],
rootApi: 1, api: preview,
crudMethod: { ...CrudDocumentArchives } crudMethod: { ...CrudDocumentArchives }
}) })
) )

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

@ -63,6 +63,19 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select
v-model="listQuery.tempCategory"
placeholder="模板类型"
style="width: 200px"
clearable
>
<el-option
v-for="item in categoryList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-button type="primary" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -274,14 +287,18 @@ export default {
{ {
value: 'YSJL', value: 'YSJL',
label: '原始记录' label: '原始记录'
}, }, {
{
value: 'JYBG', value: 'JYBG',
label: '检验报告' label: '检验报告'
}, }, {
{
value: 'OTHER', value: 'OTHER',
label: '其他' label: '其他'
}, {
value: 'HZD',
label: '回执单'
}, {
value: 'RWD',
label: '任务单'
} }
], ],
formTemplate: {}, formTemplate: {},

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

@ -21,8 +21,8 @@
<el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu"> <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
任务完成 任务完成
</el-button> </el-button>
<el-button type="info" icon="el-icon-minus" @click="terminationFn"> <el-button type="danger" @click="terminationFn">
终止任务 <svg-icon icon-class="termination" /> 终止任务
</el-button> </el-button>
</div> </div>
</sticky> </sticky>
@ -37,7 +37,6 @@
<el-input v-model="listQuery.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.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.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.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>
@ -109,14 +108,6 @@
<el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable /> <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
<el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" /> <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" /> <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
<el-table-column v-if="$store.getters.departmentId === 70 || hasRole('ADMIN')" align="center" label="操作" prop="acces" width="110" fixed="right">
<template slot-scope="scope">
<template v-if="scope.row.shebeizhongleidaima === '2000'">
<el-button title="预览 原始资料" circle size="medium" type="info" icon="el-icon-view" style="float: left" @click="common.viewRawRecords(scope.row.id)" />
<slice-upload :renwu-id="scope.row.id" />
</template>
</template>
</el-table-column>
</template> </template>
</el-table> </el-table>
<pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" /> <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
@ -218,25 +209,20 @@
</el-table> </el-table>
<pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" /> <pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
</el-dialog> </el-dialog>
<el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogEnclosureVisible">
<enclosure :relation-id.sync="currentRenwuId" :if-liaison="false" :view-button="false" :is-show-hetong="isSysUser" />
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import Sticky from '@/components/Sticky' import Sticky from '@/components/Sticky'
import SliceUpload from '@/components/SliceUpload'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
import Utils from '../../utils/contact.js' import Utils from '../../utils/contact.js'
import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu' import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
import { cancelRenwuFn } from '@/api/common' import { cancelRenwuFn } from '@/api/common'
import Enclosure from '@/views/common/Enclosure'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'MyTask', name: 'MyTask',
components: { Sticky, Pagination, SliceUpload, Enclosure }, components: { Sticky, Pagination },
filters: { filters: {
screen(value) { screen(value) {
console.log(value, 254444) console.log(value, 254444)

17
src/views/ysjl/1000/dj/sy/sysy.vue
View File

@ -374,7 +374,6 @@ export default {
}) })
}, },
initYsjl() { initYsjl() {
const tempTime = new Date()
this.api({ this.api({
url: '/ysjl/initYsjl', url: '/ysjl/initYsjl',
method: 'post', method: 'post',
@ -392,7 +391,7 @@ export default {
this.param = (data.param !== null && data.param !== undefined) ? data.param : {} this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
this.ysjl.jilubianhao = this.jilubianhao this.ysjl.jilubianhao = this.jilubianhao
this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误 this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误
this.ysjl.bianzhiriqi = tempTime.getFullYear() + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate() this.ysjl.bianzhiriqi = this.formatter.dateFormat('YYYY-MM-dd')
this.ysjl.jianyanjielun = '合格' this.ysjl.jianyanjielun = '合格'
this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
this.ysjl.beizhu = '/' this.ysjl.beizhu = '/'
@ -407,13 +406,13 @@ export default {
}, },
getYsjl(id) { getYsjl(id) {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: id ysjlId: id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }
@ -518,7 +517,7 @@ export default {
let type = '' let type = ''
this.ysjl.bglx = 1 this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl' this.ysjl.cjState = 'ysjl'
this.ysjl.zfState = '0' this.ysjl.zfState = 0
this.ysjl.jianyanxiangmu = 'sysy' this.ysjl.jianyanxiangmu = 'sysy'
this.ysjl.jlprintState = 0 this.ysjl.jlprintState = 0
if (operation === 'add') { if (operation === 'add') {
@ -556,8 +555,10 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
jyxm: jyxm, cyJyxm: {
bgjyxm: jyxm, jyxm: jyxm,
bgjyxm: jyxm
},
flag: operation flag: operation
} }
}).then(data => { }).then(data => {
@ -567,8 +568,6 @@ export default {
this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' }) this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
this.ysjl.id = data this.ysjl.id = data
this.param.ysjlId = data this.param.ysjlId = data
// 修改16版任务状态
this.common.updStateByNew(this.ysjl.renwuId, '2', false)
// 刷新路由网址 // 刷新路由网址
this.$store.dispatch('delCurrentViews', { this.$store.dispatch('delCurrentViews', {
view: this.$route, view: this.$route,

24
src/views/ysjl/1000/dj/wb/gywb.vue
View File

@ -467,13 +467,13 @@ export default {
}, },
getYsjl(id) { getYsjl(id) {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: id ysjlId: id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }
@ -545,15 +545,7 @@ export default {
}) })
}) })
} else { } else {
data.forEach(row => { this.sybjSData = data
this.sybjSData.push({
id: row.id,
jianyanxiang: row.jianyanxiang,
jianyanmu: row.jianyanmu,
jianyanneirong: row.jianyanneirong,
D1: row.d1
})
})
} }
this.tableJs.getData(this.cols, this.rows, this.sybjSData) this.tableJs.getData(this.cols, this.rows, this.sybjSData)
}) })
@ -584,7 +576,7 @@ export default {
let type = '' let type = ''
this.ysjl.bglx = 1 this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl' this.ysjl.cjState = 'ysjl'
this.ysjl.zfState = '0' this.ysjl.zfState = 0
this.ysjl.jianyanxiangmu = 'gywb' this.ysjl.jianyanxiangmu = 'gywb'
this.ysjl.jlprintState = 0 this.ysjl.jlprintState = 0
if (this.ysjl.jianyanjielun === '不符合要求') { if (this.ysjl.jianyanjielun === '不符合要求') {
@ -625,8 +617,10 @@ export default {
data: { data: {
ysjl: this.ysjl, ysjl: this.ysjl,
param: this.param, param: this.param,
jyxm: jyxm, cyJyxm: {
bgjyxm: jyxm, jyxm: jyxm,
bgjyxm: jyxm
},
flag: operation flag: operation
} }
}).then(data => { }).then(data => {
@ -636,8 +630,6 @@ export default {
this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' }) this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
this.ysjl.id = data this.ysjl.id = data
this.param.ysjlId = data this.param.ysjlId = data
// 修改16版任务状态
this.common.updStateByNew(this.ysjl.renwuId, '2', false)
// 刷新路由网址 // 刷新路由网址
this.$store.dispatch('delCurrentViews', { this.$store.dispatch('delCurrentViews', {
view: this.$route, view: this.$route,

6
src/views/ysjl/2000/2200/zbg/dj/edit.vue
View File

@ -948,13 +948,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }
@ -1103,7 +1103,7 @@ export default {
let type = '' let type = ''
this.ysjl.bglx = 1 this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl' this.ysjl.cjState = 'ysjl'
this.ysjl.zfState = '0' this.ysjl.zfState = 0
this.ysjl.jianyanxiangmu = this.jyxm this.ysjl.jianyanxiangmu = this.jyxm
this.ysjl.jlprintState = 0 this.ysjl.jlprintState = 0
this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH

6
src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
View File

@ -408,13 +408,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }
@ -549,7 +549,7 @@ export default {
let type = '' let type = ''
this.ysjl.bglx = 1 this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl' this.ysjl.cjState = 'ysjl'
this.ysjl.zfState = '0' this.ysjl.zfState = 0
this.ysjl.jianyanxiangmu = this.jyxm this.ysjl.jianyanxiangmu = this.jyxm
this.ysjl.jlprintState = 0 this.ysjl.jlprintState = 0
this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH

4
src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
View File

@ -344,13 +344,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }

4
src/views/ysjl/2000/2400/common/ycjl.vue
View File

@ -720,13 +720,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }

4
src/views/ysjl/2000/2400/zbg/jj/edit.vue
View File

@ -599,13 +599,13 @@ export default {
}, },
getYsjl() { getYsjl() {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: this.$route.query.id ysjlId: this.$route.query.id
} }
}).then(data => { }).then(data => {
this.ysjl = data.ysjl this.ysjl = data
if (this.ysjl.jianyanrenyuan) { if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
} }

40
src/views/ysjl/3000/common/index.vue
View File

@ -22,7 +22,6 @@
更新 更新
</el-button> </el-button>
<el-button <el-button
v-if="isSysUser"
type="success" type="success"
icon="el-icon-upload2" icon="el-icon-upload2"
size="medium" size="medium"
@ -39,44 +38,6 @@
预览 预览
</el-button> </el-button>
</template> </template>
<template v-if="isSysUser">
<el-button type="primary" size="medium" @click="Signjyxm">
<svg-icon icon-class="sign" />
检验项目批量签名
</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="medium"
@click="signClear"
>
批量清除签名
</el-button>
<el-button
type="success"
size="medium"
icon="el-icon-edit"
@click="batchUpdDate"
>
批量修改日期
</el-button>
<el-button
type="primary"
size="medium"
icon="el-icon-info"
@click="showDialogRoleVisible"
>
编辑权限
</el-button>
</template>
<el-button
type="info"
size="medium"
icon="el-icon-info"
@click="dialogEnclosureVisible = true"
>
相关鉴证
</el-button>
</div> </div>
</sticky> </sticky>
<el-tabs v-model="checkedTab" type="card"> <el-tabs v-model="checkedTab" type="card">
@ -816,7 +777,6 @@ export default {
renlingren: [], renlingren: [],
xinghaoList: [], xinghaoList: [],
dicGzjz: [], dicGzjz: [],
isSysUser: this.$store.getters.clientType === 'System',
cols: [ cols: [
{ {
name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致 name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致

2
src/views/ysjl/7000/jj/edit.vue
View File

@ -535,7 +535,7 @@ export default {
let type = '' let type = ''
this.ysjl.bglx = 1 this.ysjl.bglx = 1
this.ysjl.cjState = 'ysjl' this.ysjl.cjState = 'ysjl'
this.ysjl.zfState = '0' this.ysjl.zfState = 0
this.ysjl.jlprintState = 0 this.ysjl.jlprintState = 0
if (operation === 'add') { if (operation === 'add') {
type = 'post' type = 'post'

8
src/views/ysjl/components/gascylinder_db_list.vue
View File

@ -248,14 +248,6 @@ export default {
ids: ids ids: ids
} }
}).then(() => { }).then(() => {
// 锅炉根据16版renwuId修改16版和18版任务状态
if (oldRwIds !== '') {
this.common.updStateByOld(oldRwIds, '0', false)
}
// 根据18版任务主键修改16版任务状态
if (newRwIds !== '') {
this.common.updStateByNew(newRwIds, '0', false)
}
this.$message({ this.$message({
message: '删除成功', message: '删除成功',
type: 'success', type: 'success',

4
src/views/ysjl/components/manufacture_db_list.vue
View File

@ -685,13 +685,13 @@ export default {
}, },
async showDataComparison(row) { async showDataComparison(row) {
this.api({ this.api({
url: '/ysjl/getYsjlById', url: '/ysjl',
method: 'get', method: 'get',
params: { params: {
ysjlId: row.id ysjlId: row.id
} }
}).then(async data => { }).then(async data => {
this.selection = data.ysjl this.selection = data
await this.getParamByYsjlId(this.selection.id, this.selection.shebeizhongleidaima) await this.getParamByYsjlId(this.selection.id, this.selection.shebeizhongleidaima)
this.api({ this.api({
url: '/renwu/get', url: '/renwu/get',

2
vue.config.js
View File

@ -10,7 +10,7 @@ const name = pkg.name || 'sdma-front' // page title
const port = process.env.NODE_ENV === 'development' ? 9527 : 8090 const port = process.env.NODE_ENV === 'development' ? 9527 : 8090
console.log(process.env.NODE_ENV === 'development') console.log(process.env.NODE_ENV === 'development')
module.exports = { module.exports = {
publicPath: './', publicPath: process.env.NODE_ENV === 'test' ? '/sdmaFront' : './',
outputDir: 'sdmaFront', outputDir: 'sdmaFront',
assetsDir: 'static', assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false, lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false,

Write Preview
Loading…
Cancel
Save