diff --git a/common/http.api.js b/common/http.api.js
index d8dcdea..2837700 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -37,8 +37,14 @@ const install = (Vue, vm) => {
let deliver = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/deliver/`,data);//转交工单
let ticketHandle = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/handle/`,data);//工单处理
-
let operationCreat = (data = {}) => vm.$u.post('/opm/operation/', data);//作业
+ let operationItem = (id) => vm.$u.get(`/opm/operation/${id}/`);//作业许可证类型
+ let getOpreation = (id)=>vm.$u.get(`/opm/operation/${id}/`);//rpj查询
+ let getOpl = (id)=>vm.$u.get(`/opm/opl/${id}/`);//opl作业许可证查询
+ let oplLists = (data = {}) => vm.$u.get('/opm/opl/', data);//作业许可证
+ let oplCate = (data = {}) => vm.$u.get('/opm/opl_cate/', data);//作业许可证类型
+ let oplCateItem = (id) => vm.$u.get(`/opm/opl_cate/${id}/`);//作业许可证类型详情
+
let areaLists = (data = {}) => vm.$u.get('/am/area/', data);//作业区域
@@ -47,8 +53,7 @@ const install = (Vue, vm) => {
let addVisitor = (data={})=>vm.$u.post(`vm/visitor/`,data);//visitor添加
let getRpj = (id)=>vm.$u.get(`/rpm/rpj/${id}`);//rpj查询
- let getOpreation = (id)=>vm.$u.get(`/opm/operation/${id}/`);//rpj查询
- let getOpl = (id)=>vm.$u.get(`/opm/opl/${id}/`);//opl作业许可证查询
+
vm.$u.api = {getUserInfo,
getCode,
@@ -69,8 +74,11 @@ const install = (Vue, vm) => {
addVisitor,
getRpj,
getOpreation,
+ oplCateItem,
+ oplLists,
getOpl,
-
+ oplCate,
+ operationItem,
operationCreat,
areaLists
};
diff --git a/pages.json b/pages.json
index 780cb70..906d6a1 100644
--- a/pages.json
+++ b/pages.json
@@ -139,6 +139,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/workSpace/list/oplCate",
+ "style": {
+ "navigationBarTitleText": "许可证类型",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/workSpace/list/rpj",
"style": {
@@ -155,6 +163,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/workSpace/opls/fire",
+ "style": {
+ "navigationBarTitleText": "动火许可证",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/my/my",
"style": {
diff --git a/pages/workSpace/list/oplCate.vue b/pages/workSpace/list/oplCate.vue
new file mode 100644
index 0000000..5aabc0e
--- /dev/null
+++ b/pages/workSpace/list/oplCate.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+ {{row.name}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workSpace/newWork/userList.vue b/pages/workSpace/newWork/userList.vue
index 66b6242..4d61ca8 100644
--- a/pages/workSpace/newWork/userList.vue
+++ b/pages/workSpace/newWork/userList.vue
@@ -76,12 +76,18 @@
methods: {
//获取用户
getUserRange() {
+ let that = this;
this.$u.api.vmVisitor({
page: 0
}).then(res => {
- debugger;
- console.log(res)
- this.userRange = res;
+ that.userRange = [];
+ res.forEach(item=>{
+ let obj = {};
+ obj=item;
+ obj.checked = false;
+ that.userRange.push(obj)
+ })
+
})
},
select(row) {},
@@ -114,7 +120,7 @@
.apply-info {
min-height: 70vh;
- width: 360px;
+ width: 710upx;
margin: 0 auto;
background-color: #FFFFFF;
border-radius: 5px;
diff --git a/pages/workSpace/newWork/visit.vue b/pages/workSpace/newWork/visit.vue
index c2f70d8..a381513 100644
--- a/pages/workSpace/newWork/visit.vue
+++ b/pages/workSpace/newWork/visit.vue
@@ -10,7 +10,7 @@
来访事由
-
+
@@ -62,7 +62,7 @@
接待人
-
+
@@ -81,7 +81,7 @@
来访级别
-
+
@@ -91,7 +91,7 @@
来访人数
-
+
diff --git a/pages/workSpace/newWork/work.vue b/pages/workSpace/newWork/work.vue
index e9e3f78..cb8ec2f 100644
--- a/pages/workSpace/newWork/work.vue
+++ b/pages/workSpace/newWork/work.vue
@@ -49,7 +49,7 @@
生产状态
-
+
@@ -60,7 +60,7 @@
作业区域
-
+
@@ -82,7 +82,7 @@
部门协调员
-
+
@@ -121,7 +121,7 @@
date: currentDate,
formData: {
name: '', //作业简述
- state: '', //作业状态
+ // state: '', //作业状态
place: '', //具体地点
start_time: currentDate, //作业开始时间
end_time: currentDate, //作业结束时间
@@ -198,12 +198,15 @@
},
methods: {
saveSubmit() {
- debugger;
console.log(this.formData)
- that.$u.api.operationCreat(this.formData).then(res => {
- that.depRange = that.redata(res);
+ this.formData.start_time = new Date(this.formData.start_time).toISOString();
+ this.formData.end_time = new Date(this.formData.end_time).toISOString();
+ this.$u.api.operationCreat(this.formData).then(res => {
debugger;
- console.log(that.depRange)
+ let params = `?operationId=${res.id}`;
+ uni.navigateTo({
+ url: '/pages/workSpace/list/oplCate'+params
+ })
})
},
//获取dept
@@ -211,7 +214,7 @@
let that = this;
that.$u.api.deptList({page: 0}).then(res => {
that.depRange = that.redata(res);
- debugger;
+
console.log(that.depRange)
})
},
@@ -603,15 +606,19 @@