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:
super_liu
2022-04-01 14:59:47 +08:00
parent e96e5a1a68 f3825a985f
commit fddae920ea
6 changed files with 104 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+8 -3
View File
@@ -698,11 +698,15 @@ export default {
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList (item) { getFormFieldList (item) {
item.commentText = ''
this.$nextTick(() => { this.$nextTick(() => {
if(item.form){ if(item.form){
this.hisListForm = JSON.parse(JSON.stringify(item.form)) this.hisListForm = JSON.parse(JSON.stringify(item.form))
this.listForm = JSON.parse(JSON.stringify(item.form)) this.listForm = JSON.parse(JSON.stringify(item.form))
if(item.taskInfo === '被驳回之后的保存'){
this.commentText = item.commentText
}else{
this.commentText = ''
}
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
this.listForm['id'] = item.id this.listForm['id'] = item.id
@@ -920,7 +924,7 @@ export default {
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
_formData.append("prcType", "5"); _formData.append("prcType", "5");
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
taskInfo: "选择已拆分标准", taskInfo: "被驳回之后的保存",
form: this.listForm, form: this.listForm,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.commentText
@@ -1020,7 +1024,8 @@ export default {
commentText: this.commentText commentText: this.commentText
} }
}; };
let json = this.hisListForm this.listForm.dataList = this.dataList
let json = this.listForm
this.$http.post("lawss/activiti/completeTaskNew", { this.$http.post("lawss/activiti/completeTaskNew", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+11 -11
View File
@@ -43,7 +43,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.standNumber" v-model.trim="form.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
@@ -289,7 +289,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%; line-height: 40px">
<div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -314,7 +314,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -339,7 +339,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%; line-height: 40px">
<div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -364,7 +364,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -389,7 +389,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -416,7 +416,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -441,7 +441,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -468,7 +468,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -493,7 +493,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
@@ -518,7 +518,7 @@
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;"> <div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }} {{ item.name }}
</div> </div>
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+17 -1
View File
@@ -741,7 +741,7 @@ export default {
.wfhxzgStep1 { .wfhxzgStep1 {
/deep/ .el-table--scrollable-y .el-table__body-wrapper { /deep/ .el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 57px) !important; // height: calc(100% - 57px) !important;
} }
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
@@ -805,3 +805,19 @@ export default {
} }
} }
</style> </style>
<style lang="less">
.wfhxzgStep1 {
.el-drawer__container {
}
/*.el-table{*/
/* overflow: auto;*/
/*}*/
/*.el-table__body-wrapper{*/
/* overflow:visible;*/
/*}*/
/*.el-table::after{*/
/* position: relative;*/
/*}*/
}
</style>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -7
View File
@@ -4618,13 +4618,15 @@ export default {
} }
} }
if(item){ if(item){
if(item.advanceSearchVOStr.length){ if(item.advanceSearchVOStr){
advanceSearchVOList.push({ if(item.advanceSearchVOStr.length){
connect: item.advanceSearchVOStr[0].connect, advanceSearchVOList.push({
field: item.advanceSearchVOStr[0].field, connect: item.advanceSearchVOStr[0].connect,
type: item.advanceSearchVOStr[0].type, field: item.advanceSearchVOStr[0].field,
value: item.advanceSearchVOStr[0].value, type: item.advanceSearchVOStr[0].type,
}) value: item.advanceSearchVOStr[0].value,
})
}
} }
} }
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+50 -5
View File
@@ -764,6 +764,17 @@
:disabled="true" :disabled="true"
></custom-input> ></custom-input>
</template> </template>
<template v-else-if="field.attrField === 'WJSCRYBUSS'">
<el-form-item
prop="WJSCRYBUSS"
label-width="150px"
class="add-form-item"
>
<template slot="label">文件上传人员</template>
<el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择文件上传人员" @click.native="choiceWJSCRY('WJSCRYBUSS', '选择文件上传人员', sarBussionessStandEO[field.attrField])">
</el-input>
</el-form-item>
</template>
<template v-else> <template v-else>
<custom-input <custom-input
:config="field" :config="field"
@@ -1475,7 +1486,12 @@
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag1"
@checkedRole="checkedRole2"
:nodeList="nodeList3"
></Role-tree>
<Mechanism-tree <Mechanism-tree
is-title="选择部门信息" is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM" :is-visible.sync="modalshowflagZRBM"
@@ -2358,8 +2374,10 @@ export default {
drawerTitle4: '', drawerTitle4: '',
drawerTitle2: '', drawerTitle2: '',
modalShowRoleFlag: false, modalShowRoleFlag: false,
modalShowRoleFlag1: false,
nodeList: [], nodeList: [],
nodeList2: [], nodeList2: [],
nodeList3: [],
nodeListZRBM: [], nodeListZRBM: [],
modalshowflagZRBM: false, modalshowflagZRBM: false,
addOrUPdateFlag: 1, // 新增：1， 修改：2 addOrUPdateFlag: 1, // 新增：1， 修改：2
@@ -3625,6 +3643,24 @@ export default {
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
}, },
choiceWJSCRY(type, title, nameId) {
this.nodeList3 = []
if (nameId) {
let nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
a = item.substring(item.indexOf('(') +1)
b = a.substring(0, a.lastIndexOf(')'))
idList.push(b)
})
idList = idList.join(',')
this.nodeList3 = idList.split(',')
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag1 = true
},
checkedRole2(data) { checkedRole2(data) {
let idList = '' let idList = ''
let nameList = '' let nameList = ''
@@ -3645,10 +3681,19 @@ export default {
if (this.drawerTitle === '查询起草人') { if (this.drawerTitle === '查询起草人') {
this.sarBussionessSearch['QCRBUSS'] = nameList this.sarBussionessSearch['QCRBUSS'] = nameList
} }
this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList) if (this.drawerTitle === '选择起草人') {
if (this.sarBussionessStandEO.QCRBUSS) { this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
this.$refs.sarBussionessStandForm.validateField('QCRBUSS') if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
}
} }
if (this.drawerTitle === '选择文件上传人员') {
this.$set(this.sarBussionessStandEO, 'WJSCRYBUSS', nameList)
if (this.sarBussionessStandEO.WJSCRYBUSS) {
this.$refs.sarBussionessStandForm.validateField('WJSCRYBUSS')
}
}
// this.sarBussionessStandEO['QCRBUSS'] = nameList // this.sarBussionessStandEO['QCRBUSS'] = nameList
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
@@ -4603,7 +4648,7 @@ export default {
this.OCRData = res.data this.OCRData = res.data
} else { } else {
this.$message.warning('当前标准没有' + text + '文件') this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = [] this.OCRData = []
} }
} }
}) })
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+9 -7
View File
@@ -3976,13 +3976,15 @@ export default {
} }
if(item){ if(item){
if(item.advanceSearchVOStr.length){ if(item.advanceSearchVOStr){
advanceSearchVOList.push({ if(item.advanceSearchVOStr.length){
connect: item.advanceSearchVOStr[0].connect, advanceSearchVOList.push({
field: item.advanceSearchVOStr[0].field, connect: item.advanceSearchVOStr[0].connect,
type: item.advanceSearchVOStr[0].type, field: item.advanceSearchVOStr[0].field,
value: item.advanceSearchVOStr[0].value, type: item.advanceSearchVOStr[0].type,
}) value: item.advanceSearchVOStr[0].value,
})
}
} }
} }
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)