1.解决代码冲突

ruifeng
yuxiang 3 years ago
commit e5695256fb

@ -7,7 +7,7 @@ ENV = 'development'
# 若依管理系统/开发环境
# VUE_APP_BASE_API = 'https://localhost:9022'
VUE_APP_BASE_API = 'https://172.168.4.40:9022'
VUE_APP_BASE_API = 'https://172.168.4.31:9022'
# 公司服务器
# VUE_APP_BASE_API = 'https://39.101.188.84:9022'

@ -7,7 +7,7 @@ ENV = 'production'
# 公司服务器
# VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9022'
VUE_APP_BASE_API = 'https://172.168.4.40:9022'
VUE_APP_BASE_API = 'https://172.168.4.31:9022'
# 张家港服务器远程
# VUE_APP_BASE_API = 'http://153.37.170.182:9022'

@ -1,6 +1,6 @@
export default {
// eslint-disable-next-line quotes
appkey: "2428212a7f52c661655aa6370e8ed817", // 请输入自己的appkey
appkey: "e1dcbdb294e2e8e1215d87e56e23d5bb", // 请输入自己的appkey
// eslint-disable-next-line quotes
appSecret: "fcb5e539e78f", // 请输入自己的appSecret
appSecret: "2310dba4d70a", // 请输入自己的appSecret
};

@ -43,7 +43,6 @@ export default {
},
submitUpload() {
this.formdata = new FormData(); //FormData
console.log("formdata->", this.formdata);
this.$refs.upload.submit();
axios
.post(this.baseUrl + this.uploadImgUrl, this.formdata, {

@ -1,183 +1,220 @@
<template>
<el-dialog :close-on-click-modal="false" :title="dialogTitle" width="80%" :visible.sync="dialogVisible"
:before-close="dialogClose" append-to-body>
<el-row>
<el-col :span="15" class="left-box">
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon1"></div>
<div class="title">审核信息</div>
</div>
</div>
<el-form ref="formDoc" :model="formDoc" :rules="rulesDoc" label-width="auto" class="form-doc">
<div style="width: 98%; paddin-left: 2%">
<el-row>
<el-col :span="24">
<el-form-item label="审核编号" prop="processNo">
<el-input v-model="formDoc.processNo" placeholder="提交后自动生成" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目流程" prop="projectDocTreeId">
<el-select v-model="formProjectDocTreeId" :disabled="true">
<el-option v-for="tree in docTreeOptions" :key="tree.projectDocTreeId" :label="
tree.level1 +
'-' +
tree.level2 +
'-' +
tree.level3 +
'-' +
tree.level4 +
'-' +
tree.docName
" :value="tree.projectDocTreeId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="showPlace">
<el-col :span="24">
<el-form-item label="施工部位" prop="projectPlaceId">
<el-select v-model="formDoc.projectPlaceId" placeholder="" :disabled="true">
<el-option v-for="dict in projectPlaceOptions" :key="dict.dictValue"
:label="dict.dictLabel" :value="dict.dictLabel"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目名称" prop="projectID">
<el-select v-model="formDoc.projectId" placeholder="" @change="changeProjectId"
:disabled="true">
<el-option v-for="tree in projectByCurrentOption" :key="tree.projectId"
:label="tree.projectName" :value="tree.projectId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="标段名称" prop="projectSectionId">
<el-select v-model="formDoc.projectSectionId" placeholder=""
@change="changeProjectSection" :disabled="true">
<el-option v-for="tree in projectSectionOptions" :key="tree.projectSectionId"
:label="tree.sectionName" :value="tree.projectSectionId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div>
<el-dialog :close-on-click-modal="false" :title="dialogTitle" width="75%" :visible.sync="dialogVisible"
:before-close="dialogClose" append-to-body>
<el-row>
<el-col :span="15" class="left-box">
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon1"></div>
<div class="title">审核信息</div>
</div>
</div>
<!-- -->
<div>
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon2"></div>
<div class="title">表格内容</div>
</div>
<el-form ref="formDoc" :model="formDoc" :rules="rulesDoc" label-width="auto" class="form-doc">
<div style="width: 98%; paddin-left: 2%">
<el-row>
<el-col :span="24">
<el-form-item label="审核编号" prop="processNo">
<el-input v-model="formDoc.processNo" placeholder="提交后自动生成" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目流程" prop="projectDocTreeId">
<el-select v-model="formProjectDocTreeId" :disabled="true">
<el-option v-for="tree in docTreeOptions" :key="tree.projectDocTreeId"
:label="
tree.level1 +
'-' +
tree.level2 +
'-' +
tree.level3 +
'-' +
tree.level4 +
'-' +
tree.docName
" :value="tree.projectDocTreeId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="showPlace">
<el-col :span="24">
<el-form-item label="施工部位" prop="projectPlaceId">
<el-select v-model="formDoc.projectPlaceId" placeholder="" :disabled="true">
<el-option v-for="dict in projectPlaceOptions" :key="dict.dictValue"
:label="dict.dictLabel" :value="dict.dictLabel"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目名称" prop="projectID">
<el-select v-model="formDoc.projectId" placeholder="" @change="changeProjectId"
:disabled="true">
<el-option v-for="tree in projectByCurrentOption" :key="tree.projectId"
:label="tree.projectName" :value="tree.projectId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="标段名称" prop="projectSectionId">
<el-select v-model="formDoc.projectSectionId" placeholder=""
@change="changeProjectSection" :disabled="true">
<el-option v-for="tree in projectSectionOptions"
:key="tree.projectSectionId" :label="tree.sectionName"
:value="tree.projectSectionId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="tabel-content">
<div v-show="formProjectDocTreeId!=null" class="autoFormTable" style="width: 98%;">
<!-- 开工通知 -->
<noticeProceedTable :formDoc="formDoc" ref="noticeProceedEditTable"
v-if="formProjectDocTreeId == 155"></noticeProceedTable>
<!-- 施工技术方案申报表 -->
<declareTable :formDoc="formDoc" ref="declareEditTable"
v-else-if="formProjectDocTreeId == 50"></declareTable>
<!-- 施工技术方案审批表 -->
<approvalTable :formDoc="formDoc" ref="approvalEditTable"
v-else-if="formProjectDocTreeId == 51"></approvalTable>
<!-- -->
<div>
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon2"></div>
<div class="title">表格内容</div>
</div>
</div>
</div>
</div>
<!-- -->
<div>
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon4" style="width: 20px; height: 20px"></div>
<div class="title">上传附件</div>
<div class="tabel-content">
<div v-show="formProjectDocTreeId!=null" class="autoFormTable" style="width: 98%;">
<!-- 开工通知 -->
<noticeProceedTable :formDoc="formDoc" ref="noticeProceedEditTable"
v-if="formProjectDocTreeId == 155"></noticeProceedTable>
<!-- 施工技术方案申报表 -->
<declareTable :formDoc="formDoc" ref="declareEditTable"
v-else-if="formProjectDocTreeId == 50"></declareTable>
<!-- 施工技术方案审批表 -->
<approvalTable :formDoc="formDoc" ref="approvalEditTable"
v-else-if="formProjectDocTreeId == 51"></approvalTable>
</div>
</div>
</div>
<div style="width: 98%; paddin-left: 2%">
<div class="doc-item" v-for="(item, index) in docFile" :key="index">
<div class="doc-left">
<div class="icon-doc icon5"></div>
<a class="doc-title" :href="item.filepath">{{
item.filename
}}</a>
<!-- -->
<div>
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon4" style="width: 20px; height: 20px"></div>
<div class="title">上传附件</div>
</div>
</div>
<div style="width: 98%; paddin-left: 2%">
<div class="doc-item" v-for="(item, index) in docFile" :key="index">
<div class="doc-left">
<div class="icon-doc icon5"></div>
<a class="doc-title" :href="item.filepath">{{
item.filename
}}</a>
</div>
<div class="doc-close" v-show="false"></div>
</div>
<div class="doc-close" v-show="false"></div>
</div>
</div>
</el-form>
<!-- 按钮 -->
<div class="dialog-footer">
<el-button v-if="formDoc.currentUserCanProcess == 1" type="primary" @click="process">
</el-button>
<el-button @click="dialogClose"> </el-button>
</div>
</el-form>
<!-- 按钮 -->
<div class="dialog-footer">
<el-button v-if="formDoc.currentUserCanProcess == 1" type="primary" @click="process"> </el-button>
<el-button @click="dialogClose"> </el-button>
</div>
</el-col>
<el-col :span="9" class="right-box">
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon1"></div>
<div class="title">审核流信息</div>
</div>
<div class="title-gr-right" @click="exportPic('listDom')">
<div class="icon icon3"></div>
<div class="title">下载</div>
</el-col>
<el-col :span="9" class="right-box">
<div class="title-gr">
<div class="title-gr-left">
<div class="icon icon1"></div>
<div class="title">审核流信息</div>
</div>
<div class="title-gr-right" @click="exportPic('listDom')">
<div class="icon icon3"></div>
<div class="title">下载</div>
</div>
</div>
</div>
<div class="time-line">
<el-timeline id="listDom" :reverse="reverse" style="padding: 0; margin-left: 2px">
<el-timeline-item v-for="(activity, index) in formDoc.processList" :key="index" size="large"
color="#B9DEC5" style="height: 250px">
<el-row>
<div style="margin-bottom: 15px">
<span class="time-date">{{ activity.sendDate }}</span>
<span class="time-name">
{{ activity.processUserName }}
</span>
</div>
<div class="time-card">
<div class="time-top">
<div class="time-title">{{ activity.flowName }}</div>
<div class="time-tag">
<span v-if="
<div class="time-line">
<el-timeline id="listDom" :reverse="reverse" style="padding: 0; margin-left: 2px">
<el-timeline-item v-for="(activity, index) in formDoc.processList" :key="index"
size="large" color="#B9DEC5" style="height: 250px">
<el-row>
<div style="margin-bottom: 15px">
<span class="time-date">{{ activity.sendDate }}</span>
<span class="time-name">
{{ activity.processUserName }}
</span>
</div>
<div class="time-card">
<div class="time-top">
<div class="time-title">{{ activity.flowName }}</div>
<div class="time-tag">
<span v-if="
activity.flowPreId > 0 && activity.processState == 0
">未审批</span>
<span v-if="activity.processState == 2"></span>
<span v-if="
activity.flowPreId > 0 && activity.processState == 3
">驳回</span>
<span v-if="activity.processState == 4"></span>
</div>
<div class="time-bg" :class="
activity.flowPreId > 0 && activity.processState == 0
">未审批</span>
<span v-if="activity.processState == 2"></span>
<span v-if="
activity.flowPreId > 0 && activity.processState == 3
">驳回</span>
<span v-if="activity.processState == 4"></span>
? 'time-icon3'
: activity.processState == 2
? 'time-icon1'
: activity.flowPreId > 0 &&
activity.processState == 3
? 'time-icon2'
: activity.processState == 4
? 'time-icon2'
: 'time-icon3'
"></div>
</div>
<div class="time-bottom">
<img :src="activity.processUserSign" />
<img :src="activity.processUserSignCompany" />
</div>
<div class="time-bg" :class="
activity.flowPreId > 0 && activity.processState == 0
? 'time-icon3'
: activity.processState == 2
? 'time-icon1'
: activity.flowPreId > 0 && activity.processState == 3
? 'time-icon2'
: activity.processState == 4
? 'time-icon2'
: 'time-icon3'
"></div>
</div>
<div class="time-bottom">
<img :src="activity.processUserSign" />
<img :src="activity.processUserSignCompany" />
</div>
</div>
</el-row>
</el-timeline-item>
</el-timeline>
</el-row>
</el-timeline-item>
</el-timeline>
</div>
</el-col>
</el-row>
</el-dialog>
<el-dialog :destroy-on-close="true" top="500px" center :close-on-click-modal="false"
:visible.sync="dialogProcessVisible" :before-close="dialogProcessClose" :title="'审核'" class="dialog-ex">
<el-form ref="formProcess" :model="formProcess" label-width="120px">
<div style="width: 98%; paddin-left: 2%">
<el-row>
<el-col :span="24">
<el-form-item label="审核状态">
<el-radio-group v-model="formProcess.processState">
<el-radio :label="2">通过</el-radio>
<el-radio :label="3">驳回</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="审核意见">
<el-input type="textarea" :rows="3" placeholder="请输入审核意见"
v-model="formProcess.processContent">
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-col>
</el-row>
</el-dialog>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button v-if="formDoc.currentUserCanProcess == 1" type="primary" @click="processSubmit">
</el-button>
<el-button @click="dialogClose"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import noticeProceedTable from "../editFormTable/noticeProceedTable"; //
@ -191,7 +228,8 @@
listDocTreeByCurrentUserApp
} from "@/api/attendance/doctree";
import {
processInfoByDocId
processInfoByDocId,
process
} from "@/api/attendance/doc";
import html2Canvas from "html2canvas";
@ -218,6 +256,8 @@
},
data() {
return {
dialogProcessVisible: false,
dialogVisibleNone: true,
reverse: false,
showPlace: false,
projectByCurrentOption: [],
@ -241,6 +281,12 @@
attachmentFilePath: "",
belongTo: "section",
},
formProcess: {
projectDocId: null,
projectDocProcessId: null,
processState: null,
processContent: "",
},
formProjectDocTreeId: null,
//
rulesDoc: {
@ -267,15 +313,12 @@
this.$emit("update:dialogVisible", val);
if (val) {
this.$nextTick(() => {
console.log("loading");
this.loadDocInfo();
this.dialogVisibleNone = true;
});
}
},
dialogDocId: function(val) {
this.$nextTick(() => {
this.loadDocInfo();
});
},
formProjectDocTreeId: {
handler: function(newV) {
this.formDoc.projectDocTreeId = newV;
@ -331,13 +374,19 @@
},
dialogClose() {
this.formDocReset();
this.formProcess.processState = null;
this.formProcess.processContent = "";
this.docFile = [];
this.$emit("update:dialogVisible", false);
this.dialogVisibleNone = false;
},
dialogProcessClose() {
this.dialogProcessVisible = false;
},
process() {
this.$refs["formDoc"].validate((valid) => {
if (valid) {}
});
this.dialogProcessVisible = true;
this.formProcess.processState = null;
this.formProcess.processContent = "";
},
changeProjectId() {
let project = this.projectByCurrentOption.find(
@ -374,10 +423,6 @@
}
}
}
//docFile
//currentUserCanProcess
//currentProcessNodeName
//
}
);
}
@ -397,12 +442,39 @@
this.formDoc.attachmentFilePath = "";
this.formDoc.belongTo = "section";
},
processSubmit() {
this.formProcess.projectDocId = this.formDoc.projectDocId;
this.formProcess.projectDocProcessId = this.formDoc.projectDocProcessId;
if (this.formProcess.processState == null) {
this.$message({
message: "请选择审核结果",
type: "info",
});
return;
}
process(this.formProcess).then((response) => {
if (response.code == 200) {
this.$message({
message: "提交成功",
type: "success",
});
this.formProcess.processState = null;
this.formProcess.processContent = "";
this.dialogProcessVisible = false;
}
});
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/styles/utils.scss";
.el-dialog:not(.is-fullscreen) {
margin-top: 16vh !important;
}
::v-deep .el-dialog__body {
padding-top: 0;
padding-right: 0;
@ -419,6 +491,10 @@
background-size: 100% 100%;
}
.dialog-ex {
text-align-last: left;
}
.left-box {
display: flex;
flex-direction: column;
@ -514,6 +590,7 @@
color: #3ca45f;
margin-left: 10px;
letter-spacing: 2px;
margin-bottom: 0;
}
}
@ -530,6 +607,7 @@
font-size: 14px;
font-family: "AlibabaPuHuiTiR";
color: #9c9c9c;
margin-bottom: 0;
}
.icon {
@ -548,6 +626,7 @@
.title {
color: #1bbd6f;
margin-bottom: 0;
}
.icon3 {

@ -22,7 +22,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="项目流程" prop="projectDocTreeId">
<el-select v-model="formProjectDocTreeId" filterable>
<el-select v-model="formProjectDocTreeId">
<el-option v-for="tree in docTreeOptions" :key="tree.projectDocTreeId" :label="
tree.level1 +
'-' +
@ -168,10 +168,15 @@
import noticeProceedTable from "../addFormTable/noticeProceedTable"; //
import declareTable from "../addFormTable/declareTable"; //
import approvalTable from "../addFormTable/approvalTable"; //
import { addData,getContractInfo } from "@/api/attendance/getTableInfo"; //word
import {
addData,
getContractInfo
} from "@/api/attendance/getTableInfo"; //word
import {
getToken
} from "@/utils/auth";
import {
listbycurrentuser
} from "@/api/attendance/project";
@ -451,9 +456,12 @@
contractData = res.data;
switch (_this.formDoc.projectDocTreeId) {
case 155:
_this.$refs.noticeProceedTable.tableObj.contract_name = contractData.contractName; //
_this.$refs.noticeProceedTable.tableObj.contract_code = contractData.contractNo; //
_this.$refs.noticeProceedTable.tableObj.contractor = contractData.sectionLeader; //
_this.$refs.noticeProceedTable.tableObj.contract_name = contractData
.contractName; //
_this.$refs.noticeProceedTable.tableObj.contract_code = contractData
.contractNo; //
_this.$refs.noticeProceedTable.tableObj.contractor = contractData
.sectionLeader; //
break;
case 50:
_this.$refs.declareTable.tableObj.fill_3 = contractData.contractName; //
@ -741,6 +749,7 @@
color: #3ca45f;
margin-left: 10px;
letter-spacing: 2px;
margin-bottom: 0;
}
}
@ -757,6 +766,7 @@
font-size: 14px;
font-family: "AlibabaPuHuiTiR";
color: #9c9c9c;
margin-bottom: 0;
}
.icon {

@ -1,84 +1,239 @@
<template>
<div>
<el-dialog :destroy-on-close="true" v-if="dialogVisibleNone" :close-on-click-modal="false" :title="dialogTitle" width="60%"
:visible.sync="dialogVisible" @close="dialogClose"
append-to-body>
<div v-for="(item,index) in processList" style="margin:10px 10px 60px 10px;">
<div>
<div>{{ item.flowName }}</div>
<div>---------------------</div>
<div>
<span style="padding:10px;">{{ item.flowProcessSectionPersonTypeName }}</span>
<el-dialog
:destroy-on-close="true"
v-if="dialogVisibleNone"
:close-on-click-modal="false"
:title="dialogTitle"
width="60%"
:visible.sync="dialogVisible"
@close="dialogClose"
append-to-body
>
<div class="time-line">
<el-timeline
id="listDom"
:reverse="reverse"
style="padding: 0; margin-left: 2px"
>
<el-timeline-item
v-for="(activity, index) in processList"
:key="index"
:size="large"
color="#B9DEC5"
>
<el-row>
<div class="time-card">
<div class="time-top">
<div class="time-title">{{ activity.flowName }}</div>
</div>
<div class="time-bottom">
<div
class="time-item"
v-for="(item, index) in toArray(
activity.flowProcessSectionPersonTypeName
)"
:key="index"
>
<span class="title">{{ item }}</span>
</div>
</div>
</div>
</el-row>
</el-timeline-item>
</el-timeline>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="Save" > </el-button>
<el-button @click="dialogClose"> </el-button>
</div>
</el-dialog>
<!-- <div
v-for="(item, index) in processList"
style="margin: 10px 10px 60px 10px"
>
<div>
<div>{{ item.flowName }}</div>
<div>---------------------</div>
<div>
<span style="padding: 10px">{{
item.flowProcessSectionPersonTypeName
}}</span>
</div>
</div>
</div> -->
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="Save"> </el-button>
<el-button @click="dialogClose"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listDocFlowNodeList } from "@/api/attendance/doctree";
import { listDocFlowNodeList } from "@/api/attendance/doctree";
export default {
name: "processConfigDialog",
props: {
dialogVisible: {
type: Boolean,
default: false
name: "processConfigDialog",
props: {
dialogVisible: {
type: Boolean,
default: false,
},
dialogTitle: {
type: String,
default: "",
},
dialogDocTreeId: {
type: Number,
default: 0,
},
},
data() {
return {
dialogVisibleNone: true,
processList: [],
};
},
dialogTitle: {
type: String,
default: ''
watch: {
dialogVisible: function (val) {
this.$emit("update:dialogVisible", val);
if (val) {
this.$nextTick(() => {
this.loadDocInfo();
this.dialogVisibleNone = true;
});
}
},
},
dialogDocTreeId: {
type: Number,
default: 0
created() {},
methods: {
toArray(data) {
return data.split(",");
},
Save() {},
dialogClose() {
this.$emit("update:dialogVisible", false);
this.dialogVisibleNone = false;
},
loadDocInfo() {
if (this.dialogDocTreeId != null) {
listDocFlowNodeList({ projectDocTreeId: this.dialogDocTreeId }).then(
(response) => {
this.processList = response.rows;
}
);
}
},
},
};
</script>
<style lang="scss" scoped>
.el-dialog:not(.is-fullscreen) {
margin-top: 16vh !important;
}
::v-deep .el-dialog__body {
background: #f7f7f7;
}
::v-deep .el-dialog__footer {
background: #f7f7f7;
}
::v-deep .el-timeline-item__tail {
border-left: 2px solid #b9dec5;
}
::v-deep .el-timeline-item__node {
background-image: url("../../../assets/images/bozhou/icon-point.png");
background-repeat: no-repeat;
background-size: 100% 100%;
}
.time-line {
overflow-y: auto;
overflow-x: hidden;
height: 500px;
&::-webkit-scrollbar {
/*滚动条整体样式*/
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
&::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
// border-radius: 10px;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
background: #a0c6a8;
}
},
data() {
return {
dialogVisibleNone:true,
processList:[],
&::-webkit-scrollbar-track {
/*滚动条里面轨道*/
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
// border-radius: 10px;
background: #ededed;
}
},
watch: {
dialogVisible: function(val) {
this.$emit('update:dialogVisible', val)
if (val) {
this.$nextTick(() => {
this.loadDocInfo();
this.dialogVisibleNone=true;
})
}
.time-date {
font-size: 16px;
font-family: "AlibabaPuHuiTiR";
color: #2ea957;
}
.time-name {
margin-left: 10px;
font-size: 16px;
font-family: "AlibabaPuHuiTiR";
color: #404d44;
}
.time-card {
background: #ffffff;
border-radius: 10px;
padding: 16px 20px;
position: relative;
margin-right: 14px;
.time-top {
position: relative;
.time-title {
font-size: 14px;
font-family: "AlibabaPuHuiTiB";
font-weight: bold;
color: #404d44;
padding-bottom: 15px;
border-bottom: 1px solid #e6e6e6;
}
.time-tag {
position: absolute;
top: 0;
right: 0;
z-index: 55;
width: 61px;
color: #ffffff;
text-align: center;
}
},
},
created() {
},
methods: {
Save(){
.time-bg {
position: absolute;
top: 0;
right: 0;
z-index: 54;
width: 61px;
height: 21px;
}
}
},
dialogClose() {
this.$emit('update:dialogVisible', false);
this.dialogVisibleNone = false;
},
loadDocInfo() {
if(this.dialogDocTreeId!=null){
listDocFlowNodeList({projectDocTreeId:this.dialogDocTreeId}).then((response) => {
this.processList = response.rows;
});
.time-bottom {
padding-top: 17px;
display: flex;
.time-item {
width: 70px;
height: 70px;
background: #84caaf;
border-radius: 50%;
margin: 0 10px;
padding: 5px;
display: flex;
justify-content: center;
align-items: center;
.title {
color: #fff;
text-align: center;
}
}
},
}
}
</script>
<style>
.el-dialog:not(.is-fullscreen) {
margin-top: 16vh !important;
}
}
</style>

@ -39,15 +39,13 @@
<el-table
v-loading="loading"
:data="projectDocTreeList" header-cell-class-name="table-header-diy"
:data="projectDocTreeList"
header-cell-class-name="table-header-diy"
row-class-name="table-rows-diy"
cell-class-name="table-cell-diy"
>
<el-table-column
type="index"
label="序号"
width="50" align="center" >
</el-table-column>
<el-table-column type="index" label="序号" width="50" align="center">
</el-table-column>
<el-table-column label="一级" align="left" prop="level1" />
<el-table-column label="二级" align="left" prop="level2" />
<el-table-column label="三级" align="left" prop="level3" />
@ -72,30 +70,34 @@
</template>
</el-table-column>
</el-table>
<pagination
class="pageination-diy"
popper-class="pageselcss"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<processConfigDialog :dialog-visible.sync="open" :dialog-title="title" :dialog-doc-tree-id="projectDocTreeId" />
<pagination
class="pageination-diy"
popper-class="pageselcss"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<processConfigDialog
:dialog-visible.sync="open"
:dialog-title="title"
:dialog-doc-tree-id="projectDocTreeId"
/>
</div>
</template>
<script>
import { listDocTree } from "@/api/attendance/doctree";
import processConfigDialog from "../../components/processConfigDialog"
import processConfigDialog from "../../components/processConfigDialog";
export default {
components: { processConfigDialog},
components: { processConfigDialog },
name: "",
//
//
data() {
return {
projectDocTreeId: null,
//
infoTitle: '',
infoTitle: "",
//
loading: true,
//
@ -116,25 +118,25 @@ export default {
title: "",
//
open: false,
curtabIsFirst:true,
curtabIsFirst: true,
//
queryParams: {
pageNum: 1,
pageSize: 10,
belongTo:'section',
level1: '',
level2: '',
level3: '',
level4: '',
docName:''
belongTo: "section",
level1: "",
level2: "",
level3: "",
level4: "",
docName: "",
},
statusOptions: [],
dateRange: [],
//projectTypeData:[],
dialogUsersVisible:false,
curSelectTypeId:'',
curSelectTypeName:'',
curDefUserData:[]
dialogUsersVisible: false,
curSelectTypeId: "",
curSelectTypeName: "",
curDefUserData: [],
};
},
@ -144,13 +146,12 @@ export default {
methods: {
/** 查询项目列表 */
getList() {
this.loading = true;
listDocTree(this.queryParams).then((response) => {
this.projectDocTreeList = response.rows;
this.total = response.total;
this.loading = false;
});
this.loading = true;
listDocTree(this.queryParams).then((response) => {
this.projectDocTreeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
@ -170,13 +171,12 @@ export default {
// this.infoTitle = "";
// });
// },
handleView(row){
handleView(row) {
this.projectDocTreeId = row.projectDocTreeId;
this.open= true;
}
this.open = true;
this.title = "查看业务流程";
},
},
};
</script>
<style lang="scss" scoped>
</style>
<style lang="scss" scoped></style>

@ -202,13 +202,6 @@
this.tableObj = res.data;
if (_this.formDoc.processList.length > 0) {
_this.formDoc.processList.map((item) => {
return item.flowPreId;
});
_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0);
let list = this.formDoc.processList.slice(_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0) + 1);

@ -176,13 +176,6 @@
this.tableObj = res.data;
if (_this.formDoc.processList.length > 0) {
_this.formDoc.processList.map((item) => {
return item.flowPreId;
});
_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0);
let list = this.formDoc.processList.slice(_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0) + 1);

@ -205,13 +205,6 @@
_this.tableObj = tableData;
_this.dateTime = tableData.start_year + "-" + tableData.start_month + "-" + tableData.start_day;
if (_this.formDoc.processList.length > 0) {
_this.formDoc.processList.map((item) => {
return item.flowPreId;
});
_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0);
let list = this.formDoc.processList.slice(_this.formDoc.processList.map((item) => {
return item.flowPreId;
}).lastIndexOf(0) + 1);

Loading…
Cancel
Save