FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-08-04 10:44:48 +08:00
parent 9ab466cf5d bc76c4ceef
commit b05da56ebc
12 changed files with 733 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -4
View File
@@ -1305,6 +1305,7 @@ export default {
if (cur[i].pId == null || cur[i].pId === '') { if (cur[i].pId == null || cur[i].pId === '') {
this.parentNode = cur[i] this.parentNode = cur[i]
} }
console.log(str);
this.zNodes = str this.zNodes = str
} }
// 查完左侧目录后，如果没有选中的，设置最外层选中 // 查完左侧目录后，如果没有选中的，设置最外层选中
@@ -1450,7 +1451,6 @@ export default {
loading: 'loading' loading: 'loading'
}, },
res => { res => {
console.log(res)
if (res.ok) { if (res.ok) {
this.$copyText(this.copyMessage).then((e) => { this.$copyText(this.copyMessage).then((e) => {
}) })
@@ -1657,7 +1657,6 @@ export default {
let regSt = /<table/g let regSt = /<table/g
let countSt = newContent.match(regSt) let countSt = newContent.match(regSt)
let countEd = newContent.match(regEd) let countEd = newContent.match(regEd)
console.log(countSt)
if (countSt === null) { if (countSt === null) {
this.$message.warning('内容必须包含一个表格') this.$message.warning('内容必须包含一个表格')
} else if (countSt.length > 1 && countEd.length > 1) { } else if (countSt.length > 1 && countEd.length > 1) {
@@ -2115,7 +2114,6 @@ export default {
this.standItemEO.ZRBM = this.standItemEO.responsibleUnit this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
this.saveItemId = row.id this.saveItemId = row.id
this.showUpdateItemInfo() this.showUpdateItemInfo()
console.log(this.standItemEO)
}, },
getOrgTreeSource () { getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this}, this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -2148,7 +2146,6 @@ export default {
attribute (row) { attribute (row) {
this.getFileName(row) this.getFileName(row)
this.showItemInfoEO = JSON.parse(JSON.stringify(row)) this.showItemInfoEO = JSON.parse(JSON.stringify(row))
console.log(this.showItemInfoEO)
}, },
getDicTypeName(opt, type) { getDicTypeName(opt, type) {
const _type = type ? type.split(',') : [] const _type = type ? type.split(',') : []
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+3 -2
View File
@@ -376,7 +376,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskFirst } from "api/process"; import { inboundLiaisonDetail, saveinboundTask } from "api/process";
export default { export default {
name: "bzqdfbStep3", name: "bzqdfbStep3",
@@ -700,9 +700,10 @@ export default {
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
commentText: this.commentText commentText: this.commentText
})); }));
saveTaskFirst(_formData).then(res => { saveinboundTask(_formData).then(res => {
this.saveLoading = false; this.saveLoading = false;
this.$message.success("保存成功"); this.$message.success("保存成功");
this.$router.push('/processCenter')
this.bpnId = res.result; this.bpnId = res.result;
}).catch(e => { }).catch(e => {
this.saveLoading = false; this.saveLoading = false;
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+532 -531
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+6 -5
View File
@@ -1392,14 +1392,15 @@
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
], ],
standNature: [ standNature: [
{ required: false, message: '请选择标准性质', trigger: 'change' } { required: true, message: '请选择标准性质', trigger: 'change' }
], ],
textStatus: [ textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ]
issueTime: [ ,
{ required: true, message: '请选择标准发布日期', trigger: 'change' } // issueTime: [
], // { required: true, message: '请选择标准发布日期', trigger: 'change' }
// ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' } { required: true, message: '请选择起草单位', trigger: 'change' }
], ],
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+22 -5
View File
@@ -78,8 +78,8 @@
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>流程发起人</h4> <h4>流程发起人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input> <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -253,7 +253,7 @@
</ProcessFooter> </ProcessFooter>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" is-title="选择人员信息"
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
:nodeList="nodeList" :nodeList="nodeList"
@checkedRole="drawerCheck" @checkedRole="drawerCheck"
@@ -265,7 +265,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, completeTask, saveTaskFirst } from '@/api/process.js' import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js'
import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
export default { export default {
name: "wfhxzgStep1", name: "wfhxzgStep1",
@@ -303,6 +303,7 @@ export default {
dockUserName: '', dockUserName: '',
dockUser: '' dockUser: ''
}, },
deleteDataList: [],
roleFormRules: { roleFormRules: {
dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
}, },
@@ -322,7 +323,23 @@ export default {
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
}, },
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
},
methods: { methods: {
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes);
this.dataList = mes.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
});
},
//点击新增事件 //点击新增事件
addList() { addList() {
dicTypeData().then(res => { dicTypeData().then(res => {
@@ -460,7 +477,7 @@ export default {
this.$message.warning('请选择基础信息进行添加') this.$message.warning('请选择基础信息进行添加')
} else { } else {
if (this.roleForm.dockUserName === '') { if (this.roleForm.dockUserName === '') {
this.$message.warning('请选择基础信息进行添加') this.$message.warning('请完善人员信息')
} else { } else {
this.$refs['roleForm'].validate((valid) => { this.$refs['roleForm'].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+20 -4
View File
@@ -123,7 +123,7 @@
@click.native="clickOpen(scope.row)" @click.native="clickOpen(scope.row)"
v-model="scope.row.dutyPeopleInfo" v-model="scope.row.dutyPeopleInfo"
size="mini" size="mini"
placeholder="请输入内容" placeholder="请选择分发责任人"
/> />
</template> </template>
</el-table-column> </el-table-column>
@@ -220,8 +220,8 @@
> >
</ProcessFooter> </ProcessFooter>
<Role-tree <Role-tree
is-title="选择人员信息"
check-box check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
:nodeList="nodeList" :nodeList="nodeList"
@checkedRole="drawerCheck" @checkedRole="drawerCheck"
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { roleTreeData } from "@/api/unqualProcess.js" import { roleTreeData } from "@/api/unqualProcess.js"
import {completeTask, inboundLiaisonDetail} from "@/api/process.js" import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js"
export default { export default {
name: "wfhxzgStep2", name: "wfhxzgStep2",
@@ -367,7 +367,23 @@ export default {
}, },
// 保存按钮 // 保存按钮
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
itemsList: this.dataList,
commentText: this.commentText
}))
saveinboundTask(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮 // 提交按钮
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -1
View File
@@ -229,7 +229,7 @@
</ProcessFooter> </ProcessFooter>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" is-title="选择人员信息"
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
:nodeList="nodeList" :nodeList="nodeList"
@checkedRole="drawerCheck" @checkedRole="drawerCheck"
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+73 -53
View File
@@ -13,7 +13,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form"> <!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
@@ -78,7 +78,7 @@
清空 清空
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>-->
<el-table <el-table
:data="dataList" :data="dataList"
border border
@@ -87,6 +87,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/> <el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -97,32 +107,30 @@
</el-table-column> </el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/> <el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyPeople" label="负责人" align="center"/> <el-table-column prop="dutyPeople" label="负责人" align="center"/>
<el-table-column prop="info.fileText" label="佐证材料" align="center" show-overflow-tooltip width="150"> <el-table-column label="佐证材料" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: inline;"> <el-upload
<el-input multiple
disabled ref="uploadFile"
style="display: none" :action="uploadPath"
v-model="scope.row.fileText" name="file"
clearable :file-list="fileTextList"
/> accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
<div v-if="scope.row.fileText" type="primary" @click="fileUpload(scope.row)" class="fileClass"> :before-upload="handleBeforeUpload"
{{ scope.row.fileText }} :before-remove="handleBeforeRemove"
</div> :on-success="handleOnsuccess"
<div v-else> >
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="fileUpload(scope.row)" @click="uploadFile(scope.row)"
size="mini"> size="mini">
点击上传 点击上传
</el-button> </el-button>
</div> </el-upload>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
@@ -214,23 +222,6 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
multiple
drag
:action="uploadPath"
ref="importfile"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload"
:on-success="handleOnsuccess"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div> </div>
</template> </template>
@@ -238,7 +229,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {interfaceUrl} from "@/sysConfig"; import {uploadFile} from '@/api/unqualProcess.js';
import {inboundLiaisonDetail, completeTask} from "@/api/process" import {inboundLiaisonDetail, completeTask} from "@/api/process"
export default { export default {
@@ -268,6 +259,8 @@ export default {
// 上传路径 // 上传路径
uploadPath: 'api/att/attFile/upload', uploadPath: 'api/att/attFile/upload',
fileMadel: false, fileMadel: false,
// 上传所储存文件数组
fileTextList: [],
newDataList: [], newDataList: [],
// 责任部门 // 责任部门
zNodesSItem: [], zNodesSItem: [],
@@ -315,12 +308,18 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
/*for (let i = 0; i<fileData.length; i++) { this.newDataList = []
if (fileData[i].name === this.$store.getters.userInfo.userName) { console.log(this.dataList)
this.dataList = fileData[i].standardInfoList this.dataList.forEach(item => {
console.log(this.dataList) if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => {
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
} }
}*/ })
}) })
}, },
@@ -328,16 +327,22 @@ export default {
this.active = name this.active = name
}, },
/************ 上传佐证材料 *****************/ /************ 上传佐证材料 *****************/
fileUpload (val) { uploadFile (val) {
this.newDataList = val this.fileListData = val
this.fileMadel = true
}, },
// 文件上传成功 // 文件上传成功
handleOnsuccess(res, file, fileList) { handleOnsuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
this.newDataList.fileText = res.data.name this.newDataList.push({
this.newDataList.fileTextId = res.data.id id: res.data.attId,
this.newDataList.fileTextPath = res.data.filePath name: res.data.standName
})
this.newDataList.forEach(item =>{
this.fileListData.fileText.push({
id: item.id,
name: item.name
})
})
this.$message({ this.$message({
showClose: true, showClose: true,
message: res.message, message: res.message,
@@ -374,13 +379,28 @@ export default {
return true return true
}, },
// 移除上传的文件 // 移除上传的文件
handleBeforeRemove() {}, handleBeforeRemove(file, fileList) {
handleOnRemove() {}, this.fileTextList = fileList
// 文件超过限制数量提示 this.newDataList.forEach((item, index) => {
handleExceed() { if (file.name === item.name || file.id === item.id) {
this.$message.error(``) this.newDataList.splice(index, 1)
}
})
}, },
/************ ********* *****************/ /************ ********* *****************/
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 保存按钮 // 保存按钮
handleSave() {}, handleSave() {},
// 提交按钮 // 提交按钮
@@ -388,7 +408,7 @@ export default {
this.isSubmit = true this.isSubmit = true
let flag=false let flag=false
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.fileText === '') { if (item.fileText.length === 0) {
flag=true flag=true
this.isSubmit = false this.isSubmit = false
} }
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+52 -7
View File
@@ -13,7 +13,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form"> <!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
@@ -78,7 +78,7 @@
清空 清空
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>-->
<el-table <el-table
:data="dataList" :data="dataList"
border border
@@ -87,6 +87,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/> <el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -96,14 +106,19 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/> <el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" label="负责人" align="center"/> <el-table-column prop="dutyPeople" label="负责人" align="center"/>
<el-table-column label="佐证材料" align="center" show-overflow-tooltip> <el-table-column prop="fileText" label="佐证材料" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button> <el-upload
:action="''"
name="file"
:file-list="fileTextList"
:on-preview="handleOnPreview"
>
</el-upload>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
@@ -222,6 +237,7 @@ export default {
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
}, },
fileTextList: [],
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
backLoading: false, backLoading: false,
@@ -281,13 +297,39 @@ export default {
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
this.dataList.forEach(item => {
item.fileText.forEach(item1 => {
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
})
}) })
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 点击上传的文件进行下载
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
// 提交按钮 // 提交按钮
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
@@ -407,6 +449,9 @@ export default {
background: #E6A23C; background: #E6A23C;
} }
} }
/deep/.el-upload{
display: block;
}
.content-center { .content-center {
padding: 10px 0px 10px 10px; padding: 10px 0px 10px 10px;
} }
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+19 -19
View File
@@ -69,43 +69,43 @@
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="prcNum" <!-- prop="prcNum"-->
label="流程编号" <!-- label="流程编号"-->
align="center" <!-- align="center"-->
width="150" <!-- width="150"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="prcType" prop="prcType"
label="流程类型" label="流程类型"
align="center" align="center"
width="180" width="500"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.prcName || getPrcName(scope.row.prcType) }} {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="prcName" <!-- prop="prcName"-->
label="流程名称" <!-- label="流程名称"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
align="center" <!-- align="center"-->
min-width="250" <!-- min-width="250"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="300"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
align="center" align="center"
width="150" width="380"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -115,7 +115,7 @@
prop="endTime" prop="endTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="380"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -195,7 +195,7 @@
width="150px" width="150px"
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span> {{ formatIssueDate(scope.row.putTime) }}
</template> </template>
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -3
View File
@@ -168,7 +168,7 @@
<el-table-column <el-table-column
prop="reason" prop="reason"
width="180" width="180"
label="不合规原因"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responsibleUnit" prop="responsibleUnit"
@@ -236,7 +236,7 @@
:model="historySeeForm" :model="historySeeForm"
> >
<el-form-item class="add-form-item" label="标准号:"> <el-form-item class="add-form-item" label="标准号:">
<div class="seeItem">{{historySeeForm.standId}}</div> <div class="seeItem">{{historySeeForm.standSerialNumber}}</div>
</el-form-item> </el-form-item>
<el-form-item class="add-form-item" label="标准名称:"> <el-form-item class="add-form-item" label="标准名称:">
<div class="seeItem">{{historySeeForm.standName}}</div> <div class="seeItem">{{historySeeForm.standName}}</div>
@@ -253,7 +253,7 @@
<el-form-item class="add-form-item" label="项目名称:"> <el-form-item class="add-form-item" label="项目名称:">
<div class="seeItem">{{historySeeForm.productName}}</div> <div class="seeItem">{{historySeeForm.productName}}</div>
</el-form-item> </el-form-item>
<el-form-item class="add-form-item" label="不合规原因:"> <el-form-item class="add-form-item" label="不合规项目:">
<div class="seeItem">{{historySeeForm.reason}}</div> <div class="seeItem">{{historySeeForm.reason}}</div>
</el-form-item> </el-form-item>
<el-form-item class="add-form-item" label="责任部门:"> <el-form-item class="add-form-item" label="责任部门:">