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

commit

Browse Source
This commit is contained in:
zhutianqi
2021-11-23 16:58:36 +08:00
parent 88d6b943a2
commit 029e6d71ca
13 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+8 -8
View File
@@ -26,7 +26,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled"> <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button> <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled"> <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -84,7 +84,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled"> <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button> <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled"> <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -329,7 +329,7 @@
<loading :loading="spinShow">数据加载中……</loading> <loading :loading="spinShow">数据加载中……</loading>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button> <el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">带入</el-button> <el-button type="primary" size="mini" @click="enterDrawer">导入</el-button>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@@ -649,7 +649,7 @@
this.standCommonlySearch2.pageSize = pageSize this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2() this.sarStandCompareHis2()
}, },
/** 选择带入数据的方法操作 /** 选择导入数据的方法操作
* */ * */
handleSelection(data) { handleSelection(data) {
this.selectedList = []; this.selectedList = [];
@@ -710,9 +710,9 @@
this.loading = false this.loading = false
}) })
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
closeDrawer2() { closeDrawer2() {
@@ -744,9 +744,9 @@
this.form.oldNumber = bringData[0].id this.form.oldNumber = bringData[0].id
this.listModel2 = false this.listModel2 = false
} else if (this.selectedList2.length > 1) { } else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
/*** **********************************************/ /*** **********************************************/
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+8 -8
View File
@@ -27,7 +27,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled"> <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button> <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled"> <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -94,7 +94,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled"> <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button> <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled"> <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -345,7 +345,7 @@
<loading :loading="spinShow">数据加载中……</loading> <loading :loading="spinShow">数据加载中……</loading>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button> <el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">带入</el-button> <el-button type="primary" size="mini" @click="enterDrawer">导入</el-button>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@@ -680,7 +680,7 @@ export default {
this.standCommonlySearch2.pageSize = pageSize this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2() this.sarStandCompareHis2()
}, },
/** 选择带入数据的方法操作 /** 选择导入数据的方法操作
* */ * */
handleSelection(data) { handleSelection(data) {
this.selectedList = []; this.selectedList = [];
@@ -747,9 +747,9 @@ export default {
this.loading = false this.loading = false
}) })
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
closeDrawer2() { closeDrawer2() {
@@ -781,9 +781,9 @@ export default {
this.form.oldNumber = bringData[0].id this.form.oldNumber = bringData[0].id
this.listModel2 = false this.listModel2 = false
} else if (this.selectedList2.length > 1) { } else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
/*** **********************************************/ /*** **********************************************/
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+6 -6
View File
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''"> <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0"> <el-form-item prop="dockUserList" 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.dockUserList" style="display: none;"/> <el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input <el-input
v-model="roleForm.dockUserListName" v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人" placeholder="选择责任领导"
@click.native="choiceZRRS"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
@@ -253,7 +253,7 @@
</div> </div>
</el-drawer> </el-drawer>
<Role-tree <Role-tree
is-title="选择责任部门对接人" is-title="选择责任领导"
:is-visible.sync="modalshowflag2" :is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
@@ -342,9 +342,9 @@ export default {
cname: [ cname: [
{required: true, message: '请输入标准名称', trigger: 'change'}, {required: true, message: '请输入标准名称', trigger: 'change'},
], ],
fjListId: [ // fjListId: [
{required: true, message: '请选择附件', trigger: 'change'}, // {required: true, message: '请选择附件', trigger: 'change'},
] // ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
standCommonlySearch: { standCommonlySearch: {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+6 -6
View File
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''"> <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0"> <el-form-item prop="dockUserList" 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.dockUserList" style="display: none;"/> <el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input <el-input
v-model="roleForm.dockUserListName" v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人" placeholder="选择责任领导"
@click.native="choiceZRRS"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
@@ -254,7 +254,7 @@
</div> </div>
</el-drawer> </el-drawer>
<Role-tree <Role-tree
is-title="选择责任部门对接人" is-title="选择责任领导"
:is-visible.sync="modalshowflag2" :is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
@@ -341,9 +341,9 @@ export default {
endTime: [ endTime: [
{required: true, message: '请输入标准结束日期', trigger: 'change'}, {required: true, message: '请输入标准结束日期', trigger: 'change'},
], ],
fjListId: [ // fjListId: [
{required: true, message: '请选择附件', trigger: 'change'}, // {required: true, message: '请选择附件', trigger: 'change'},
] // ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
standCommonlySearch: { standCommonlySearch: {
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+5
View File
@@ -340,6 +340,11 @@ export default {
this.form.cname = data.cname this.form.cname = data.cname
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.json = data this.json = data
}).catch(e => { }).catch(e => {
}); });
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+11 -6
View File
@@ -485,7 +485,8 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus console.log(data);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){ if(commitStatus && commitStatus > 0){
this.acceptShow = true this.acceptShow = true
this.submitShow = false this.submitShow = false
@@ -493,12 +494,16 @@ export default {
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList || []
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.cid = data.cid || data.form.cid this.form.fjListId = ''
this.form.endTime = data.endTime || data.form.endTime } else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.todoId = res.id this.todoId = res.id
this.json = data this.json = data
this.data = data.info || data.data || data.form.data || [] this.data = data.info || data.data || data.form.data || []
}).catch(e => { }).catch(e => {
}) })
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+5 -1
View File
@@ -373,7 +373,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname this.form.cname = data.cname || data.form.cname
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+5 -1
View File
@@ -420,7 +420,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+5 -1
View File
@@ -437,7 +437,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+5 -1
View File
@@ -434,7 +434,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+5 -1
View File
@@ -434,7 +434,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+5 -1
View File
@@ -434,7 +434,11 @@ export default {
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -247,7 +247,7 @@ export default {
this.queryProcess() this.queryProcess()
}, },
queryProcess () { // 查询待办流程 queryProcess () { // 查询待办流程
this.$http.postData('lawss/activiti/todoTaskList', { this.$http.postData('lawss/activiti/todoTaskListNew', {
current: this.pageNo, current: this.pageNo,
size: parseInt(this.$store.getters.userInfo.configContent), size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,