diff --git a/pages.json b/pages.json
index fd1fa3e..3cc717f 100644
--- a/pages.json
+++ b/pages.json
@@ -62,12 +62,40 @@
}
},
{
- "path" : "pages/ofm/patent_form",
+ "path" : "pages/srm/patent_form",
"style" :
{
"navigationBarTitleText" : "专利审批"
}
},
+ {
+ "path" : "pages/srm/paperse_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "论文申密"
+ }
+ },
+ {
+ "path" : "pages/srm/plant_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "平台审批"
+ }
+ },
+ {
+ "path" : "pages/srm/project_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "立项审批"
+ }
+ },
+ {
+ "path" : "pages/hrm/resignation_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "离职申请"
+ }
+ },
{
"path" : "pages/ofm/mroom",
"style" :
@@ -75,6 +103,13 @@
"navigationBarTitleText" : "会议室"
}
},
+ {
+ "path" : "pages/pum/supplieraudit_form",
+ "style" :
+ {
+ "navigationBarTitleText" : "供应商审批"
+ }
+ },
{
"path" : "pages/ofm/booking",
"style" :
diff --git a/pages/hrm/resignation_form.vue b/pages/hrm/resignation_form.vue
new file mode 100644
index 0000000..6635a82
--- /dev/null
+++ b/pages/hrm/resignation_form.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{form.end_date}}
+
+
+
+
+
+
+
+
+ {{form.ticket_.ticket_data.handle_date}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d6040a..469fde0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -79,10 +79,40 @@
type: "warning"
},
{
- navigate:'/pages/ofm/patent_form?mode=add',
+ navigate:'/pages/srm/patent_form?mode=add',
url: '/static/huiyishi.png',
text: '专利审批',
type: "warning"
+ },
+ {
+ navigate:'/pages/srm/paperse_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '论文申密',
+ type: "warning"
+ },
+ {
+ navigate:'/pages/srm/plant_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '平台审批',
+ type: "warning"
+ },
+ {
+ navigate:'/pages/srm/project_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '立项审批',
+ type: "warning"
+ },
+ {
+ navigate:'/pages/hrm/resignation_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '离职申请',
+ type: "warning"
+ },
+ {
+ navigate:'/pages/pum/supplieraudit_form?mode=add',
+ url: '/static/huiyishi.png',
+ text: '供应商审批',
+ type: "warning"
}
]
}
diff --git a/pages/ofm/booking_form.vue b/pages/ofm/booking_form.vue
index e09f75c..c9cf43c 100644
--- a/pages/ofm/booking_form.vue
+++ b/pages/ofm/booking_form.vue
@@ -56,8 +56,8 @@
@@ -289,7 +289,12 @@ import {actStateEnum} from "@/utils/enum.js"
that.form.id = res.id;
}
}
- }
+ },
+ submitSuccess(){
+ uni.navigateTo({
+ url: "/pages/index/index"
+ })
+ },
}
}
diff --git a/pages/ofm/borrowfile_form.vue b/pages/ofm/borrowfile_form.vue
index ae8408b..8a10051 100644
--- a/pages/ofm/borrowfile_form.vue
+++ b/pages/ofm/borrowfile_form.vue
@@ -6,6 +6,7 @@
- {{form.start_time}}
-
-
-
- {{form.end_time}}
+ {{form.borrow_date}}
+
+
+ {{form.ticket_.ticket_data.return_date}}
+
@@ -50,10 +50,12 @@ import {actStateEnum} from "@/utils/enum.js"
borrow_file:"",
contacts:"",
borrow_date:"",
- return_date:"",
remark:"",
ticket_:null,
},
+ ticket_data:{
+ return_date:""
+ },
hobby:[{
text: '借阅',
value: '借阅',
@@ -81,12 +83,27 @@ import {actStateEnum} from "@/utils/enum.js"
}else{
that.mode = "show";
}
- }else{
- // that.form = uni.getStorageSync("currentBooking");
}
}
},
+ mounted() {
+ this.getfileList();
+ },
methods:{
+ getfileList(){
+ let that = this;
+ let data = [];
+ that.$api.fileRecord({page:0}).then(res=>{
+ res.forEach(item=>{
+ let obj = item;
+ obj.text = item.name;
+ obj.value = item.id;
+ data.push(obj)
+ })
+ console.log(data)
+ that.fileList = data;
+ })
+ },
//选择会议室和日期后查询有无预定
async submit_b_func(id){
let that = this;
@@ -98,7 +115,12 @@ import {actStateEnum} from "@/utils/enum.js"
that.form.id = res.id;
}
}
- }
+ },
+ submitSuccess(){
+ uni.navigateTo({
+ url: "/pages/index/index"
+ })
+ },
}
}
diff --git a/pages/ofm/patent_form.vue b/pages/ofm/patent_form.vue
deleted file mode 100644
index 3d1241b..0000000
--- a/pages/ofm/patent_form.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/ofm/publicityForm.vue b/pages/ofm/publicityForm.vue
index 53ae593..87e1940 100644
--- a/pages/ofm/publicityForm.vue
+++ b/pages/ofm/publicityForm.vue
@@ -40,8 +40,8 @@
@@ -122,7 +122,12 @@ import {actStateEnum} from "@/utils/enum.js"
that.form.id = res.id;
}
}
- }
+ },
+ submitSuccess(){
+ uni.navigateTo({
+ url: "/pages/index/index"
+ })
+ },
}
}
diff --git a/pages/ofm/sealForm.vue b/pages/ofm/sealForm.vue
index b5eeeec..8bfd311 100644
--- a/pages/ofm/sealForm.vue
+++ b/pages/ofm/sealForm.vue
@@ -34,8 +34,8 @@
@@ -166,7 +166,12 @@ import {actStateEnum} from "@/utils/enum.js"
that.form.id = res.id;
}
}
- }
+ },
+ submitSuccess(){
+ uni.navigateTo({
+ url: "/pages/index/index"
+ })
+ },
}
}
diff --git a/pages/ofm/vehicleForm.vue b/pages/ofm/vehicleForm.vue
index 018c020..d730001 100644
--- a/pages/ofm/vehicleForm.vue
+++ b/pages/ofm/vehicleForm.vue
@@ -27,24 +27,24 @@
-
-
-
-
{{form.start_time}}
-
-
- {{form.end_time}}
+
+
+ {{form.ticket_.ticket_data.end_km}}
+
+
+
+ {{form.ticket_.ticket_data.end_time}}
@@ -65,10 +65,11 @@ import {actStateEnum} from "@/utils/enum.js"
location:"",
destination:"",
start_km:"",
- // end_km:"",
start_time:"",
- // end_time:"",
- ticket_:null,
+ },
+ ticket_data:{
+ end_km:"",
+ end_time:"",
},
vehicle_list:[{text: '市内', value: true},{text: '市外', value: false}],
}
@@ -102,7 +103,12 @@ import {actStateEnum} from "@/utils/enum.js"
that.form.id = res.id;
}
}
- }
+ },
+ submitSuccess(){
+ uni.navigateTo({
+ url: "/pages/index/index"
+ })
+ },
}
}
diff --git a/pages/pum/supplieraudit_form.vue b/pages/pum/supplieraudit_form.vue
new file mode 100644
index 0000000..294d4a1
--- /dev/null
+++ b/pages/pum/supplieraudit_form.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/srm/paperse_form.vue b/pages/srm/paperse_form.vue
new file mode 100644
index 0000000..7ec50e0
--- /dev/null
+++ b/pages/srm/paperse_form.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/srm/patent_form.vue b/pages/srm/patent_form.vue
new file mode 100644
index 0000000..9e48f5d
--- /dev/null
+++ b/pages/srm/patent_form.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/srm/plant_form.vue b/pages/srm/plant_form.vue
new file mode 100644
index 0000000..2f7fec9
--- /dev/null
+++ b/pages/srm/plant_form.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/srm/project_form.vue b/pages/srm/project_form.vue
new file mode 100644
index 0000000..2175a01
--- /dev/null
+++ b/pages/srm/project_form.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+ {{form.date}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/wf/ticketd_b.vue b/pages/wf/ticketd_b.vue
index 64a73cf..6e8cbda 100644
--- a/pages/wf/ticketd_b.vue
+++ b/pages/wf/ticketd_b.vue
@@ -85,6 +85,7 @@ const submit = async (transition_id) => {
}
}
if (props.ticket_?.id) {
+ console.log('props.ticket_data',props.ticket_data)
let params = new Object();
params.transition = transition_id;
params.suggestion = suggestion.value;
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 51f9e21..3e652e9 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -187,6 +187,10 @@
dir: {
type: String,
default: '/'
+ },
+ inde: {
+ type: Number,
+ default: 0
}
},
data() {
@@ -414,7 +418,7 @@
this.$emit('select', {
tempFiles: currentData,
tempFilePaths: filePaths
- })
+ },this.inde)
res.tempFiles = files
// 停止自动上传
if (!this.autoUpload || this.noSpace) {
diff --git a/utils/api.js b/utils/api.js
index 8aa4e1f..35aef0c 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -14,6 +14,8 @@ export default {
apkCheck: ()=>http('/system/apk/'), //apk检查
uploadFile:(data ) => http('/file/', 'POST', data),//上传文件
+ employeeList:(data) => http('/hrm/employee/', 'GET', data),
+
getTicket:(data) => http('/wf/ticket/', 'GET', data),
getTicketItem:(id) => http(`/wf/ticket/${id}/`, 'GET'),
getTicketFlowLogs:(id) => http(`/wf/ticket/${id}/flowlogs/`, 'GET'),
@@ -28,37 +30,48 @@ export default {
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'),
- //文件借阅
+ //档案借阅
+ fileRecord:(data) => http(`/ofm/filerecord/`, 'GET' , data),
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'),
+ //专利审批
+ patentList:(data) => http(`/srm/patentinfo/`, 'GET' , data),
+ patentCreate:(data) => http(`/srm/patentinfo/`, 'POST' , data),
+ patentItem:(id,data) => http(`/srm/patentinfo/${id}/`, 'GET', data),
+ patentDelete:(id) => http(`/srm/patentinfo/${id}/`, 'DELETE'),
+ //论文申密
+ paperseList:(data) => http(`/srm/paperse/`, 'GET' , data),
+ paperseCreate:(data) => http(`/srm/paperse/`, 'POST' , data),
+ paperseItem:(id,data) => http(`/srm/paperse/${id}/`, 'GET', data),
+ paperseDelete:(id) => http(`/srm/paperse/${id}/`, 'DELETE'),
+ //平台审批
+ pfList:(data) => http(`/srm/pf/`, 'GET' , data),
+ pfCreate:(data) => http(`/srm/pf/`, 'POST' , data),
+ pfItem:(id,data) => http(`/srm/pf/${id}/`, 'GET', data),
+ pfDelete:(id) => http(`/srm/pf/${id}/`, 'DELETE'),
+ //离职申请
+ resignationList:(data) => http(`/hrm/resignation/`, 'GET' , data),
+ resignationCreate:(data) => http(`/hrm/resignation/`, 'POST' , data),
+ resignationItem:(id,data) => http(`/hrm/resignation/${id}/`, 'GET', data),
+ resignationDelete:(id) => http(`/hrm/resignation/${id}/`, 'DELETE'),
+
}
\ No newline at end of file