diff --git a/zdxt-web-client/zdxt-admin-nos-plus-ui/.prettierrc b/zdxt-web-client/zdxt-admin-nos-plus-ui/.prettierrc index 6ca3ce5..2f4fc81 100644 --- a/zdxt-web-client/zdxt-admin-nos-plus-ui/.prettierrc +++ b/zdxt-web-client/zdxt-admin-nos-plus-ui/.prettierrc @@ -16,5 +16,6 @@ "proseWrap": "preserve", "htmlWhitespaceSensitivity": "css", "vueIndentScriptAndStyle": false, + "singleAttributePerLine": false, "endOfLine": "auto" } diff --git a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/.prettierrc b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/.prettierrc new file mode 100644 index 0000000..6ca3ce5 --- /dev/null +++ b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/.prettierrc @@ -0,0 +1,20 @@ +{ + "printWidth": 150, + "tabWidth": 2, + "useTabs": false, + "semi": true, + "singleQuote": true, + "quoteProps": "preserve", + "jsxSingleQuote": false, + "bracketSameLine": false, + "trailingComma": "none", + "bracketSpacing": true, + "embeddedLanguageFormatting": "auto", + "arrowParens": "always", + "requirePragma": false, + "insertPragma": false, + "proseWrap": "preserve", + "htmlWhitespaceSensitivity": "css", + "vueIndentScriptAndStyle": false, + "endOfLine": "auto" +} diff --git a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/api/nos/enfDemo.js b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/api/nos/enfDemo.js index dc308ee..c4c88bf 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/api/nos/enfDemo.js +++ b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/api/nos/enfDemo.js @@ -6,7 +6,7 @@ const baseUrl = "/app-enf"; export const listEnfDemo = (params) => _get("/enforcementcode/enfDemo/list", params); -// 非现场api +// 非现场api // 新增非现场执法任务 export const nosAddApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/add", params, success, error); // 分页查询非现场执法任务 @@ -19,3 +19,6 @@ export const nosApproveApi = (params, success, error) => _post("/app-enf/nos-law export const nosTypeApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/type", params, success, error); //查询非现场执法项目任务来源列表 export const nosTaskSourceListApi = (params, success, error) => _post("/app-enf/task-source/list", params, success, error); + +//查询已评价的任务 +export const nosTaskHasCommentPageApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/has-comment/page", params, success, error); diff --git a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/FooterBar.vue b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/FooterBar.vue index 1cd8cda..052dc0b 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/FooterBar.vue +++ b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/FooterBar.vue @@ -79,7 +79,7 @@ const tabs = [ { key: "message", label: "消息", - route: "/enforcement/message", + route: "/enforcement/nos/evaluate", path: '' }, { diff --git a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue index 9b244fa..ac30450 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue +++ b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue @@ -12,6 +12,7 @@ + :rules="[{ required: formData.taskTypeId != 5, message: '请选择任务来源' }]" + :required="formData.taskTypeId != 5" + /> diff --git a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue index dfbd4c3..963d683 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-nos-enforcement-app/src/components/enforcement/nos/EnforcementInfoSection.vue @@ -1,19 +1,20 @@ +