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:
zhaokaiyao@91isoft.com
2021-09-13 15:19:35 +08:00
parent 802da164f3 d528127a9b
commit 7a95bc164f
5 changed files with 116 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+21
View File
@@ -38,6 +38,15 @@
:loading="submitLoading"
v-if="showOver"
>撤销申请</el-button>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-s-promotion"
@click="handleTransfer"
:loading="transferLoading"
v-if="showTransfer"
>转办</el-button>
<el-button
type="primary"
size="mini"
@@ -140,6 +149,10 @@ export default {
type: Boolean,
default: false
},
showTransfer:{
type: Boolean,
default: false
},
showConfirm: {
type: Boolean,
default: false
@@ -159,6 +172,11 @@ export default {
type: Boolean,
default: false
},
//转办按钮loading
transferLoading: {
type: Boolean,
default: false
},
// 保存按钮loading
saveLoading: {
type: Boolean,
@@ -225,6 +243,9 @@ export default {
handleSubmit() {
this.$emit('submit')
},
handleTransfer(){
this.$emit('transfer')
},
handleSendEmail() {
this.$emit('sendEmail')
},
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+4 -10
View File
@@ -231,7 +231,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
disabled></el-input>
</div>
</el-form-item>
</el-card>
@@ -788,10 +788,10 @@ export default {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUser: "",
ministerUser: "",
ministerUser: this.$store.getters.userInfo.userId,
directorUser: "",
dockUserName: "",
ministerUserName: "",
ministerUserName: this.$store.getters.userInfo.userName,
directorUserName: ""
},
formRules: {
@@ -806,9 +806,6 @@ export default {
dockUserName: [
{ required: true, message: "请选择会签责任人", trigger: "change" }
],
ministerUserName: [
{ required: true, message: "请选择修订责任人", trigger: "change" }
],
directorUserName: [
{ required: true, message: "请选择审批责任人", trigger: "change" }
]
@@ -898,10 +895,7 @@ export default {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") {
} else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name;
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+13 -15
View File
@@ -131,20 +131,20 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -231,7 +231,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
disabled></el-input>
</div>
</el-form-item>
</el-card>
@@ -758,10 +758,10 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
dockUser: "",
ministerUser: "",
ministerUser: this.$store.getters.userInfo.userId,
directorUser: "",
dockUserName: "",
ministerUserName: "",
ministerUserName: this.$store.getters.userInfo.userName,
directorUserName: ""
},
formRules: {
@@ -776,9 +776,6 @@ export default {
dockUserName: [
{required: true, message: "请选择会签责任人", trigger: "change"}
],
ministerUserName: [
{required: true, message: "请选择修订责任人", trigger: "change"}
],
directorUserName: [
{required: true, message: "请选择审批责任人", trigger: "change"}
]
@@ -857,9 +854,6 @@ export default {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name;
@@ -1311,11 +1305,15 @@ export default {
}
this.dataList = res.data.records;
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined'){
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ){
item.xcxssrqgj = ''
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined'){
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'){
item.zccssrqgj = ''
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
})
this.listForm.dataList = this.dataList;
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+58 -4
View File
@@ -212,11 +212,22 @@
</div>
</div>
<ProcessFooter
show-transfer
show-submit
:submitLoading="isSubmit"
:transferLoading="isTransfer"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -224,8 +235,9 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
import axios from "axios";
export default {
name: "bzqdfbStep2",
@@ -240,6 +252,7 @@ export default {
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
nodeList:[],
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
@@ -247,6 +260,8 @@ export default {
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
isTransfer: false,
drawerTitle:'',
saveLoading: false,
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
@@ -255,6 +270,8 @@ export default {
fileList:[],
fileIds: "",
commentText: "", //填写会签意见
// 调整处理人抽屉状态
drawerModal: false,
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -384,9 +401,46 @@ export default {
}
}
},
//保存事件
handleSave() {
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//提交事件
handleSubmit() {
src/pages/regulatoryRepository/standardForComments/index.vue
+20 -15
View File
@@ -16,14 +16,26 @@
<el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable
:maxlength="100"></el-input>
</el-formItem>
<el-formItem label="开始日期" class="search-item">
<el-datePicker v-model="standCommonlySearch.start" :editable="false"
placeholder="请选择开始日期"></el-datePicker>
</el-formItem>
<el-formItem label="结束日期" class="search-item">
<el-datePicker v-model="standCommonlySearch.end" :editable="false"
placeholder="请选择结束日期"></el-datePicker>
</el-formItem>
<el-form-item label="开始日期" >
<el-date-picker
v-model="standCommonlySearch.start"
type="date"
:editable="false"
placeholder="请选择开始日期"
size="small"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期" >
<el-date-picker
v-model="standCommonlySearch.end"
type="date"
:editable="false"
placeholder="请选择结束日期"
size="small"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
@@ -139,18 +151,11 @@ export default {
this.splitInfoPage = 1;
this.sarStandCompareHis();
},
// getTime(time){
// let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
// console.log(date.toJSON().substr(0, 19).replace('T', ' '));
// return date.toJSON().substr(0, 19).replace('T', ' ');
// },
// 查询表格
sarStandCompareHis() {
this.spinShow = true;
this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
this.standCommonlySearch.type = 1;
var form = this.standCommonlySearch;
console.log(form);
this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
_this: this
}, res => {