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:
yanyizhou
2021-11-30 17:52:23 +08:00
parent 202755113d 25c442f49c
commit e83ac0acc8
8 changed files with 147 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+12 -1
View File
@@ -22,13 +22,23 @@
v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button> v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
</ul> </ul>
<template style="margin-left: 105px;" v-else> <template style="margin-left: 105px;" v-else>
<ul class="file-file__wrap">
<li class="file-item"
v-for="(file, index) in showFileList"
:key="index"
:title="file.name"
@click="handlePreview(file)">
{{ file.name }}
</li>
</ul>
<el-button <el-button
size="small" size="small"
@click="clickButtonToUpload('opinionFileList')" @click="clickButtonToUpload('opinionFileList')"
icon="el-icon-upload" icon="el-icon-upload"
class="form-upload-btn" class="form-upload-btn"
> >
{{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }} <!-- {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
上传
</el-button> </el-button>
</template> </template>
<el-dialog <el-dialog
@@ -152,6 +162,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.getShowFileList()
if (this.showFileModel) { if (this.showFileModel) {
this.getShowFileList() this.getShowFileList()
} }
src/pages/details/otherStandardDetails/index.vue
+5 -4
View File
@@ -126,7 +126,7 @@
</p> </p>
<template v-for="(child, childIndex) in item.child2"> <template v-for="(child, childIndex) in item.child2">
<p class="half"> <p class="half">
<label style=" margin-right: 143px;">{{ child.attrName }}</label> <label style=" margin-right: 150px;">{{ child.attrName }}</label>
<span>{{ child.value || '-' }}</span> <span>{{ child.value || '-' }}</span>
</p> </p>
</template> </template>
@@ -3282,7 +3282,9 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/.el-collapse-item__header {
border-bottom: none !important;
}
/deep/ .decomposition-btn { /deep/ .decomposition-btn {
position: absolute; position: absolute;
top: 6px; top: 6px;
@@ -3294,7 +3296,6 @@ export default {
color: #07C160; color: #07C160;
border: 1px solid #07C160; border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1); background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate { /deep/ .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
} }
& > div:not(.modular-item-more) { & > div:not(.modular-item-more) {
border-bottom: 1px solid #E5E5E5; /*border-bottom: 1px solid #E5E5E5;*/
min-height: 43px; min-height: 43px;
line-height: 43px; line-height: 43px;
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+54 -75
View File
@@ -142,6 +142,7 @@
> >
</el-input> </el-input>
<el-input <el-input
@click.native="handlePrice(scope.row)"
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
v-model="scope.row.complianceReasons" v-model="scope.row.complianceReasons"
@@ -171,6 +172,7 @@
<el-input <el-input
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
@click.native="handlePrice(scope.row)"
v-model="scope.row.noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
@@ -193,6 +195,7 @@
<el-input <el-input
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
@click.native="handlePrice(scope.row)"
v-model="scope.row.countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
@@ -217,8 +220,10 @@
:disabled="acceptShow" :disabled="acceptShow"
class="datePickLen" class="datePickLen"
clearable clearable
@click.native="handlePrice(scope.row)"
v-model="scope.row.completionTime" v-model="scope.row.completionTime"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期"> placeholder="请选择日期">
</el-date-picker> </el-date-picker>
</template> </template>
@@ -582,6 +587,7 @@ export default {
}, },
data() { data() {
return { return {
comFlag: true,
total: 0, total: 0,
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@@ -640,20 +646,10 @@ export default {
listForm: { listForm: {
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [ dataList: [], //项目下的标准数据
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //项目下的标准数据
children: [] //标准下的分解单数据 children: [] //标准下的分解单数据
}, },
dataList: [ dataList: [], //展示的标准数据
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
detailData: [], //流程历史数据 detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
@@ -716,54 +712,17 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures; item.countermeasures = this.batchEditForm.countermeasures;
//完成时间 //完成时间
item.completionTime = this.batchEditForm.completionTime; item.completionTime = this.batchEditForm.completionTime;
}else if(item.standId === items){
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
} }
}); });
}); });
// for (let a = 0; a < this.dataList.length; a++) {
// for (let b = 0; b < this.selectList.length; b++) {
// if (this.dataList[a].id === this.selectList[b]) {
// console.log('11');
// //合规
// this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
// } else {
// for (let i = 0; i < this.dataList[a].children.length; i++) {
// if (this.dataList[a].children[i].id === this.selectList[b]) {
// //合规
// this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
// }
// }
// }
//
// }
// }
this.modalshowflag = false; this.modalshowflag = false;
}, },
cancelBatchEditForm() { cancelBatchEditForm() {
@@ -871,6 +830,7 @@ export default {
}, },
//动态表单读取 //动态表单读取
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) { if (item.form === undefined) {
@@ -881,6 +841,9 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -897,6 +860,7 @@ export default {
dataChildren.forEach((item,index) => { dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item) dataListChildren = dataListChildren.concat(item)
}) })
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
} else { } else {
@@ -904,6 +868,9 @@ export default {
let dataChildren = [] let dataChildren = []
let dataListChildren = [] let dataListChildren = []
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -920,6 +887,7 @@ export default {
dataChildren.forEach((item,index) => { dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item) dataListChildren = dataListChildren.concat(item)
}) })
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children; // this.dataList = item.form.dataList[0].children;
@@ -964,31 +932,42 @@ export default {
this.isSubmit = false; this.isSubmit = false;
}); });
}, },
handlePrice(row){
if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
this.comFlag = true
}else{
this.comFlag = false
}
},
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true; if(!this.comFlag){
this.listForm.commentText = this.commentText; this.$message.warning('请填写完整的不符合项信息')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.isSubmit = true;
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false; this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}); }
this.isSubmit = false;
}, e => {
});
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = []; this.selectList = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id); this.selectList.push(data[i].id || data[i].standId);
localStorage.setItem("selectList", JSON.stringify(this.selectList)); localStorage.setItem("selectList", JSON.stringify(this.selectList));
} }
}, },
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+60 -26
View File
@@ -468,36 +468,70 @@ export default {
}, },
//动态表单读取 //动态表单读取
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if (item.form === undefined) {
this.listForm.prcName = this.prcName; let dataChildren = []
this.listForm["id"] = item.id; let dataListChildren = []
this.listForm.dataList = item.dataList; this.listForm.prcNum = this.prcNum;
let dataChildren = [] this.listForm.prcName = this.prcName;
let dataListChildren = [] this.listForm["id"] = item.id;
this.listForm.dataList.forEach(item => { this.listForm.dataList = item.dataList;
item.children.forEach(items=> { this.listForm.dataList.forEach(item => {
if(items.key === item.standId){ if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.$set(items, "standName", item.standName); this.dataList.push(item)
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
} }
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
}) })
}) this.listForm.dataList.forEach(item => {
this.listForm.dataList.forEach(item => { dataChildren.push(item.children)
dataChildren.push(item.children) })
}) dataChildren.forEach((item,index) => {
dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item)
dataListChildren = dataListChildren.concat(item) })
}) dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
// this.dataList = item.dataList; } else {
// this.dataList.distributePerson = item.dataList[0].distributePerson; this.listForm = item.form;
// this.listForm.breakdownList = item.breakdownList; let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children;
// this.total = item.form.dataList[0].children.length;
}
}); });
}, },
//驳回事件 //驳回事件
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+12 -3
View File
@@ -409,7 +409,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
@@ -1887,7 +1887,7 @@
<loading :loading="OCRLoading">数据加载中……</loading> <loading :loading="OCRLoading">数据加载中……</loading>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="OCRclose">取消</el-button> <el-button size="mini" @click="OCRclose">取消</el-button>
<el-button type="primary" size="mini" @click="OCRsubmit">转换</el-button> <el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@@ -1947,6 +1947,8 @@ export default {
}, },
data() { data() {
return { return {
OCRSubmitLoading: false,
OCRSubmitButton: '',
OCRType: '', OCRType: '',
OCRoptions: [], OCRoptions: [],
OCRDatas: [], OCRDatas: [],
@@ -2671,6 +2673,7 @@ export default {
} else if (this.OCRDatas.length === 0) { } else if (this.OCRDatas.length === 0) {
this.$message.warning('请选择一个文件') this.$message.warning('请选择一个文件')
} else { } else {
this.OCRSubmitLoading = true
if (this.OCRType === '0') { if (this.OCRType === '0') {
let json = { let json = {
standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber, standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
@@ -2687,6 +2690,7 @@ export default {
}, },
(res) => { (res) => {
this.OCRModel = false this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) { if (res.ok) {
this.$message.success('OCR实别成功') this.$message.success('OCR实别成功')
} else { } else {
@@ -2698,13 +2702,15 @@ export default {
} else if (this.OCRType === '1') { } else if (this.OCRType === '1') {
let splitEo = {} let splitEo = {}
splitEo.standId = this.OCRDatas[0].standId splitEo.standId = this.OCRDatas[0].standId
splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify) splitEo.fileType = this.OCRDatas[0].standFileClassify
// splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
splitEo.attId = this.OCRDatas[0].attId splitEo.attId = this.OCRDatas[0].attId
splitEo.fileName = this.OCRDatas[0].fileName splitEo.fileName = this.OCRDatas[0].fileName
this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, { this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
_this: this _this: this
}, res => { }, res => {
this.OCRModel = false this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) { if (res.ok) {
this.$message.success('拆分成功') this.$message.success('拆分成功')
} else { } else {
@@ -2720,12 +2726,15 @@ export default {
if (type === '0') { if (type === '0') {
text = 'OCR识别' text = 'OCR识别'
this.OCRTitle = '选择OCR识别文件' this.OCRTitle = '选择OCR识别文件'
this.OCRSubmitButton = '转换'
} else if (type === '1') { } else if (type === '1') {
text = '拆分' text = '拆分'
this.OCRTitle = '选择拆分文件' this.OCRTitle = '选择拆分文件'
this.OCRSubmitButton = '拆分'
} else if (type === '2') { } else if (type === '2') {
text = '编辑' text = '编辑'
this.OCRTitle = '选择编辑文件' this.OCRTitle = '选择编辑文件'
} }
if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) { if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text) this.$message.warning('仅能选择一条数据进行' + text)
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2 -2
View File
@@ -477,13 +477,12 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarBussionessStandForm" ref="sarBussionessStandForm"
:model="sarBussionessStandEO" :model="sarBussionessStandEO"
:rules="sarBussionessStandRules" :rules="sarBussionessStandRules"
class="label-input-form" class="label-input-form"
> >
<!-- <custom-input-for-standards--> <!-- <custom-input-for-standards-->
<!-- :config="{--> <!-- :config="{-->
<!-- attrName: '代替企标编号',--> <!-- attrName: '代替企标编号',-->
@@ -1212,6 +1211,7 @@
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="productModelAdd" <el-form :model="productModelAdd"
v-if="productModal"
ref="productModelAdd" ref="productModelAdd"
:rules="productRules" :rules="productRules"
class="label-input-form" class="label-input-form"
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+1 -1
View File
@@ -355,7 +355,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarLawsStandEO" ref="sarLawsStandEO"
:model="sarLawsStandEO" :model="sarLawsStandEO"
:rules="sarLawsStandRules" :rules="sarLawsStandRules"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -2
View File
@@ -770,7 +770,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
@@ -4272,7 +4272,6 @@ export default {
} }
}) })
} else if (this.ocrList.length === 1 && type === '2'){ } else if (this.ocrList.length === 1 && type === '2'){
console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit') this.selectStandardPro(this.ocrList[0], 'edit')
} }
}, },