Merge remote-tracking branch 'origin/master'

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)
 

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) {

src/views/administrative/appointmentList.vue

@@ -78,6 +78,10 @@
                                         <div class="card_box_span">
                                             <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
                                         </div>
+                                        <div class="card_box_span">
+                                            <p v-if="item.isReg == 0"><span class="card_box_label">状态：</span> 未登记 </p>
+                                            <p v-if="item.isReg == 1"><span class="card_box_label">状态：</span> 已登记 </p>
+                                        </div>
                                     </div>
                                 </div>
                             </van-swipe-cell>
@@ -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;

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;

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=>{});
 

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<success.length; i++) {
             data.item_columns.push({ text: success[i].title, value: success[i].id, id: success[i].id })
             // if (i==0) {
@@ -356,7 +356,8 @@ onMounted(() =>{
 
     })
 
-    getLinkageByValueAndParentId("law_item", "0");
+    // getLinkageByValueAndParentId("law_item", "100");
+    getLinkageByValueAndParentId("check_item", "100");
     //初始化时间
     submitData.enforcementTime = formattedTime(new Date());
 })

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=>{});
 });

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 => {
         });

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 => {
         });