1.执法登记和编辑页：添加联合检查

2.bug修改

src/views/enforce/enforcementPlan.vue

@@ -84,8 +84,8 @@
                                         null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>
                                   </div>
                                   <div class="btn-list" >
-                                    <a v-if="item.isPublish == 0" @click.stop="update(item.id,1)"><van-icon name="edit" />发布</a>
+                                    <a v-if="item.isPublish == 0" @click.stop="update(item.id,1)"><van-icon name="passed" />发布</a>
-                                    <a  v-if="item.isPublish == 1" @click.stop="update(item.id,0)"><van-icon name="cross" />取消发布</a>
+                                    <a  v-if="item.isPublish == 1" @click.stop="update(item.id,0)"><van-icon name="close" />取消发布</a>
                                   </div>
                                 </div>
                             </van-swipe-cell>
@@ -546,6 +546,6 @@
 
     .btn-list a i {
         margin: 0 0.12rem;
-        font-size: 0.4rem;
+        font-size: 0.37rem;
     }
 </style>

src/views/enforce/enforcementPlanDetailed.vue

@@ -123,6 +123,10 @@ onMounted(() => {
       color: #2b75fd;
     }
 
+    /deep/ .van-field .van-field__control {
+      color: #666;
+    }
+
     .fold-div {
       position: relative;
       display: flex;

src/views/enforce/sign.vue

@@ -237,13 +237,7 @@
 
       <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
                  @reciveData="reciveDept"/>
-      <van-popup v-model:show="data.checkTimePicker" round position="bottom">
+
-        <van-picker
-            :columns="data.checkTimeColumns"
-            @cancel="data.checkTimePicker = false"
-            @confirm="checkTimeOnConfirm"
-        />
-      </van-popup>
 
     </div>
 </template>
@@ -265,6 +259,7 @@
     import {formattedTime, formattedTimeYYYYmmdd} from "@/util/util";
     import Compressor from 'compressorjs'
     //用户筛选弹窗
+    import DeptPopup from '../administrative/deptFilter.vue';
     import Popup from './userFilter.vue';
     import LawPopup from './lawFilter.vue';
     import PopupA from './assistUserFilter.vue';
@@ -384,6 +379,13 @@
         lawFieldText: "",
         checkCategory: "",
         checkCategoryText: "",
+        userId: useCommon.userId,
+        deptTexts: "",
+        deptObjs: [],
+        userObjs: [],
+        isUnite: 0,
+        bureauDeptId:"",
+        bureauDeptName:"",
 
     })
 
@@ -842,6 +844,27 @@
             data.tempDate = times[1] + "月" + times[2] + "号";
         }
         data.showTimePicker = false;
+
+      // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法
+      if (null != submitData.enterpriseNumber && null != data.tempDate) {
+        let params = {
+          enterpriseNumber: submitData.enterpriseNumber,
+          checkTime: submitData.checkTime,
+        }
+        queryEnterpriseLawEnforcementList(params, success => {
+          var deptName = "";
+          for (var i = 0; i < success.data.length; i++) {
+            deptName += success.data[i].lawEnforcement + ", ";
+          }
+          if (success.data.length > 0) {
+            data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法"
+            data.notifyShow = true;
+            // setTimeout(() => {
+            //     data.notifyShow = false;
+            // }, 2000);
+          }
+        });
+      }
     }
 
     const showPopup = (flag) => {
@@ -885,6 +908,27 @@
         // submitData.lawEnforcerTwo = item.userName;
         // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
         // submitData.lawEnforcerIdTwo = item.userId;
+
+      // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法
+      if (null != submitData.enterpriseNumber && null != data.tempDate) {
+        let params = {
+          enterpriseNumber: submitData.enterpriseNumber,
+          checkTime: submitData.checkTime,
+        }
+        queryEnterpriseLawEnforcementList(params, success => {
+          var deptName = "";
+          for (var i = 0; i < success.data.length; i++) {
+            deptName += success.data[i].lawEnforcement + ", ";
+          }
+          if (success.data.length > 0) {
+            data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法"
+            data.notifyShow = true;
+            setTimeout(() => {
+              data.notifyShow = false;
+            }, 2000);
+          }
+        });
+      }
     }
     const reciveData2 = (item) => {
         submitData.subsidiaryer = item.userName;

src/views/enterprise/registrationEdit.vue

@@ -118,11 +118,7 @@
                                    show-word-limit
                         />
                     </view>
-                    <van-field
+
-                            v-model="submitData.enforcementTime"
-                            label="检查时间"
-                            readonly
-                    />
 <!--                    <van-field
                             v-model="submitData.lawField"
                             label="执法领域"
@@ -195,6 +191,13 @@
                     />
 
                     <div class="addbtn" @click.stop="addField"><van-icon name="add-o" /></div>-->
+
+                  <van-field
+                      v-model="submitData.enforcementTime"
+                      label="检查时间"
+                      readonly
+                  />
+
                     <van-field v-model="submitData.lawEnforcementBasis" v-show="false" />
                     <!--                    <van-field-->
                     <!--                      v-model="submitData.reslut"-->
@@ -219,6 +222,19 @@
                             placeholder="请输入备注"
                             show-word-limit
                     />-->
+                  <van-cell center title="开启联合检查">
+                    <template #right-icon>
+                      <van-switch v-model="data.checked" @click="!data.checked"/>
+                      <!--                        <van-switch v-model="data.checked" @click="checkUnite"/>-->
+                    </template>
+                  </van-cell>
+
+                  <div class="add-inspect" v-if="data.checked">
+                    <p v-for="(item, index) in submitData.userObjs" :key="index">
+                      <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                    </p>
+                    <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
+                  </div>
 
                     <van-divider class="divdsty" />
 
@@ -279,6 +295,8 @@
 
         <LawPopup :lawEnforcementId="submitData.lawEnforcementId" :enterpriseNumber="submitData.enterpriseNumber" :visible="data.lawChecked" :content="data.lawContent" @close="closePopup"
                   @reciveData="reciveLaw"/>
+        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
+                   @reciveData="reciveDept"/>
     </div>
 </template>
 
@@ -293,13 +311,18 @@
     import {formattedTime} from "@/util/util";
     import Compressor from 'compressorjs'
     //用户筛选弹窗
+    import DeptPopup from '../administrative/deptFilter.vue';
     import Popup from '../enforce/userFilter.vue';
     import LawPopup from '../enforce/lawFilter.vue';
     import PopupA from '../enforce/assistUserFilter.vue';
     import Popupzq from '../enforce/zqyjjdmFilter.vue';
     import {getDict} from "../../api/Home";
     import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
-    import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";
+    import {
+      addEnterpriseLawEnforcement,
+      getByUserIdAndZero,
+      queryEnterpriseLawEnforcementList
+    } from "../../api/administrative";
 
     const { useCommon,useMy } = $globalStore
 
@@ -337,6 +360,9 @@
         lawFieldText:"",
         showCheckCategoryPicker: false,
         checkCategorys: [],
+        checked: false,
+        deptChecked: false,
+        deptContent: '',
     });
     var fileSize = 0;
     //保存参数
@@ -389,6 +415,13 @@
         lawField:"",
         checkCategory: "",
         checkCategoryText: "",
+        userId: useCommon.userId,
+        deptTexts: "",
+        deptObjs: [],
+        userObjs: [],
+        isUnite: 0,
+        bureauDeptId:"",
+        bureauDeptName:"",
     })
 
     const tapGood = () => {
@@ -409,6 +442,25 @@
         },error=>{});
     }
 
+    const checkUnite = () => {
+      if (data.checked) {
+        data.deptChecked=true;
+      } else {
+        data.deptChecked=false;
+      }
+    }
+
+    const reciveDept = (item) => {
+      submitData.deptTexts = "";
+      submitData.deptObjs = [];
+      submitData.userObjs = [];
+      for (var i=0; i<item.length; i++) {
+        submitData.deptTexts += item[i].deptName+";";
+        submitData.deptObjs.push({deptId: item[i].deptId, deptName: item[i].deptName });
+        submitData.userObjs.push({strUserId: item[i].userId, userName: item[i].userName, deptId: item[i].deptId, deptName: item[i].deptName });
+      }
+    }
+
     const getLinkageByParentIdToItem = (parentId) => {
         // 查询检查要求字典信息
         queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => {
@@ -699,6 +751,36 @@
         });
     }
 
+    const onConfirm = (time) => {
+      if (time != null) {
+        var times = time.selectedValues;
+        submitData.enforcementTime = times[0] + "-" + times[1] + "-" + times[2];
+        data.tempDate = times[1] + "月" + times[2] + "号";
+      }
+      data.showTimePicker = false;
+
+      // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法
+      if (null != submitData.enterpriseNumber && null != data.tempDate) {
+        let params = {
+          enterpriseNumber: submitData.enterpriseNumber,
+          checkTime: submitData.checkTime,
+        }
+        queryEnterpriseLawEnforcementList(params, success => {
+          var deptName = "";
+          for (var i = 0; i < success.data.length; i++) {
+            deptName += success.data[i].lawEnforcement + ", ";
+          }
+          if (success.data.length > 0) {
+            data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法"
+            data.notifyShow = true;
+            // setTimeout(() => {
+            //     data.notifyShow = false;
+            // }, 2000);
+          }
+        });
+      }
+    }
+
     const showPopup = (flag) =>{
         data.lawCerFlag = flag;
         data.popupVisible = true;
@@ -732,6 +814,7 @@
         data.popupVisible2 = false;
         data.popupVisibleqz = false;
         data.lawChecked = false;
+        data.deptChecked = false;
     }
     const reciveData = (item) =>{
         data.lawCer[data.lawCerFlag].id = item.userId;
@@ -741,6 +824,27 @@
         // submitData.lawEnforcerTwo = item.userName;
         // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
         // submitData.lawEnforcerIdTwo = item.userId;
+
+      // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法
+      if (null != submitData.enterpriseNumber && null != data.tempDate) {
+        let params = {
+          enterpriseNumber: submitData.enterpriseNumber,
+          checkTime: submitData.checkTime,
+        }
+        queryEnterpriseLawEnforcementList(params, success => {
+          var deptName = "";
+          for (var i = 0; i < success.data.length; i++) {
+            deptName += success.data[i].lawEnforcement + ", ";
+          }
+          if (success.data.length > 0) {
+            data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法"
+            data.notifyShow = true;
+            setTimeout(() => {
+              data.notifyShow = false;
+            }, 2000);
+          }
+        });
+      }
     }
     const reciveData2 = (item) =>{
         submitData.subsidiaryer = item.userName;
@@ -955,19 +1059,41 @@
     }
 
     .addbtn {
-      margin: 3%;
+      margin: 3% 0;
-      padding: 0 0.35rem;
+      width: 100%;
-      width: 94%;
-      font-size: 0.35rem;
-      color: #1367fe;
-      line-height: 1.5;
       text-align: right;
-      box-sizing: border-box;
     }
 
     .addbtn i {
-      margin-right: -0.1rem;
+      font-size: 0.5rem;
-      font-size: 0.4rem;
+      color: #999;
+    }
+
+    .add-inspect {
+      margin: 0 0.425rem;
+      padding-bottom: 0.3rem;
+      min-height: 2rem;
+      font-size: 0.37rem;
+      color: #323233;
+    }
+
+    .add-inspect p {
+      margin: 0.1rem 0;
+      padding: 0.2rem 0.1rem;
+      //border-bottom: 1px solid #f4f5f6;
+    }
+
+    .add-inspect p:nth-child(even) {
+      background-color: #f3f4f5;
+    }
+
+    .add-inspect span {
+      margin-right: 0.2rem;
+      color: #999;
+    }
+
+    .add-inspect span.add-dept {
+      color: #666;
     }
 
     /deep/ .mult-line .van-field__label {