diff --git a/common/http.api.js b/common/http.api.js
index 017b58c..ec834b2 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -47,6 +47,7 @@ const install = (Vue, vm) => {
let addNodeEnd = (id, data = {}) => vm.$u.get(`/wf/ticket/${id}/add_node_end/`, data); //加签处理
let deliver = (id, data = {}) => vm.$u.get(`/wf/ticket/${id}/deliver/`, data); //转交工单
let ticketHandle = (id, data = {}) => vm.$u.post(`/wf/ticket/${id}/handle/`, data); //工单处理
+ let ticketAccept = (id) => vm.$u.post(`/wf/ticket/${id}/accpet/`); //接单
let operationList = (data = {}) => vm.$u.get('/opm/operation/', data); //作业列表
let operationItem = (id) => vm.$u.get(`/opm/operation/${id}/`); //作业详情
@@ -95,6 +96,7 @@ const install = (Vue, vm) => {
userList,
deptList,
ticketCreate,
+ ticketAccept,
getDickey,
getTickets,
getTicketItem,
diff --git a/pages.json b/pages.json
index 803079f..b360379 100644
--- a/pages.json
+++ b/pages.json
@@ -52,6 +52,13 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/home/list/ticketAll",
+ "style": {
+ "navigationBarTitleText": "所有工单",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/home/list/warning",
"style": {
diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue
index 8eadb6a..313b41b 100644
--- a/pages/home/detail/ticketHandle.vue
+++ b/pages/home/detail/ticketHandle.vue
@@ -5,12 +5,12 @@
-
+
工单流水号
-
+ {{ticketDetail.sn}}
@@ -18,31 +18,26 @@
- 作业名称
+ 来访概述
-
-
-
-
-
-
- 开始时间
-
-
-
- {{formData.start_time}}
-
+ {{visitDetail.name }}
- 结束时间
+ 来访单位
-
-
- {{formData.end_time}}
-
+
+ {{visitDetail.company }}
+
+
+
+
+ 来访人数
+
+
+ {{ visitDetail.count_people }}
@@ -50,50 +45,48 @@
状态
-
-
-
-
-
-
- 作业区域
-
-
-
+ {{state_[visitDetail.state] }}
- 业务部门
+ 来访时间
-
+ {{visitDetail.visit_time}}
-
- 部门协调员
+ 离开时间
-
+ {{visitDetail.leave_time}}
-
- 属地部门
+ 来访事由
-
+ {{purpose_[visitDetail.purpose] }}
-
- *
- 审批意见
+
+ 来访详述
+
+
+ {{visitDetail.description }}
+
+
+
+
+ 接待人
+
+
+ {{visitDetail.receptionist_name}}
-
@@ -102,15 +95,14 @@
-
-
+
-
+
工单流水号
-
+ {{ticketDetail.sn}}
@@ -118,31 +110,34 @@
- 作业名称
+ 相关方
-
-
-
-
-
-
- 开始时间
-
-
-
- {{formData.start_time}}
-
+ {{rpjDetail.rparty_name }}
- 结束时间
+ 入厂项目
-
-
- {{formData.end_time}}
-
+
+ {{rpjDetail.name }}
+
+
+
+
+ 项目类型
+
+
+ {{rpjType_[rpjDetail.type]}}
+
+
+
+
+ 合同编号
+
+
+ {{ rpjDetail.contract_number }}
@@ -150,59 +145,57 @@
状态
-
-
-
-
-
-
- 作业区域
-
-
-
+ {{state_[rpjDetail.state] }}
- 业务部门
+ 进厂时间
-
+ {{rpjDetail.come_time}}
-
- 部门协调员
+ 离厂时间
-
+ {{rpjDetail.leave_time}}
-
- 属地部门
+ 所属部门
-
+ {{rpjDetail.belong_dept_name }}
-
- *
- 审批意见
+
+ 来访详述
+
+
+ {{rpjDetail.description }}
+
+
+
+
+ 接待人
+
+
+ {{rpjDetail.receptionist_name}}
-
-
+
-
+
@@ -217,7 +210,7 @@
工单名称
- {{oplDetail.ticket_.title}}
+ {{oplDetail.ticket_.title}}
@@ -225,7 +218,7 @@
工单状态
- {{oplDetail.ticket_.state_.name}}
+ {{oplDetail.ticket_.state_.name}}
@@ -235,7 +228,7 @@
作业名称
- {{oplDetail.operation_.name}}
+ {{oplDetail.operation_.name}}
@@ -243,7 +236,7 @@
具体地点
- {{oplDetail.operation_.place}}
+ {{oplDetail.operation_.place}}
@@ -251,7 +244,7 @@
作业状态
- {{state_[oplDetail.operation_.state]}}
+ {{state_[oplDetail.operation_.state]}}
@@ -259,7 +252,7 @@
生产状态
- {{oplDetail.operation_.state_work }}
+ {{oplDetail.operation_.state_work }}
@@ -267,7 +260,7 @@
作业区域
- {{oplDetail.operation_.area_.name}}
+ {{oplDetail.operation_.area_.name}}
@@ -275,7 +268,7 @@
业务部门
- {{oplDetail.operation_.dept_bus_.name}}
+ {{oplDetail.operation_.dept_bus_.name}}
@@ -283,7 +276,7 @@
属地部门
- {{oplDetail.operation_.dept_ter_.name}}
+ {{oplDetail.operation_.dept_ter_.name}}
@@ -291,7 +284,7 @@
部门协调员
- {{oplDetail.operation_.coordinator_.name}}
+ {{oplDetail.operation_.coordinator_.name}}
@@ -326,7 +319,7 @@
作业部门
- {{oplDetail.dept_do_.name}}
+ {{oplDetail.dept_do_.name}}
@@ -334,7 +327,7 @@
作业负责人
- {{oplDetail.charger_.name}}
+ {{oplDetail.charger_.name}}
@@ -342,7 +335,7 @@
作业监护人
- {{oplDetail.monitor_.name}}
+ {{oplDetail.monitor_.name}}
@@ -364,44 +357,45 @@
-
-
-
- *
- 作业情况
+
+
+
+
+ *
+ 作业情况
+
+
+
+
+
+ *
+ 关闭处理
+
+
+
+
+
+ *
+ 审批意见
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- *
- 关闭处理
-
-
-
-
-
- *
- 审批意见
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -528,7 +522,7 @@
}
},
onLoad(params) {
- // debugger;
+ debugger;
console.log(params)
that = this;
that.ticketId = params.ticketId;
@@ -537,9 +531,11 @@
that.type = params.type;
},
onShow() {
+ debugger;
+ console.log(this.type)
if (this.cateType === 'visit') {
this.getVisit();
- } else if (this.cateType === 'rparty') {
+ } else if (this.cateType === 'rpj') {
this.getRpj();
} else {
this.getOpl();
@@ -557,13 +553,15 @@
},
//访客详情
getVisit() {
- this.$u.api.getVisit(this.ticketId).then(res => {
+ debugger;
+ this.$u.api.visitItem(this.projectId).then(res => {
+ debugger;
this.visitDetail = res;
})
},
//入厂项目详情
getRpj() {
- this.$u.api.getRpj(this.projectId).then((res) => {
+ this.$u.api.rpjItem(this.projectId).then((res) => {
// debugger;
this.rpjDetail = res;
});
@@ -571,7 +569,7 @@
//许可证详情
getOpl() {
- this.$u.api.getOpl(this.projectId).then((res) => {
+ this.$u.api.oplItem(this.projectId).then((res) => {
// debugger;
this.oplDetail = res;
});
diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue
index 4a3bda8..24a2a78 100644
--- a/pages/home/list/ticket.vue
+++ b/pages/home/list/ticket.vue
@@ -2,18 +2,48 @@
-
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 我的代办
+ 全部工单
+
+
+
+
+
@@ -27,10 +57,14 @@
更新时间：{{val.update_time}}
-
+
处理
+
+
+ 查看
+
@@ -43,9 +77,13 @@
name: 'ticket',
data() {
return {
- search: '',
- pageSize: 10,
- pageNum: 1,
+ params:{
+ search: '',
+ pageSize: 10,
+ pageNum: 1,
+ category:'duty'
+ },
+ isHetongShow:false,
totalNum: 0,
ticketList: [],
}
@@ -55,7 +93,7 @@
const totalPage = Math.ceil(this.totalNum / this.pageSize);
if (this.pageNum < totalPage) {
this.pageNum += 1;
- this._getMyApplyList(false);
+ this.getTicketLists();
} else {
uni.showToast({
title: "已全部加载",
@@ -76,23 +114,15 @@
methods: {
getTicketLists() {
let that = this;
- let obj = {};
- obj.category = 'all';
- obj.pageNum = this.pageNum;
- obj.pageSize = this.pageSize;
- if (that.search !== '') {
- obj.search = that.search;
- }
- obj.pageSize = this.pageSize;
- that.$u.api.getTickets(obj).then(res => {
+ that.$u.api.getTickets(that.params).then(res => {
that.ticketList = that.ticketList.concat(res.results);
this.totalNum = res.count;
})
},
- ticketHandle(val) {
- let projectId = val.ticket_data.opl;//项目、许可证Id
+ ticketHandle(val,type) {
+ let projectId = val.ticket_data.visit?val.ticket_data.visit:val.ticket_data.rpj?val.ticket_data.rpj:val.ticket_data.opl;//项目、许可证Id visit
let catetype = val.workflow_.key;
- const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type='handle'`;
+ const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type=${type}`;
uni.navigateTo({
url: '../detail/ticketHandle' + params,
})
@@ -114,6 +144,12 @@
this.ticketList = [];
this.getTicketLists();
},
+ searchShowAll(){
+ debugger;
+ uni.navigateTo({
+ url: './ticketAll',
+ })
+ },
}
}
@@ -124,7 +160,8 @@
}
>>>.uni-navbar__header,
- >>>.uni-status-bar {
+ >>>.uni-status-bar ,
+ .search-wrap{
background-image: linear-gradient(254deg,
#0ca7ee 0%,
#005aff 100%,
@@ -194,6 +231,10 @@
.shenhezhong {
color: #2c6fd9;
}
+
+ .shenhejieshu {
+ color: #15a306;
+ }
.shenhe-status image {
width: 26rpx;
@@ -207,21 +248,22 @@
left: 0;
right: 0;
z-index: 999;
+ background-color: #f3fbff;
}
.search-wrap {
- background-blend-mode: normal,
- normal;
- padding-bottom: 44rpx;
+ background-blend-mode: normal,normal;
+ padding-bottom: 20rpx;
padding-top: 20rpx;
+ display: flex;
+ justify-content: space-around;
}
.search-body {
- width: 715rpx;
+ width: 600upx;
height: 78rpx;
background-color: #ffffff;
border-radius: 39rpx;
- margin: 0 auto;
padding: 13rpx;
padding-left: 25rpx;
box-sizing: border-box;
@@ -260,4 +302,53 @@
color: #ffffff;
text-align: center;
}
+ .right-btn.allBtn{
+ margin: 13rpx 0;
+ }
+
+
+ /* 主体-导航栏样式*/
+ .tabbar-title {
+ background-color: #FFFFFF;
+ height: 100rpx;
+ display: flex;
+ /* justify-content: space-between; */
+ padding: 0rpx 32rpx;
+ box-sizing: border-box;
+ font-size: 32rpx;
+ line-height: 100rpx;
+ color: #505050;
+ }
+
+ .text-title {
+ position: relative;
+ margin-right: 40upx;
+ }
+
+ .active.text-title::after {
+ content: "";
+ width: 46rpx;
+ height: 4rpx;
+ background-image: linear-gradient(90deg,
+ #164cc3 0%,
+ #2c6fd9 100%),
+ linear-gradient(#085f56,
+ #085f56);
+ background-blend-mode: normal,
+ normal;
+ border-radius: 2rpx;
+ position: absolute;
+ bottom: 20rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ .right-img {
+ width: 32rpx;
+ height: 31rpx;
+ vertical-align: middle;
+ margin-right: 9rpx;
+ }
+
+
diff --git a/pages/home/list/ticketAll.vue b/pages/home/list/ticketAll.vue
new file mode 100644
index 0000000..ab7119a
--- /dev/null
+++ b/pages/home/list/ticketAll.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+ {{val.title}}
+
+
+ 所属工作流：{{val.workflow_.name}}
+ 工单状态：{{val.state_.name}}
+ 提交时间：{{val.create_time}}
+ 更新时间：{{val.update_time}}
+
+
+
+
+ 接单
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/my/myInfo.vue b/pages/my/myInfo.vue
index 2d992c5..76ddaf5 100644
--- a/pages/my/myInfo.vue
+++ b/pages/my/myInfo.vue
@@ -4,38 +4,38 @@
leftIcon="left" border backgroundColor="#2cade8" color="#fff" fixed statusBar shadow>
-
- 姓名
+
+ 姓名
{{userInfo.name}}
-
+
编号
{{userInfo.number}}
-
+
身份证号
{{userInfo.id_number}}
-
+
学历
{{userInfo.qualification}}
-
- 性别
+
+ 性别
{{userInfo.gender}}
-
-
+
+
岗位
{{userInfo.post_name}}
@@ -48,15 +48,18 @@
-
-
+
+ 信息修改：
+
+
+
手机号
-
+
邮箱
@@ -65,8 +68,8 @@
证件照
-
+
@@ -142,12 +145,15 @@
}
.item {
- border-bottom: 1rpx solid #eeeeee;
margin: 0rpx 32rpx;
display: flex;
margin-top: 20rpx;
}
-
+
+ .item_bottom_border{
+ border-bottom: 1rpx solid #eeeeee;
+ }
+
.title {
color: #212121;
flex: 1;