diff --git a/App.vue b/App.vue
index a9178a5..034116c 100644
--- a/App.vue
+++ b/App.vue
@@ -69,6 +69,7 @@
.container {
color: #333;
padding: 0rpx 12rpx;
+ background-color: #fff;
}
.uni-forms-item {
margin-bottom: 8rpx !important;
@@ -136,4 +137,14 @@
box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.1);
z-index: 10;
}
+ .footer_fixed{
+ position: fixed;
+ width: 100%;
+ bottom: 0;
+ z-index: 1;
+ height: 60upx;
+ padding: 12upx;
+ margin-left: -20upx;
+ background-color: white;
+ }
diff --git a/pages.json b/pages.json
index 24ab83d..fd1fa3e 100644
--- a/pages.json
+++ b/pages.json
@@ -32,13 +32,50 @@
{
"navigationBarTitleText" : "会议室预约"
}
- },{
+ },
+ {
+ "path" : "pages/ofm/sealForm",
+ "style" :
+ {
+ "navigationBarTitleText" : "印章申请"
+ }
+ },
+ {
+ "path" : "pages/ofm/vehicleForm",
+ "style" :
+ {
+ "navigationBarTitleText" : "用车申请"
+ }
+ },
+ {
+ "path" : "pages/ofm/borrowfile_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "档案借阅"
+ }
+ },
+ {
+ "path" : "pages/ofm/publicityForm",
+ "style" :
+ {
+ "navigationBarTitleText" : "宣传报道"
+ }
+ },
+ {
+ "path" : "pages/ofm/patent_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "专利审批"
+ }
+ },
+ {
"path" : "pages/ofm/mroom",
"style" :
{
"navigationBarTitleText" : "会议室"
}
- },{
+ },
+ {
"path" : "pages/ofm/booking",
"style" :
{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7ed6359..6d6040a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,55 +1,41 @@
-
-
-
-
- {{currentDate}}
-
-
-
-
-
-
- 待办
- 3
-
-
-
-
- 我的
- 3
-
-
-
-
-
-
-
-
-
- {{item.text}}
-
-
+
+
+
+
+ {{currentDate}}
+
+
+
+
+
+
+ 待办
+ 3
+
+
+
+
+ 我的
+ 3
+
+
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
-
-
-
-
-
- 拍照
-
-
-
-
-
-
+
+
+
@@ -61,30 +47,48 @@
welTitle: "",
imageSrc:"",
currentDate: tool.getTodayDate(),
- moduleList: [{
+ moduleList: [
+ {
navigate:'/pages/ofm/booking_form?mode=add',
url: '/static/yuding.png',
text: '会议预定',
type: "primary",
},
{
- navigate:'/pages/ofm/booking',
+ navigate:'/pages/ofm/sealForm?mode=add',
url: '/static/meetingRecord.png',
- text: '预定记录',
+ text: '印章申请',
type: "success"
},
{
- navigate:'/pages/ofm/mroom',
+ navigate:'/pages/ofm/vehicleForm?mode=add',
+ url: '/static/meetingRecord.png',
+ text: '用车申请',
+ type: "success"
+ },
+ {
+ navigate:'/pages/ofm/borrowfile_form?mode=add',
+ url: '/static/meetingRecord.png',
+ text: '档案借阅',
+ type: "success"
+ },
+ {
+ navigate:'/pages/ofm/publicityForm?mode=add',
url: '/static/huiyishi.png',
- text: '会议室',
+ text: '宣传报道',
+ type: "warning"
+ },
+ {
+ navigate:'/pages/ofm/patent_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '专利审批',
type: "warning"
}
]
}
},
mounted() {
- this.initWelTitle();
-
+ this.initWelTitle();
},
onShow() {
// #ifdef MP-WEIXIN
@@ -124,6 +128,9 @@
}
\ No newline at end of file
diff --git a/pages/ofm/mroom.vue b/pages/ofm/mroom.vue
index c205553..f8c3ef5 100644
--- a/pages/ofm/mroom.vue
+++ b/pages/ofm/mroom.vue
@@ -38,6 +38,12 @@
this.page = 1;
this.getmRooms();
},
+ onReachBottom() {
+ if (this.status === 'more') {
+ this.page++;
+ this.getmRooms()
+ }
+ },
methods:{
getmRooms(){
let that = this;
diff --git a/pages/ofm/patent_form.vue b/pages/ofm/patent_form.vue
new file mode 100644
index 0000000..3d1241b
--- /dev/null
+++ b/pages/ofm/patent_form.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/ofm/publicityForm.vue b/pages/ofm/publicityForm.vue
new file mode 100644
index 0000000..53ae593
--- /dev/null
+++ b/pages/ofm/publicityForm.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/ofm/sealForm.vue b/pages/ofm/sealForm.vue
new file mode 100644
index 0000000..b5eeeec
--- /dev/null
+++ b/pages/ofm/sealForm.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/ofm/vehicleForm.vue b/pages/ofm/vehicleForm.vue
new file mode 100644
index 0000000..018c020
--- /dev/null
+++ b/pages/ofm/vehicleForm.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{form.start_time}}
+
+
+
+ {{form.end_time}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index 68beea5..8aa4e1f 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -12,6 +12,7 @@ export default {
wxmpLogin: (data) => http('/auth/login_wxmp/', 'POST', data, true, false), //微信小程序登录
wxmpClogin: (data) => http('/auth/login_wxmp/', 'POST', data, true, false), //微信小程序登录(自动创建账号)
apkCheck: ()=>http('/system/apk/'), //apk检查
+ uploadFile:(data ) => http('/file/', 'POST', data),//上传文件
getTicket:(data) => http('/wf/ticket/', 'GET', data),
getTicketItem:(id) => http(`/wf/ticket/${id}/`, 'GET'),
@@ -23,10 +24,41 @@ export default {
workflowInitkey:(key) => http(`/wf/workflow/${key}/init_key/`, 'GET'),
getMroom:(data) => http('/ofm/mroom/', 'GET', data),
+ //会议室预定
bookingList:(data) => http('/ofm/mroombooking/', 'GET', data),
bookingItem:(id,data) => http(`/ofm/mroombooking/${id}/`, 'GET', data),
bookingCreate:(data) => http(`/ofm/mroombooking/`, 'POST', data),
bookingUpdate:(id,data) => http(`/ofm/mroombooking/${id}/`, 'PUT', data),
bookingDelete:(id) => http(`/ofm/mroombooking/${id}/`, 'DELETE'),
bookingSlot:(data) => http(`/ofm/mroomslot/`, 'GET' , data),
+ //印章外出
+ sealList:(data) => http(`/ofm/lendingseal/`, 'GET' , data),
+ sealCreate:(data) => http(`/ofm/lendingseal/`, 'POST' , data),
+ sealItem:(id,data) => http(`/ofm/lendingseal/${id}/`, 'GET', data),
+ sealUpdate:(id,data) => http(`/ofm/lendingseal/${id}/`, 'PUT', data),
+ sealDelete:(id) => http(`/ofm/lendingseal/${id}/`, 'DELETE'),
+ //文件借阅
+ borrowList:(data) => http(`/ofm/fileborrow/`, 'GET' , data),
+ borrowCreate:(data) => http(`/ofm/fileborrow/`, 'POST' , data),
+ borrowItem:(id,data) => http(`/ofm/fileborrow/${id}/`, 'GET', data),
+ borrowUpdate:(id,data) => http(`/ofm/fileborrow/${id}/`, 'PUT', data),
+ borrowDelete:(id) => http(`/ofm/fileborrow/${id}/`, 'DELETE'),
+ //专利
+ patentList:(data) => http(`/ofm/patentinfo/`, 'GET' , data),
+ patentCreate:(data) => http(`/ofm/patentinfo/`, 'POST' , data),
+ patentItem:(id,data) => http(`/ofm/patentinfo/${id}/`, 'GET', data),
+ patentUpdate:(id,data) => http(`/ofm/patentinfo/${id}/`, 'PUT', data),
+ patentDelete:(id) => http(`/ofm/patentinfo/${id}/`, 'DELETE'),
+ //公告
+ publicList:(data) => http(`/ofm/publicity/`, 'GET' , data),
+ publicCreate:(data) => http(`/ofm/publicity/`, 'POST' , data),
+ publicItem:(id,data) => http(`/ofm/publicity/${id}/`, 'GET', data),
+ publicUpdate:(id,data) => http(`/ofm/publicity/${id}/`, 'PUT', data),
+ publicDelete:(id) => http(`/ofm/publicity/${id}/`, 'DELETE'),
+ //车辆
+ vehicleList:(data) => http(`/ofm/vehicle/`, 'GET' , data),
+ vehicleCreate:(data) => http(`/ofm/vehicle/`, 'POST' , data),
+ vehicleItem:(id,data) => http(`/ofm/vehicle/${id}/`, 'GET', data),
+ vehicleUpdate:(id,data) => http(`/ofm/vehicle/${id}/`, 'PUT', data),
+ vehicleDelete:(id) => http(`/ofm/vehicle/${id}/`, 'DELETE'),
}
\ No newline at end of file