diff --git a/src/api/linkage.js b/src/api/linkage.js index 3225c5a..fc96633 100644 --- a/src/api/linkage.js +++ b/src/api/linkage.js @@ -1,7 +1,9 @@ import { _get, _post,_form,_delete } from "../http/index"; -export const queryLinkage = (params, success, error) => _post("/app/code/linkage/list",params,success,error) +export const queryLinkage = (params, success, error) => _get("/app/code/linkage/listByParentId",params,success,error) export const queryLinkageById = (params, success, error) => _post("/app/code/linkage/objById",params,success,error) export const queryLinkageDictByValueAndParentId = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueAndParentId",params,success,error) +export const queryLinkageDictByValue = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValue",params,success,error) +export const queryLinkageDictByValueNoAuth = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueNoAuth",params,success,error) export const queryZqyjjdm = (params, success, error) => _get("/app/zqyjjdm/list",params,success,error) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 6345809..267e3e9 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -384,7 +384,7 @@ const getLinkageByValueAndParentId = (value, parentId) => { // 查询检查要求字典信息 - queryLinkageDictByValueAndParentId({"value": value, "parentId": parentId}, success => { + queryLinkageDictByValueAndParentId({"dataScopeId": useCommon.userId, "value": value, "parentId": parentId}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); @@ -392,7 +392,7 @@ const getLinkageByParentIdToItem = (parentId) => { // 查询检查要求字典信息 - queryLinkage({"parentId": parentId}, success => { + queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => { for (var i = 0; i < success.length; i++) { data.item_columns.push({text: success[i].title, value: success[i].id, id: success[i].id}) // if (i==0) { diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index ab45779..182f2b5 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -78,6 +78,10 @@

企业名称: {{ item.enterpriseName }}

+
+

状态: 未登记

+

状态: 已登记

+
@@ -145,7 +149,7 @@ // 设置初始值为当前时间 onMounted(() => { - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); @@ -451,6 +455,8 @@ flex-direction: row; align-items: end; position: relative; + height: 0.65rem; + margin: 3% 0 1%; .date-select { font-size: 0.52rem; @@ -463,7 +469,7 @@ .search-button { position: absolute; - top: 0.2rem; + top: 0; right: 3%; width: 15%; height: 0.6rem; diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 8ca852d..8c882aa 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -403,6 +403,8 @@ flex-direction: row; align-items: end; position: relative; + height: 0.65rem; + margin: 3% 0 1%; .date-select { font-size: 0.52rem; @@ -415,7 +417,7 @@ .search-button { position: absolute; - top: 0.2rem; + top: 0; right: 3%; width: 15%; height: 0.6rem; diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 171a900..e1fd94e 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -145,7 +145,7 @@ data.dateSearch = nowDate(new Date()); - // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { // getLinkageByParentIdToItem(success.id) // },error=>{}); diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index a360bb9..bfc2487 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -63,7 +63,7 @@ required readonly label="检查事项" - placeholder="执法事项" + placeholder="检查事项" @click="data.showItem = true" type="textarea" rows="1" @@ -76,7 +76,7 @@ readonly :rules="[{ required: true, message: '必填项' }]" label="检查依据" - placeholder="执法依据" + placeholder="检查依据" @click="showPopupqz" type="textarea" rows="1" @@ -290,14 +290,14 @@ const tapBad = () => { const getLinkageByValueAndParentId = (value, parentId) => { // 查询检查要求字典信息 - queryLinkageDictByValueAndParentId({"value":value, "parentId": parentId}, success => { + queryLinkageDictByValueAndParentId({"dataScopeId": useCommon.userId, "value":value, "parentId": parentId}, success => { getLinkageByParentIdToItem(success.id) },error=>{}); } const getLinkageByParentIdToItem = (parentId) => { // 查询检查要求字典信息 - queryLinkage({"parentId": parentId}, success => { + queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => { for(var i=0; i{ }) - getLinkageByValueAndParentId("law_item", "0"); + // getLinkageByValueAndParentId("law_item", "100"); + getLinkageByValueAndParentId("check_item", "100"); //初始化时间 submitData.enforcementTime = formattedTime(new Date()); }) diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue index 093373d..c22d260 100644 --- a/src/views/enterprise/complaintList.vue +++ b/src/views/enterprise/complaintList.vue @@ -140,7 +140,7 @@ onMounted(() => { searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); data.dateSearch = nowDate(new Date()); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) },error=>{}); }); diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue index 3049b23..f1e2d12 100644 --- a/src/views/enterprise/enterpriseInspectionList.vue +++ b/src/views/enterprise/enterpriseInspectionList.vue @@ -164,7 +164,7 @@ // getCard(); searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index 1d6e730..a92dd0f 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -161,7 +161,7 @@ searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); data.dateSearch = nowDate(new Date()); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { });