diff --git a/api/employee/task.js b/api/employee/task.js
index 2f7d40f..3cb7660 100644
--- a/api/employee/task.js
+++ b/api/employee/task.js
@@ -31,6 +31,8 @@ export function baoming(param) {
})
}
+
+
export function cancelBaoming(param) {
return request({
url: '/employee/task/cancelBaoming' ,
diff --git a/api/system/user.js b/api/system/user.js
index d961407..96dc61b 100644
--- a/api/system/user.js
+++ b/api/system/user.js
@@ -39,3 +39,16 @@ export function uploadAvatar(data) {
filePath: data.filePath
})
}
+// 搜索工人列表
+export function searchUser(keyWord, taskId) {
+ return request({
+ url: '/merchant/user/list',
+ method: 'get',
+ params: {
+ "keyWord": keyWord,
+ "taskId": taskId,
+ "pageNum": 1,
+ "pageSize": 200
+ }
+ })
+}
\ No newline at end of file
diff --git a/api/task.js b/api/task.js
index c16622e..e9992d7 100644
--- a/api/task.js
+++ b/api/task.js
@@ -36,3 +36,25 @@ export function fx(data) {
data: data
})
}
+export function baomingBatch(param) {
+ return request({
+ url: '/merchant/task/baomingBatch' ,
+ method: 'put',
+ data: param
+ })
+}
+
+export function cancelBaoming(param) {
+ return request({
+ url: '/merchant/task/cancelBaoming' ,
+ method: 'get',
+ params: param
+ })
+}
+export function addAndSign(param) {
+ return request({
+ url: '/merchant/task/addEmployeeAndSign' ,
+ method: 'put',
+ data: param
+ })
+}
diff --git a/config.js b/config.js
index cc8b10b..396e172 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
// 应用全局配置
module.exports = {
- // baseUrl: 'http://192.168.18.211:8080',
+ // baseUrl: 'http://192.168.18.212:8080',
// baseUrl: 'http://8.155.21.176/prod-api',
baseUrl: 'https://www.tulkj.cn/prod-api',
// 应用信息
diff --git a/pages.json b/pages.json
index 5747cf5..b52ca7b 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,16 @@
"path": "pages/taskDetails"
},
+ {
+ "path": "pages/helpBaoming"
+ },
+ {
+ "path": "pages/addEmployeeAndBaoming",
+ "style": {
+ "navigationBarTitleText": "添加员工并报名"
+ }
+ },
+
{
"path": "pages/wxlogin",
diff --git a/pages/addEmployeeAndBaoming.vue b/pages/addEmployeeAndBaoming.vue
new file mode 100644
index 0000000..cfa04e7
--- /dev/null
+++ b/pages/addEmployeeAndBaoming.vue
@@ -0,0 +1,312 @@
+
+
+
+
+ 用工类型
+
+
+
+ 姓名
+
+
+
+ 手机号码
+
+
+
+ 身份证号码
+
+
+
+ 性别
+
+
+
+ 民族
+
+
+
+ 年龄
+
+
+
+ 面试日期
+
+
+
+
+ {{queryParams.interviewDate == null ? "请选择" : queryParams.interviewDate}}
+
+
+
+
+
+ 入职日期
+
+
+
+ {{queryParams.entryDate == null ? "请选择" : queryParams.entryDate}}
+
+
+
+
+ 用工单位
+
+
+
+ 供应商
+
+
+
+ 员工单价
+
+
+
+ 供应商单价
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+ 灵活用工
+ 固定长期用工
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/components/merchantTask.vue b/pages/components/merchantTask.vue
index d63b3a0..ca2044f 100644
--- a/pages/components/merchantTask.vue
+++ b/pages/components/merchantTask.vue
@@ -66,7 +66,7 @@
>
-
+
@@ -126,7 +126,8 @@
发布时间: {{task.createTime}}
-
+ 帮报名
+
@@ -173,8 +174,8 @@
};
},
created: function() {
- this.realName = this.$store.state.user.nickName
- this.getList();
+ this.realName = this.$store.state.user.nickName
+ this.getList();
},
methods:{
reload(){
@@ -263,6 +264,11 @@
url: "taskDetails?id=" + task.id
})
},
+ helpBaomingFun(task){
+ uni.navigateTo({
+ url: "helpBaoming?id=" + task.id
+ })
+ },
my(){
uni.navigateTo({
url: "my"
@@ -393,8 +399,6 @@
background-size: 100% 100%;
}
}
-
-
.search-container{
margin-top: 20rpx;
border-top: 1rpx solid #dbdbdb;
@@ -425,7 +429,6 @@
}
}
-
.filter{
display: flex;
align-items: center;
@@ -494,7 +497,6 @@
.vue-ref{
padding-bottom: 0px !important;
}
-
.uni-date-x{
background-color: transparent !important;
color: #000000 !important;
@@ -523,7 +525,6 @@
/* justify-content: center;*/
/*}*/
-
.list{
padding: 0rpx 15rpx 0rpx 15rpx;
/*background-color: #e3e3e3;*/
@@ -657,14 +658,31 @@
font-size: 20rpx;
color: #bfbfbf;
}
- .button{
- background-image: url("http://8.155.21.176:9000/yonggong/m-images/index/dm-btn.png");
- background-size: 100% 100%;
- margin-left: 8rpx;
- width: 160rpx;
- height: 65rpx;
- margin-left: auto; /* 推动元素到右边 */
- }
+
+ .button_bm{
+ //background-color: #11a9ee;
+ color: #11a9ee;
+ font-weight: 650;
+ font-size: 27rpx;
+ border-radius: 30rpx;
+ border: #11a9ee 1rpx solid;
+ width: 149rpx;
+ height: 66rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ //background-image: url("http://8.155.21.176:9000/yonggong/m-images/fxlist/js-btn.png");
+ background-size: 100% 100%;
+ margin-left: auto; /* 推动元素到右边 */
+ }
+ .button{
+ background-image: url("http://8.155.21.176:9000/yonggong/m-images/index/dm-btn.png");
+ background-size: 100% 100%;
+ margin-left: 8rpx;
+ width: 160rpx;
+ height: 65rpx;
+ margin-left: 10rpx; /* 推动元素到右边 */
+ }
}
}
diff --git a/pages/components/merchantXc.vue b/pages/components/merchantXc.vue
index ffe4b77..5655366 100644
--- a/pages/components/merchantXc.vue
+++ b/pages/components/merchantXc.vue
@@ -764,6 +764,7 @@
background-image: url("http://8.155.21.176:9000/yonggong/m-images/fxlist/js-btn.png");
background-size: 100% 100%;
}
+
}
}
diff --git a/pages/helpBaoming.vue b/pages/helpBaoming.vue
new file mode 100644
index 0000000..2f1cbbe
--- /dev/null
+++ b/pages/helpBaoming.vue
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.employeeName}}
+
+
+ {{item.phone}}
+
+
+
+
+
+
+
+
+ 添加员工并报名
+ 报名
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/taskDetails.vue b/pages/taskDetails.vue
index 483c997..0a75ff5 100644
--- a/pages/taskDetails.vue
+++ b/pages/taskDetails.vue
@@ -37,9 +37,9 @@
-
+
-
+
@@ -66,6 +66,7 @@