diff --git a/common/http.api.js b/common/http.api.js
index 271cdd2..b28db6b 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -64,6 +64,7 @@ const install = (Vue, vm) => {
let oplCateItem = (id) => vm.$u.get(`/opm/opl_cate/${id}/`); //作业许可证类型详情
let oplCreate = (data = {}) => vm.$u.post('/opm/opl/', data); //添加新许可证
let oplUpdate = (id,data = {}) => vm.$u.put(`/opm/opl/${id}/`, data); //编辑许可证
+ let oplDelete = (id) => vm.$u.delete(`/opm/opl/${id}/`); //删除许可证
let oplWorker = (data = {}) => vm.$u.get('/opm/opl_worker/', data); //作业许可证工作人员
let oplWorkerCreate = (data = {}) => vm.$u.post('/opm/opl_worker/', data); //作业许可证工作人员创建
let oplWorkerDelete = (id) => vm.$u.delete(`/opm/opl_worker/${id}/`); //作业许可证工作人员删除
@@ -176,6 +177,7 @@ const install = (Vue, vm) => {
oplCate,
oplCreate,
oplUpdate,
+ oplDelete,
oplWorker,
oplWorkerCreate,
oplGasList,
diff --git a/pages/workSpace/operation/operationDetail.vue b/pages/workSpace/operation/operationDetail.vue
index 86b6f6f..3be6dda 100644
--- a/pages/workSpace/operation/operationDetail.vue
+++ b/pages/workSpace/operation/operationDetail.vue
@@ -10,6 +10,12 @@
{{formData.name}}
+
+ 作业状态
+
+ {{stateOptions[formData.state]}}
+
+
具体地点
@@ -112,6 +118,13 @@
4: "已完成",
5: "已关闭",
},
+ stateOptions: {
+ 10: "创建中",
+ 20: "审批中",
+ 30: "待作业",
+ 40: "作业中",
+ 50: "已关闭",
+ },
}
},
onLoad(params) {
diff --git a/pages/workSpace/operation/oplCate.vue b/pages/workSpace/operation/oplCate.vue
index 06953ac..466ab44 100644
--- a/pages/workSpace/operation/oplCate.vue
+++ b/pages/workSpace/operation/oplCate.vue
@@ -4,14 +4,15 @@
leftIcon="left" border backgroundColor="#2cade8" color="#fff" fixed statusBar shadow>
已添加许可证：
-
+
- {{item.name}}
{{item.cate_name}}
{{item.level}}
+ {{item.ticket_.state_.name }}-{{act_states[item.ticket_.act_state]}}
-
-
+
+
+
@@ -54,6 +55,14 @@
},
oplCateList: [],
oplList: [],
+ act_states: {
+ 0: "草稿中",
+ 1: "进行中",
+ 2: "被退回",
+ 3: "被撤回",
+ 4: "已完成",
+ 5: "已关闭",
+ },
}
},
onLoad(params) {
@@ -91,15 +100,19 @@
if(type==='edit'){
oplCate = row.cate_name;
params = `?oplId=${row.id}&oplcateId=${row.cate_.id}&operationId=${this.operationId}&type=${type}`;
- }else{
+ }else if(type=='add'){
oplCate = row.name;
params = `?oplcateId=${row.id}&operationId=${this.operationId}&type=${type}`;
+ }else if(type=='delete'){
+ this.$u.api.oplDelete(row.id).then(res => {
+ this.getOplLists()
+ })
}
- if(oplCate==='动火'){
+ if(oplCate==='动火'){
uni.navigateTo({
url: '../opls/fire' + params
})
- }
+ }
},
select(row) {},
@@ -172,6 +185,12 @@
background-size: cover;
background-image: url('@/static/workSpace/new_apply/update.png');
}
+ .oplDeleteImg {
+ width: 40rpx;
+ height: 40upx;
+ background-size: cover;
+ background-image: url('@/static/workSpace/new_apply/del.png');
+ }
.oplAddImg {
width: 40rpx;
height: 40upx;
diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue
index 989c62b..435c20a 100644
--- a/pages/workSpace/operation/oplDetail.vue
+++ b/pages/workSpace/operation/oplDetail.vue
@@ -82,12 +82,14 @@
姓名
- 工作职责
+ 职责
+ 证书
操作
- {{item.worker_name}}
+ {{item.worker_name}}
{{item.duty}}
+ {{item.certificates.length}}张
绑卡
解绑
@@ -235,6 +237,12 @@
delta: 1
})
},
+ viewWorker(item) {
+ uni.showToast({
+ title: item.id,
+ icon: 'none'
+ })
+ }
}
}
diff --git a/pages/workSpace/rpj/rpjDetail.vue b/pages/workSpace/rpj/rpjDetail.vue
index d0c8d0a..3301ba5 100644
--- a/pages/workSpace/rpj/rpjDetail.vue
+++ b/pages/workSpace/rpj/rpjDetail.vue
@@ -10,6 +10,12 @@
{{formData.name}}
+
+ 项目状态
+
+ {{stateOptions[formData.state]}}
+
+
项目类型
@@ -49,12 +55,12 @@
资料：
-
+
资质内容
文献资料
-
+
{{item1.file_cate_.name}}
@@ -71,16 +77,18 @@
暂无相关资料
- 作业人员：
+ 项目人员：
姓名
工作职责
+ 证书
操作
- {{item.remployee_.name}}
+ {{item.remployee_.name}}
{{item.duty}}
+ {{item.rcertificates.length}}张
绑卡
解绑
@@ -107,7 +115,7 @@
rparty_name:'',
},
workerList:[],
- certificateList:[],
+ fileList:[],
stateOptions: {
10: "创建中",
20: "审批中",
@@ -138,7 +146,7 @@
},
onShow() {
this.getworkerList();//工作人员
- this.getcertificateList();//证书
+ this.getFileList();//证书
},
methods: {
//获取工作operation
@@ -157,11 +165,11 @@
})
},
- //获取证书
- getcertificateList(){
+ //获取入厂资料
+ getFileList(){
let that = this;
that.$u.api.rpjFileList({rpj: that.rpjId, page: 0}).then(res => {
- that.certificateList =res.filter(item=>{
+ that.fileList =res.filter(item=>{
return item.files.length>0
});
})
@@ -202,6 +210,12 @@
delta: 1
})
},
+ viewMember(item) {
+ uni.showToast({
+ title: item.id,
+ icon: 'none'
+ })
+ }
}
}
diff --git a/pages/workSpace/visit/visitDetail.vue b/pages/workSpace/visit/visitDetail.vue
index 3ec7473..d1dfe27 100644
--- a/pages/workSpace/visit/visitDetail.vue
+++ b/pages/workSpace/visit/visitDetail.vue
@@ -10,6 +10,12 @@
{{purposeOptions[formData.purpose]}}
+
+ 来访状态
+
+ {{stateOptions[formData.state]}}
+
+
来访概述
@@ -37,7 +43,7 @@
接待人
- {{formData.receptionist}}
+ {{formData.receptionist_.name}}
@@ -64,12 +70,14 @@
姓名
- 手机号
+ 主访
操作
- {{item.visitor_.name}}
- {{item.visitor_.phone}}
+ {{item.visitor_.name}}
+
+ 是
+
绑卡
解绑
@@ -94,6 +102,14 @@
40: "开会",
50: "拉送货"
},
+ stateOptions: {
+ 10: "创建中",
+ 20: "审批中",
+ 30: "待入厂",
+ 40: "进行中",
+ 50: "已完成",
+ 60: "已关闭",
+ },
levelOptions: {
10: "一般",
20: "重要",
@@ -150,7 +166,12 @@
delta: 1
})
},
-
+ viewPeople(item) {
+ uni.showToast({
+ title: item.id,
+ icon: 'none'
+ })
+ }
}
}