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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-05 16:56:34 +08:00
parent a2af7ad007 7fd33dd111
commit 969456c383
11 changed files with 170 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardRecognition/index.vue
+1 -1
View File
@@ -216,7 +216,7 @@
:loading="isSubmit"
>{{ btnName }}</el-button
>
<!-- <el-button @click="uploadSave" type="primary">转换</Button>-->
<!--<el-button @click="uploadSave" type="primary">转换</Button>-->
</div>
</el-dialog>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+15
View File
@@ -114,6 +114,21 @@
</el-table>
</div>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+16
View File
@@ -101,6 +101,21 @@
</el-table>
</div>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
@@ -658,6 +673,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -10
View File
@@ -336,9 +336,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -459,9 +456,4 @@ export default {
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
.dem
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+15
View File
@@ -126,6 +126,21 @@
</template>
</el-table-column>
</el-table>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<!-- 选择责任人-->
<Role-tree
check-box
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+16 -22
View File
@@ -246,21 +246,21 @@
</el-table-column>
</el-table>
</div>
<!-- <div>-->
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="填写评估反馈">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入您的评估分析"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<!-- </div>-->
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
@@ -611,10 +611,4 @@ export default {
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
.demo-draw
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+3 -16
View File
@@ -447,9 +447,6 @@ export default {
},
//驳回事件
beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -598,10 +591,4 @@ export default {
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
.demo-
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -11
View File
@@ -452,9 +452,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.isSubmit = true
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -583,10 +580,4 @@ export default {
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
.demo-
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-4
View File
@@ -451,9 +451,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/searchCenter/pages/advancedSearch.vue
+99 -173
View File
@@ -27,10 +27,8 @@
{{ $t("m.clearQuery") }}
</el-button>
</div>
<el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE
;border-color:#3391CE
;">{{ $t("m.export") }}
</el-button>
<!-- <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE;border-color:#3391CE;">{{ $t("m.export") }}-->
<!-- </el-button>-->
</div>
<div class="search-condition showWidth" v-if="kindtext">
<div class="search-content">
@@ -932,65 +930,41 @@
align="center"
:label="$t('m.action')"
width="200">
<template slot-scope="scope">
<div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
<div v-if="scope.row.collectId">
<el-button class="opera-btn" type="primary" size="mini"
@click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
</el-button>
<el-dropdown trigger="click" @command="handleCommand">
<el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
{{ $t("m.more") }}
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)"
v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.cancelCollection") }}
</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
<div v-else>
<el-button class="opera-btn" type="primary" size="mini"
@click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
</el-button>
<el-dropdown trigger="click" @command="handleCommand">
<el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
{{ $t("m.more") }}
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('d',scope.row)"
v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<div v-else-if="selectIndex === 'items'">
<!-- <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
<el-button class="opera-btn" size="mini" @click="itemsDetails(scope.row)">{{ $t("m.see") }}
</el-button>
</div>
<div v-else class="celect-btn-box">
<el-button class="opera-btn" size="mini" type="primary" v-if="scope.row.collectId"
@click="clickCollection(scope.row)" v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">
{{ $t("m.cancelCollection") }}
</el-button>
<el-button class="opera-btn" size="mini" type="primary" v-else @click="clickCollection(scope.row)"
v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
</el-button>
<el-button class="opera-btn" sizi="mini" @click="clickShare(scope.row)"
v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
</el-button>
</div>
</template>
<template slot-scope="scope">
<div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
<div v-if="scope.row.collectId">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div v-else>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<div v-else-if="selectIndex === 'items'">
<!-- <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
<el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
</div>
<div v-else>
<el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
@@ -1315,10 +1289,29 @@ export default {
dropdownItemsCollect: [{ "val": "取消收藏" }, { "val": "分享" }, { "val": "流程" }],
judgeRoleFlag: false,
judgeRoleMessage: "",
exportSearchInfo: {}
exportSearchInfo: {},
twoOptions: [],
formFieldListStandData: []
};
},
methods: {
getAddFormFieldList (isEdit) {
this.$http.get('lawss/sarStandAttrDetails/list', {}, {
_this: this
},
res => {
if (res.ok) {
const { data = {} } = res
// 国内外标准
const inlandList = data['INLAND_STAND'] || []
const foreignList = data['FOREIGN_STAND'] || []
const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
console.log(foreignFilterList)
this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
console.log(this.formFieldListStandData,'-----------------------------------1')
}
}, e => {})
},
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
@@ -1497,22 +1490,22 @@ export default {
}
}
}, // 点击收藏/取消收藏事件
handleCommand(command) {
switch (command.command) {
case "d":
this.judgeRolePermiOnSar(command.item, 2); // 收藏
break;
case "a":
this.judgeRolePermiOnSar(command.item, 3); // 取消收藏
break;
case "b":
this.judgeRolePermiOnSar(command.item, 4); // 分享
break;
case "c":
this.judgeRolePermiOnSar(command.item, 6); // 流程
break;
}
}, // 下拉菜单点击事件
handleCommand (command) {
switch (command.command) {
case 'd':
this.judgeRolePermiOnSar(command.item, 2) // 收藏
break
case 'a':
this.judgeRolePermiOnSar(command.item, 3) // 取消收藏
break
case 'b':
this.judgeRolePermiOnSar(command.item, 4) // 分享
break
case 'l':
this.judgeRolePermiOnSar(command.item, 1) // 查看
break
}
}, // 下拉菜单点击事件
beforeHandleCommand(command, item) {
return {
"item": item,
@@ -1658,37 +1651,19 @@ export default {
pagetype = "BUSINESS_STAND";
}
}
this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
sarId: item.id,
sarType: pagetype
}, {
_this: this
}, res => {
if (res.ok) {
this.judgeRoleFlag = true;
if (type === 1) {
if (type === 1) {
this.detailsStandardLaws(item);
} else if (type === 2) {
} else if (type === 2) {
this.collectStandard(item);
} else if (type === 3) {
} else if (type === 3) {
this.cancelCollectStandard(item);
} else if (type === 4) {
} else if (type === 4) {
this.shareSarInfo(item);
} else if (type === 5) {
} else if (type === 5) {
this.showRecommendDetials(item);
} else if (type === 6) {
} else if (type === 6) {
this.goProcess(item);
}
} else {
this.judgeRoleFlag = false;
this.$message({
message: res.message,
type: "error"
});
}
}, e => {
this.judgeRoleFlag = false;
});
}
},
showDetailsByRole(item) {
@@ -1722,64 +1697,20 @@ export default {
this.standForm.page = this.page;
this.standForm.pageSize = this.$store.getters.userInfo.configContent;
let nowStandForm = JSON.parse(JSON.stringify(this.standForm));
if (this.standForm.issueTime != null && this.standForm.issueTime !== "") {
nowStandForm.issueTime = this.$dateFormat(this.standForm.issueTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.issueTimeSt != null && this.standForm.issueTimeSt !== "") {
nowStandForm.issueTimeSt = this.$dateFormat(this.standForm.issueTimeSt, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.issueTimeEd != null && this.standForm.issueTimeEd !== "") {
nowStandForm.issueTimeEd = this.$dateFormat(this.standForm.issueTimeEd, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.putTime != null && this.standForm.putTime !== "") {
nowStandForm.putTime = this.$dateFormat(this.standForm.putTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.putTimeSt != null && this.standForm.putTimeSt !== "") {
nowStandForm.putTimeSt = this.$dateFormat(this.standForm.putTimeSt, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.putTimeEd != null && this.standForm.putTimeEd !== "") {
nowStandForm.putTimeEd = this.$dateFormat(this.standForm.putTimeEd, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.newproductPutTime != null && this.standForm.newproductPutTime !== "") {
nowStandForm.newproductPutTime = this.$dateFormat(this.standForm.newproductPutTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.registerPutTime != null && this.standForm.registerPutTime !== "") {
nowStandForm.registerPutTime = this.$dateFormat(this.standForm.registerPutTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.productPutTime != null && this.standForm.productPutTime !== "") {
nowStandForm.productPutTime = this.$dateFormat(this.standForm.productPutTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.productPutTimeSt != null && this.standForm.productPutTimeSt !== "") {
nowStandForm.productPutTimeSt = this.$dateFormat(this.standForm.productPutTimeSt, "yyyy-MM-dd hh:mm:ss");
} else {
nowStandForm.productPutTimeSt = "";
}
if (this.standForm.productPutTimeEd != null && this.standForm.productPutTimeEd !== "") {
nowStandForm.productPutTimeEd = this.$dateFormat(this.standForm.productPutTimeEd, "yyyy-MM-dd hh:mm:ss");
} else {
nowStandForm.productPutTimeEd = "";
}
if (this.standForm.newcarPutTime != null && this.standForm.newcarPutTime !== "") {
nowStandForm.newcarPutTime = this.$dateFormat(this.standForm.newcarPutTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.newcarPutTimeSt != null && this.standForm.newcarPutTimeSt !== "") {
nowStandForm.newcarPutTimeSt = this.$dateFormat(this.standForm.newcarPutTimeSt, "yyyy-MM-dd hh:mm:ss");
} else {
nowStandForm.newcarPutTimeSt = "";
}
if (this.standForm.newcarPutTimeEd != null && this.standForm.newcarPutTimeEd !== "") {
nowStandForm.newcarPutTimeEd = this.$dateFormat(this.standForm.newcarPutTimeEd, "yyyy-MM-dd hh:mm:ss");
} else {
nowStandForm.newcarPutTimeEd = "";
}
if (this.standForm.firstPutTime != null && this.standForm.firstPutTime !== "") {
nowStandForm.firstPutTime = this.$dateFormat(this.standForm.firstPutTime, "yyyy-MM-dd hh:mm:ss");
}
if (this.standForm.putYear != null && this.standForm.putYear !== "") {
nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy");
}
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldListStandData
const sarStandAttrObj = {}
formFieldList.forEach((item) => {
const attrField = item.attrField.toLowerCase();
const value = nowStandForm[attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowStandForm[item.attrField] = this.standForm[attrField]
}
sarStandAttrObj[item.attrField] = nowStandForm[attrField]
})
nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
this.exportSearchInfo = nowStandForm;
nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'")
this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, {
_this: this,
loading: "resultLoading"
@@ -1920,20 +1851,13 @@ export default {
let routername = "";
let pagetype = "";
if (item.type === "stand") {
if (this.$hasPermission("CFEZ3VP7EA95CTRBH3JB") || this.$hasPermission("R5DNG6EZC66CNFC4RHPH")) {
if (item.stand_type === "INLAND") {
routername = "OtherStandardDetails";
pagetype = "INLAND_STAND";
if (item.standType === "INLAND") {
routername = "OtherStandardDetails";
pagetype = "INLAND_STAND";
} else {
routername = "OtherForeignDetails";
pagetype = "FOREIGN_STAND";
routername = "OtherForeignDetails";
pagetype = "FOREIGN_STAND";
}
} else {
this.$message({
message: "无权访问",
type: "warning"
});
}
} else if (item.type === "laws") {
if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
routername = "OtherLawsDetails";
@@ -2349,6 +2273,7 @@ export default {
computed: {
// 条件按钮提示
toggleConditionTips() {
this.standForm.selectValue = ''
return this.kindtext ? "收起条件" : "展开条件";
}
},
@@ -2408,6 +2333,7 @@ export default {
// 加载表格
this.searchSarBykey();
this.showBuyRole();
this.getAddFormFieldList();
// 组织结构
this.getOrgTreeSource();
// this.selectBussRoleMsg();
src/sysConfig/index.js
+1 -1
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = '192.168.0.104'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'