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-15 17:47:33 +08:00
parent f5ccd55726 4f18c33fab
commit a63231c7fb
3 changed files with 109 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+33 -32
View File
@@ -2618,49 +2618,50 @@ export default {
/**
* @description: 动态表单读取
*/
// getFormFieldList(item) {
// this.$nextTick(() => {
// this.form = JSON.parse(JSON.stringify(item))
// this.defaultCheckedKeys = [this.form.standSystem];
// this.defaultCheckedKeys1 = [this.form.cycvppsbm];
// this.defaultCheckedKeys2 = [this.form.kccvppsbm];
// this.defaultCheckedKeys3 = [this.form.dybxh];
// this.treeCheckedKeys = this.form.treeListId.split(',')
// this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
// this.form.standYear = this.form.standYear ? this.form.standYear : ''
// this.form.prcNum = this.prcNum
// this.form.prcName = this.prcName
// this.form['id'] = item.id
//
//
// // 遍历对象
// for (const p in this.form) {
// if (typeof (this.form[p]) != "function") {
// this.initializeFileList(p, this.form[p]);
// }
// }
//
// this.$forceUpdate()
// })
// },
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh]
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
this.defaultCheckedKeys3 = [this.form.dybxh];
this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
// 遍历对象
for (const p in this.form) {
if (typeof (this.form[p]) != "function") {
this.initializeFileList(p, this.form[p]);
}
}
this.$forceUpdate()
})
},
// getFormFieldList(item) {
// this.$nextTick(() => {
// this.form = JSON.parse(JSON.stringify(item))
// this.defaultCheckedKeys = [this.form.standSystem]
// this.defaultCheckedKeys1 = [this.form.cycvppsbm]
// this.defaultCheckedKeys2 = [this.form.kccvppsbm]
// this.defaultCheckedKeys3 = [this.form.dybxh]
// this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
// this.form.standYear = this.form.standYear ? this.form.standYear : ''
// if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
// this.form.country = this.form.country.split(",");
// }
// this.form.prcNum = this.prcNum
// this.form.prcName = this.prcName
// this.form['id'] = item.id
// })
// },
initializeFileList(property, value) {
console.log(property);
switch (property) {
case 'xgd':
this.getFileList(value, this.xgdFileList);
src/pages/processCenter/pages/phone/qbfz/step6.vue
+18 -24
View File
@@ -251,31 +251,25 @@ export default {
},
//流程提交
handleSubmit() {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.qbfsForm.commentText = this.commentText;
this.qbfsForm.sdFlag = '0'
this.qbfsForm.dataList = this.dataList;
let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.account,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}else{
this.$message.warning('请完善基础信息')
this.isSubmit = true;
this.qbfsForm.commentText = this.commentText;
this.qbfsForm.sdFlag = '0'
this.qbfsForm.dataList = this.dataList;
let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.account,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
})
this.isSubmit = false;
}, e => {
});
},
handleTabs(name) {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+58 -66
View File
@@ -84,18 +84,16 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="标准号" class="search-item search-item-last">
<el-input v-model="standCommonlySearch.standNumber"
<el-input v-model="sarStandardsSearch.standNumber"
placeholder="请输入标准号"
clearable
@keyup.enter="searchBtnClick(standCommonlySearch)"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="标准名称" class="search-item search-item-last">
<el-input v-model="standCommonlySearch.standName"
<el-input v-model="sarStandardsSearch.standName"
placeholder="请输入标准名称"
clearable
@keyup.enter="searchBtnClick(standCommonlySearch)"
:maxlength="100"
></el-input>
</el-form-item>
@@ -106,7 +104,7 @@
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
@click="searchBtnClick(standCommonlySearch, 1)">
@click="searchBtnClick(sarStandardsSearch, 1)">
查询
</el-button>
<el-button
@@ -1616,17 +1614,25 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')"
clearable
:maxlength="100"></el-input>
</el-form-item>
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')"
clearable
:maxlength="500"></el-input>
<!-- &lt;!&ndash; 标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')"-->
<!-- clearable-->
<!-- :maxlength="100"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')"-->
<!-- clearable-->
<!-- :maxlength="500"></el-input>-->
<!-- </el-form-item>-->
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="add-form-item form-item-disabled">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 标准年份-->
<el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
@@ -1635,6 +1641,14 @@
placeholder="根据标准年份查找">
</el-input>
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
<el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
@@ -1644,22 +1658,6 @@
</el-option>
</el-select>
</el-form-item>
<!-- 体系类别-->
<el-form-item label="标准体系" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.TXLB" style="display: none;"></el-input>
<el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
clearable
:maxlength="500"
@click.native="BZTXhandle"></el-input>
<!-- <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
<!-- >-->
<!-- <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="index"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
@@ -1671,14 +1669,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="add-form-item form-item-disabled">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 标准英文名称-->
<el-form-item :label="$t('m.standardEnglishName')" :title="$t('m.standardEnglishName')"
class="add-form-item form-item-disabled">
@@ -1697,13 +1687,21 @@
placeholder="根据标准发布日期查找">
</el-date-picker>
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
<el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
<!-- 体系类别-->
<el-form-item label="标准体系" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.TXLB" style="display: none;"></el-input>
<el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
clearable
:maxlength="500"
@click.native="BZTXhandle"></el-input>
<!-- <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
<!-- >-->
<!-- <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="index"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
@@ -3721,11 +3719,11 @@ export default {
this.sarStandardsSearch.page = 1
this.standCommonlySearch.page = 1
//搜索后点击属性菜单依然显示搜索条件的数据
this.getDomesticStandardTable(this.standCommonlySearch)
this.getDomesticStandardTable(this.sarStandardsSearch)
},
// 点击搜索按钮
searchBtnClick(standCommonlySearch, type) {
let item = this.standCommonlySearch
searchBtnClick(sarStandardsSearch, type) {
let item = this.sarStandardsSearch
this.getDomesticStandardTable(item, type)
},
// 搜索
@@ -3799,10 +3797,10 @@ export default {
this.sarStandardsSearch.category = ''
this.isAdvancedSearch = false
// } else if (flag === 'standCommonlySearch') {
this.standCommonlySearch.standName = ''
this.standCommonlySearch.standNumber = ''
this.sarStandardsSearch.standName = ''
this.sarStandardsSearch.standNumber = ''
this.pageChange(1)
this.getDomesticStandardTable(this.standCommonlySearch)
this.getDomesticStandardTable(this.sarStandardsSearch)
} else if (flag === 2) {
// 标准条目搜索
this.standItemSearch.responsibleUnit = ''
@@ -4530,20 +4528,17 @@ export default {
} else {
this.sarStandardsSearch.page = page
}
this.standCommonlySearch.page = page
this.standCommonlySearch.pageNo = 1
if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
this.getDomesticStandardTable(this.sarStandardsSearch)
} else {
this.getDomesticStandardTable(this.standCommonlySearch)
}
this.sarStandardsSearch.page = page
this.getDomesticStandardTable(this.sarStandardsSearch)
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
this.getDomesticStandardTable(tabFlag)
if (tabFlag !== '') {
this.sarStandardsSearch.page = tabFlag.page
}
this.getDomesticStandardTable(this.sarStandardsSearch)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
},
@@ -4553,7 +4548,7 @@ export default {
item.pageSize = this.$store.getters.userInfo.configContent
}
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
const data = item || this.sarStandardsSearch || this.advanceSearchMapping
const data = item || this.sarStandardsSearch || this.advanceSearchMapping || this.standCommonlySearch
if (item) {
this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr
}
@@ -4671,9 +4666,6 @@ export default {
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
}
if (type === 1) {
this.sarStandardsSearch = {}
}
} else {
this.$message.error(res.message)
}