diff --git a/api/index.js b/api/index.js index 4482ffa..7d3d594 100644 --- a/api/index.js +++ b/api/index.js @@ -46,4 +46,7 @@ export const setTaskSave = (params) => post("/app/Task/init", params) //八项 export const getCurrentNextOperation = (params) => post("/app/Task/getSupplementInfo", params) //获取当前任务的下一步操作 export const getDepartmentTree = (params) => post("/app/util/getDepartmentTree", params) //获取部门树 export const getUserList = (params) => post("/app/util/getUserList", params) //获取人员 +export const getToDoTaskList = (params) => post("/app/Task/getAllToDoList", params) //获取待办列表 +export const getTaskTechnologicalProcess = (params) => post("/app/Task/getAgencyList", params) //获取流程 +export const getTaskInfo = (params) => post("/app/Task/getInfo", params) //查看信息 // 结束 diff --git a/pages.json b/pages.json index a3c5e2e..eb39a60 100644 --- a/pages.json +++ b/pages.json @@ -174,18 +174,6 @@ "navigationBarTitleText": "高危作业" } }, - { - "path": "pages/eight_assignments/select_corp_info", - "style": { - "navigationBarTitleText": "选择分公司" - } - }, - { - "path": "pages/eight_assignments/confined_space/index", - "style": { - "navigationBarTitleText": "受限空间安全作业" - } - }, { "path": "pages/eight_assignments/confined_space/apply", "style": { @@ -198,6 +186,36 @@ "navigationBarTitleText": "位置定位" } }, + { + "path": "pages/eight_assignments/select_corp_info", + "style": { + "navigationBarTitleText": "选择分公司" + } + }, + { + "path": "pages/eight_assignments/subordinate_index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/eight_assignments/to_do_list", + "style": { + "navigationBarTitleText": "待办" + } + }, + { + "path": "pages/eight_assignments/technological_process", + "style": { + "navigationBarTitleText": "流程" + } + }, + { + "path": "pages/eight_assignments/view_info", + "style": { + "navigationBarTitleText": "查看" + } + }, { "path": "pages/eight_assignments/select_review_personnel", "style": { diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index e73a63c..6a6b9bc 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -118,33 +118,33 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '1', - WORK_LATITUDE: '2', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', WORK_USER: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', }, rules: { - APPLY_DEPARTMENT_ID: [{type: 'string', required: true, message: '请选择申请单位', trigger: 'blur'}], - APPLY_DEPARTMENT_NAME: [{type: 'string', required: true, message: '请选择申请人', trigger: 'blur'}], - APPLY_USER_NAME: [{type: 'string', required: true, message: '请选择申请人', trigger: 'blur'}], - CORP_NAME: [{type: 'string', required: true, message: '请选择作业分公司', trigger: 'blur'}], - BELONG_CORP: [{type: 'string', required: true, message: '请输入受限空间所属单位', trigger: 'blur'}], - // LIMITSPACE_NAME: [{type: 'string', required: true, message: '请选择受限空间名称', trigger: 'blur'}], - MEDIUM_NAME: [{type: 'string', required: true, message: '请输入受限空间内原有介质名称', trigger: 'blur'}], - WORK_CONTENT: [{type: 'string', required: true, message: '请输入作业内容', trigger: 'blur'}], - WORK_START_DATE: [{type: 'string', required: true, message: '请选择作业开始时间', trigger: 'blur'}], - WORK_END_DATE: [{type: 'string', required: true, message: '请选择作业结束时间', trigger: 'blur'}], - WORK_LONGITUDE: [{type: 'string', required: true, message: '请选择经度', trigger: 'blur'}], - WORK_LATITUDE: [{type: 'string', required: true, message: '请选择纬度', trigger: 'blur'}], - WORK_USER: [{type: 'string', required: true, message: '请输入作业人', trigger: 'blur'}], + APPLY_DEPARTMENT_ID: [{type: 'string', required: true, message: '请选择申请单位', trigger: ['blur','change']}], + APPLY_DEPARTMENT_NAME: [{type: 'string', required: true, message: '请选择申请人', trigger: ['blur','change']}], + APPLY_USER_NAME: [{type: 'string', required: true, message: '请选择申请人', trigger: ['blur','change']}], + CORP_NAME: [{type: 'string', required: true, message: '请选择作业分公司', trigger: ['blur','change']}], + BELONG_CORP: [{type: 'string', required: true, message: '请输入受限空间所属单位', trigger: ['blur','change']}], + LIMITSPACE_NAME: [{type: 'string', required: true, message: '请选择受限空间名称', trigger: ['blur','change']}], + MEDIUM_NAME: [{type: 'string', required: true, message: '请输入受限空间内原有介质名称', trigger: ['blur','change']}], + WORK_CONTENT: [{type: 'string', required: true, message: '请输入作业内容', trigger: ['blur','change']}], + WORK_START_DATE: [{type: 'string', required: true, message: '请选择作业开始时间', trigger: ['blur','change']}], + WORK_END_DATE: [{type: 'string', required: true, message: '请选择作业结束时间', trigger: ['blur','change']}], + WORK_LONGITUDE: [{type: 'string', required: true, message: '请选择经度', trigger: ['blur','change']}], + WORK_LATITUDE: [{type: 'string', required: true, message: '请选择纬度', trigger: ['blur','change']}], + WORK_USER: [{type: 'string', required: true, message: '请输入作业人', trigger: ['blur','change']}], SPECIAL_WORK: [{ type: 'string', required: true, message: '请输入关联的其他特殊作业及安全作业票编号', - trigger: 'blur' + trigger: ['blur','change'] }], - RISK_IDENTIFICATION: [{type: 'string', required: true, message: '请输入风险辨识结果', trigger: 'blur'}], + RISK_IDENTIFICATION: [{type: 'string', required: true, message: '请输入风险辨识结果', trigger: ['blur','change']}], }, picker: { show: false, diff --git a/pages/eight_assignments/confined_space/index.vue b/pages/eight_assignments/confined_space/index.vue deleted file mode 100644 index d111ff0..0000000 --- a/pages/eight_assignments/confined_space/index.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/pages/eight_assignments/index.vue b/pages/eight_assignments/index.vue index e4322d8..079f2b8 100644 --- a/pages/eight_assignments/index.vue +++ b/pages/eight_assignments/index.vue @@ -1,98 +1,126 @@ diff --git a/pages/eight_assignments/select_review_personnel.vue b/pages/eight_assignments/select_review_personnel.vue index 1859bcc..90f9891 100644 --- a/pages/eight_assignments/select_review_personnel.vue +++ b/pages/eight_assignments/select_review_personnel.vue @@ -60,7 +60,7 @@ export default { this.$set(this.rules, item.key_name, [{ required: item.isRequired === '1', message: item.name + '不能为空', - trigger: 'blur', + trigger: ['blur', 'change'], }]) }) }, @@ -90,6 +90,10 @@ export default { }, async fnGetUserList({DEPARTMENT_ID, TYPE}, value) { let resData = await getUserList({DEPARTMENT_ID, TYPE}) + for (let i = 0; i < resData.list.list.length; i++) { + resData.list.list[i].NAME = resData.list.list[i].name || resData.list.list[i].NAME + resData.list.list[i].USER_ID = resData.list.list[i].user_ID || resData.list.list[i].USER_ID + } this.$set(this.picker.columnsAll, value, [resData.list.list]) }, fnSelectUser(key_name, key_id, value) { diff --git a/pages/eight_assignments/subordinate_index.vue b/pages/eight_assignments/subordinate_index.vue new file mode 100644 index 0000000..2322e1f --- /dev/null +++ b/pages/eight_assignments/subordinate_index.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/pages/eight_assignments/technological_process.vue b/pages/eight_assignments/technological_process.vue new file mode 100644 index 0000000..a9b364d --- /dev/null +++ b/pages/eight_assignments/technological_process.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/pages/eight_assignments/to_do_list.vue b/pages/eight_assignments/to_do_list.vue new file mode 100644 index 0000000..b9cf754 --- /dev/null +++ b/pages/eight_assignments/to_do_list.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/pages/eight_assignments/view_info.vue b/pages/eight_assignments/view_info.vue new file mode 100644 index 0000000..26503dc --- /dev/null +++ b/pages/eight_assignments/view_info.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/uni_modules/cc-defineStep/changelog.md b/uni_modules/cc-defineStep/changelog.md new file mode 100644 index 0000000..412b2fc --- /dev/null +++ b/uni_modules/cc-defineStep/changelog.md @@ -0,0 +1,8 @@ +## 1.3（2024-06-27） +优化 +## 1.2（2024-05-16） +组件优化 +## 1.0.1（2023-07-09） +组件优化 +## 1.0.0（2023-07-09） +组件初始化 diff --git a/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue b/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue new file mode 100644 index 0000000..4aa6c87 --- /dev/null +++ b/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue @@ -0,0 +1,135 @@ + + + + + + + diff --git a/uni_modules/cc-defineStep/package.json b/uni_modules/cc-defineStep/package.json new file mode 100644 index 0000000..474a8cd --- /dev/null +++ b/uni_modules/cc-defineStep/package.json @@ -0,0 +1,87 @@ +{ + "id": "cc-defineStep", + "displayName": "自定义精美steps步骤条进度条插件 物流信息跟踪展示组件 流程审批跟进组件", + "version": "1.3", + "description": "自定义精美steps步骤条进度条插件 物流信息跟踪展示组件 流程审批跟进组件", + "keywords": [ + "步骤条", + "时间轴", + "", + "物流信息", + "物流", + "跟踪" +], + "repository": "", + "engines": { + "HBuilderX": "^3.8.0" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y", + "钉钉": "y", + "快手": "y", + "飞书": "y", + "京东": "y" + }, + "快应用": { + "华为": "y", + "联盟": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/cc-defineStep/readme.md b/uni_modules/cc-defineStep/readme.md new file mode 100644 index 0000000..ae0dcd6 --- /dev/null +++ b/uni_modules/cc-defineStep/readme.md @@ -0,0 +1,170 @@ +# cc-defineStep + + +### 我的技术微信公众号 + +![图片](https://i.postimg.cc/RZ0sjnYP/front-End-Component.jpg) + + +#### 使用方法 +```使用方法 + + + + + colors:"#fa436a", + //模拟后台返回的数据 + stepData: [ + { + name: '提交申请', + time: '2023-06-09 20:01:49', + isNow: 0, + type: 1, + desc: '不想要了' + }, + { + name: '等待审核', + time: '2023-06-09 20:01:49', + isNow: 0, + type: 1, + desc: '您的服务单已申请成功，待售后审核中' + }, + { + name: '审核意见', + time: '2023-06-09 20:13:49', + isNow: 0, + type: 1, + desc: '您的售后单已收到，会在24小时与您联系。' + }, + { + name: '审核上门取件', + time: '2023-06-09 20:13:49', + isNow: 0, + type: 1, + desc: '您的服务单已预约时间2023-06-10(周日) 15:00-20:00' + }, + { + name: '取件成功', + time: '2023-06-10 18:54:55', + isNow: 0, + type: 1, + desc: '您的商品已取件成功' + }, + { + name: '商家售后已收到', + time: '2023-06-12 09:01:49', + isNow: 0, + type: 1, + desc: '您的服务单商品已收到' + }, + { + name: '返修换新订单生产', + time: '2023-06-12 13:19:49', + isNow: 0, + type: 1, + desc: '您的服务订单已生成新的订单' + }, + { + name: '返修换新完成', + time: '2023-06-13 12:12:49', + isNow: 1, + type: 1, + desc: '您的服务单已完成，如有疑问请反馈，谢谢~，欢迎再次光临' + }, + ] + + + +``` + +#### HTML代码实现部分 +```html + + + + + + + + +``` \ No newline at end of file diff --git a/uni_modules/next-tree/components/next-tree/next-tree.vue b/uni_modules/next-tree/components/next-tree/next-tree.vue index 6a65f6c..e31d073 100644 --- a/uni_modules/next-tree/components/next-tree/next-tree.vue +++ b/uni_modules/next-tree/components/next-tree/next-tree.vue @@ -12,7 +12,7 @@ 确定 - + diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js index 64fd2c0..46c7dbe 100644 --- a/utils/submitHomeworkProcess.js +++ b/utils/submitHomeworkProcess.js @@ -51,6 +51,13 @@ export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE}) => { }) await resolveNextOperation(taskId, CORP_ID, TYPE) } +const endCurrentPersonnelTechnologicalProcess = async ({EW_RU_TASK_ID}) => { + await setTaskSave({ + COMPLETE_FLAG: '1', + data: [{task: {EW_RU_TASK_ID}}], + postMethod: 'application/json', + }) +} // 决定下一步操作 EW_RU_TASK_ID当前任务id CORP_ID 选择的企业id TYPE作业类型 const resolveNextOperation = async (EW_RU_TASK_ID, CORP_ID, TYPE) => { const {info} = await getCurrentNextOperation({EW_RU_TASK_ID}) @@ -72,5 +79,12 @@ const resolveNextOperation = async (EW_RU_TASK_ID, CORP_ID, TYPE) => { if (info.canAddFlag === '1') { return } - console.log('没有下一步了') + // 没有下一步，结束流程，因为无法确定有多少步骤，跳转了多少页面，所以直接跳转到首页 + await endCurrentPersonnelTechnologicalProcess({EW_RU_TASK_ID}) + uni.$u.toast('提交成功') + setTimeout(() => { + uni.switchTab({ + url: '/pages/index/index' + }) + }, 1500) }