修改执法登记页面

不扫码页面

src/views/enforce/historyCheck.vue

@@ -202,7 +202,7 @@
         });
     }
     const queryList = () => {
-        searchParam.isSubmit = 1;
+        // searchParam.isSubmit = 1;
         searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
         queryRegistrationList(searchParam, success => {
             data.curPage++;

src/views/enforce/lawFilter.vue

@@ -18,12 +18,12 @@
             <div class="search-result">
                 <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
                     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-                        <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
-<!--                    <div class="case-title">{{ item.enterpriseName }}</div>-->
-                    <div class="case-title">执法事项：{{ item.checkItemText }}</div>
-<!--                    <div class="case-depart">执法事项：{{ item.checkItemText }}</div>-->
-                    <div class="case-time">执法时间：{{ item.checkTime }}</div>
-                </div>
+                        <div class="case-item" v-for="(item, index) in dataList" :key="index" >
+                          <span class="selectButton" @click="selectData(item)">一键关联</span>
+                        <div class="case-title">执法事项：{{ item.checkItemText }}</div>
+                        <div class="case-time">执法时间：{{ item.checkTime }}</div>
+
+                    </div>
                     </van-list>
                 </van-pull-refresh>
             </div>
@@ -32,105 +32,108 @@
     </div>
 </template>
 
-<script>
-    import {ref} from 'vue'
+<script setup>
+    import {ref,defineEmits,getCurrentInstance } from 'vue';
     import {queryEnforcementList} from '../../api/enterprise'
-
-    const {useCommon} = $globalStore
-    export default {
-        props: {
-            visible: {
-                type: Boolean,
-                default: false
-            },
-            content: {
-                type: String,
-                default: ''
-            },
-            lawEnforcementId: {
-                type: String,
-                default: ''
-            },
-            enterpriseNumber: {
-                type: String,
-                default: ''
-            }
+    import { defineProps } from 'vue'
+    const emits = defineEmits(['reciveData','close']);
+    const props = defineProps({
+        visible: {
+          type: Boolean,
+          default: false
+        },
+        enterpriseNumber: {
+          type: String,
+          default: false
         },
-        data() {
-            return {
-                searchParam: {
-                    //搜索框
-                    dataScopeId: useCommon.userId,
-                    enterpriseName: '',
-                    // 分页
-                    pageNum: 1,
-                    pageSize: 6,
-                },
-                dataList: [],
-                loading: false,
-                finished: false,
-                refreshing: false,
-                curPage: 1,
-            }
+        content: {
+            type: String,
+            default: ''
         },
-        created() {
-            // this.queryList()
+        lawEnforcementId: {
+            type: String,
+            default: ''
         },
-        methods: {
-            closePopup() {
-                this.$emit('close');
-            },
-            queryList() {
-                this.searchParam.pageNum = (this.curPage-1)*this.searchParam.pageSize;
-                queryEnforcementList({"lawEnforcementId": this.lawEnforcementId, "enterpriseNumber": this.enterpriseNumber, "isReg": 0, "isSubmit": 1}, success => {
-                    this.curPage++;
-                    this.loading = false;   // 查出结果停止加载
-                    if (success.total <= this.dataList.length) {
-                        // 查到最后没数据
-                        this.finished = true;
-                        return;
-                    }
-                    // this.dataList = success.data
-                    this.dataList.push(...success.rows);
-                }, error => {
-                })
-            },
-            cancel() {
-                this.searchParam.userName = '';
-                this.queryList()
-            },
-            selectData(item) {
-                this.$emit("reciveData", JSON.parse(JSON.stringify(item)));
-                this.$emit('close');
-            },
+    })
+    // 获取当前页面组件
+    const instance = getCurrentInstance();
 
-            //下拉刷新
-            onRefresh() {
-                // 清空列表数据
-                this.enterpriseList = [];
-                this.finished = false;
+    const {useCommon} = $globalStore
+    const searchParam = reactive({
+        //搜索框
+        dataScopeId: useCommon.userId,
+        enterpriseName: '',
+        // 分页
+        pageNum: 1,
+        pageSize: 6,
+        enterpriseNumber:"",
+        lawEnforcementId:"",
+        isReg:0,
+        isSubmit: 1,
+    })
+    const dataList = ref([])
+    const loading =  ref(false);
+    const finished = ref(false);
+    const refreshing = ref(false);
+    const curPage = ref(1);
+  
+      const closePopup =() =>{
+        emits('close');
+      }
+      const queryList =() =>{
+          console.log(searchParam)
+          searchParam.enterpriseNumber = props?.enterpriseNumber;
+          searchParam.pageNum = (curPage.value-1)*searchParam.pageSize;
+          queryEnforcementList(searchParam, success => {
+              curPage.value++;
+              loading.value = false;   // 查出结果停止加载
+              if (success.total <= dataList.value.length) {
+                  // 查到最后没数据
+                  finished.value = true;
+                  return;
+              }
+              // dataList = success.data
+              dataList.value.push(...success.rows);
+          }, error => {
+          })
+      }
+      const cancel = () =>{
+          searchParam.userName = '';
+          queryList()
+      }
+      const selectData = (item) =>{
+          emits('close');
+          emits("reciveData", JSON.parse(JSON.stringify(item)));
+      }
 
-                // 重新加载数据
-                // 将 loading 设置为 true，表示处于加载状态
-                this.loading = true;
-                this.onLoad();
-            },
-            // 触底加载
-            onLoad() {
-                let that = this;
-                setTimeout(() => {
-                    if (that.refreshing) {
-                        that.refreshing = false;
-                    }
-                    that.queryList();
-                }, 1000);
-            },
-        }
+      //下拉刷新
+      const onRefresh = () =>{
+          // 清空列表数据
+          enterpriseList = [];
+          finished = false;
 
-    }
+          // 重新加载数据
+          // 将 loading 设置为 true，表示处于加载状态
+          loading = true;
+          onLoad();
+      }
+      // 触底加载
+      const onLoad = () =>{
+          // let that = this;
+          setTimeout(timeQuery(), 1000);
+      }
+      const timeQuery = () =>{
+        if (refreshing.value) {
+                refreshing.value = false;
+          }
+          queryList();
+      }
+        
+
+    
 </script>
 
-<style scoped>
+<style lang="less" scoped>
     .popup {
         position: fixed;
         z-index: 999;
@@ -278,6 +281,7 @@
         border-bottom: 1px solid #f4f4f4;
         color: #999;
         line-height: 2;
+        position: relative;
     }
 
     .case-title {
@@ -286,6 +290,17 @@
         color: #333;
         line-height: 1.25;
     }
+    .selectButton {
+      position: absolute;
+      width: 20%;
+      height: 34%;
+      top: 30%;
+      right: 1%;
+      background-color: #1367fe;
+      color: #fff;
+      text-align: center;
+      border-radius: 0.1rem;
+    }
 
 
 </style>

src/views/enforce/noScan.vue

@@ -40,155 +40,174 @@
         </div>
     </div>
 
-    <div v-if="visible" class="popup" v-show="isCheck">
-        <!-- 弹窗的内容 -->
-        <div class="popup-content">
-            <div class="subtitle">请选择不扫码的原因：</div>
-          <!-- 关闭按钮 -->
-          <label class="close-button" @click="closeReason"></label>
-            <div class="item-box">
-<!--                <span :class="checkCss==1?'item-btn active':'item-btn'"-->
-<!--                      @click="checkReason('企业拒绝出示二维码', 1)">企业拒绝出示二维码</span>-->
-<!--                <span :class="checkCss==2?'item-btn active':'item-btn'"-->
-<!--                      @click="checkReason('网络/设备故障', 2)">网络/设备故障</span>-->
-<!--                <span :class="checkCss==3?'item-btn active':'item-btn'" -->
-<!--                      @click="checkReason('其它', 3)">其它</span>-->
-
-                <span v-for="(item, index) in dicts" :key="index" :class="checkCss==item.dictValue?'item-btn active':'item-btn'" @click="checkReason(item.dictLabel, item.dictValue)">{{item.dictLabel}}</span>
-            </div>
-            <div class="btnbox">
-                <!--        <button class='btn-reset' @click="">重置</button>-->
-                <button class='btn-search' @click="closeReason">确定</button>
-            </div>
-        </div>
-    </div>
+    <van-popup v-model:show="showPicker" round position="bottom" :close-on-click-overlay="false">
+        <van-picker v-model="selectedValues" 
+          cancel-button-text=""
+          title="请选择不扫码的原因" :columns="columns"
+          @confirm="onConfirm" />
+  </van-popup>
 
 </template>
 
-<script>
+<script setup >
     import {queryEnterpriseInfoList} from '../../api/enterprise'
     import {queryRegistrationList} from "../../api/enforce";
     import {getDict} from "../../api/Home";
 
-    export default {
-        data() {
-            return {
-                isCheck: true,
-                checkCss: 1,
-                reason: "企业拒绝出示二维码",
-                enterpriseList: [],
-                searchParam: {
-                    // 企业名称
-                    enterpriseName: "",
-                    params: {},
-                    // 分页
-                    pageNum: 1,
-                    pageSize: 6,
-                },
-                dicts: [],
-                loading: false,
-                finished: false,
-                refreshing: false,
-                curPage: 1,
-            }
+    //路由参数
+    const router = useRouter();
+    const isCheck = true;
+    const checkCss = ref(1);
+    const reason = ref("企业拒绝出示二维码");
+    const enterpriseList = ref([]);
+    const searchParam =reactive( {
+        // 企业名称
+        enterpriseName: "",
+        params: {},
+        // 分页
+        pageNum: 1,
+        pageSize: 6,
+    })
+    const dicts = ref([]);
+    const loading = ref(false);
+    const finished = ref(false);
+    const refreshing = ref(false);
+    const curPage=  ref(1);
+    const columns= [];
+    const showPicker = ref(true)
+
+        const props = defineProps({
+        visible: {
+          type: Boolean,
+          default: false
         },
-        props: {
-            visible: {
-                type: Boolean,
-                default: true
-            },
-            content: {
-                type: String,
-                default: ''
-            }
+        enterpriseNumber: {
+          type: String,
+          default: false
+        },
+        content: {
+            type: String,
+            default: ''
         },
-        created() {
-            // this.queryList();
-            this.queryDict();
+        lawEnforcementId: {
+            type: String,
+            default: ''
         },
-        methods: {
-            closePopup() {
-                this.$emit('close');
-            },
-            queryList() {
-                this.searchParam.reason = this.checkCss;
-                this.searchParam.pageNum = (this.curPage-1)*this.searchParam.pageSize;
-                queryEnterpriseInfoList(this.searchParam, success => {
-                    this.curPage++;
-                    this.loading = false;   // 查出结果停止加载
-                    if (success.total <= this.enterpriseList.length) {
-                        // 查到最后没数据
-                        this.finished = true;
-                        return;
-                    }
-                    // this.enterpriseList.push(...success.data);
-                    this.enterpriseList.push(...success.rows);
-                });
-            },
-            search() {
-                this.curPage = 1;
-                this.enterpriseList = [];
-                this.onRefresh();
-            },
-            queryDict() {
-                this.dicts = [];
-                getDict({"dictType":"no-scan-reason"}, success => {
-                    if (success.success) {
-                        this.dicts.push(...success.data);
-                    }
-                });
-            },
-            toDetail(item) {
-                this.$router.push({
-                    // path: "/sign",
-                    path: "/enterpriseScanPreview",
-                    query: {
-                        reason: this.reason,
-                        checkCss: this.checkCss,
-                        enterpriseNumber: item.salt,
-                        isNoScan: true,
-                    }
-                });
-            },
-            checkReason(val, key) {
-                this.reason = val;
-                this.checkCss = key;
-            },
-            closeReason() {
-                this.isCheck = false;
-            },
-            cancel() {
-                this.searchParam.enterpriseName = '';
-                this.search()
-            },
-            // 返回
-            goBack() {
-                this.$router.go(-1);
-            },
-
-            //下拉刷新
-            onRefresh() {
-                // 清空列表数据
-                this.enterpriseList = [];
-                this.finished = false;
-
-                // 重新加载数据
-                // 将 loading 设置为 true，表示处于加载状态
-                this.loading = true;
-                this.onLoad();
-            },
-            // 触底加载
-            onLoad() {
-                let that = this;
-                setTimeout(() => {
-                    if (that.refreshing) {
-                        that.refreshing = false;
-                    }
-                    that.queryList();
-                }, 1000);
-            },
-        }
+    })
+    // props: {
+    //     visible: {
+    //         type: Boolean,
+    //         default: true
+    //     },
+    //     content: {
+    //         type: String,
+    //         default: ''
+    //     }
+    // }
+    // created() {
+    //     // this.queryList();
+    //     this.queryDict();
+    // },
+    onMounted(() =>{
+      queryDict();
+    })
+    const closePopup = () =>{
+            this.$emit('close');
+    }
+    const queryList =() =>{
+        searchParam.reason = checkCss;
+        searchParam.pageNum = (curPage.value-1)*searchParam.pageSize;
+        queryEnterpriseInfoList(searchParam, success => {
+            curPage.value++;
+            loading.value = false;   // 查出结果停止加载
+            if (success.total <= enterpriseList.value.length) {
+                // 查到最后没数据
+                finished.value = true;
+                return;
+            }
+            // this.enterpriseList.push(...success.data);
+            enterpriseList.value.push(...success.rows);
+        });
+    }
+    const search = () =>{
+        curPage.value = 1;
+        enterpriseList.value = [];
+        onRefresh();
+    }
+    const queryDict = () => {
+        dicts.value = []; 
+        getDict({"dictType":"no-scan-reason"}, success => {
+            if (success.success) {
+               dicts.value.push(...success.data);
+            }
+            for (let index = 0; index < success.data.length; index++) {
+              const element = success.data[index];
+              console.log(element);
+              var obj = {
+                "text": element.dictLabel,
+                "value":element.dictValue
+              }
+              columns.push(obj);
+            }
+        });
+    }
+    const toDetail = (item) =>{
+      router.push({
+            // path: "/sign",
+            path: "/enterpriseScanPreview",
+            query: {
+                reason: reason.value,
+                checkCss: checkCss.value,
+                enterpriseNumber: item.salt,
+                isNoScan: true,
+            }
+        });
+    }
+    const checkReason = (val, key)=> {
+        reason = val;
+        checkCss = key;
+    }
+    const closeReason =() =>{
+        isCheck = false;
+    }
+    const cancel = () =>{
+        searchParam.enterpriseName = '';
+        search()
+    }
+    // 返回
+    const goBack = () =>{
+      router.go(-1);
+    }
+
+    //下拉刷新
+    const onRefresh =() => {
+        // 清空列表数据
+        enterpriseList.value = [];
+        finished.value = false;
+
+        // 重新加载数据
+        // 将 loading 设置为 true，表示处于加载状态
+        loading.value = true;
+        onLoad();
+    }
+    // 触底加载
+    const onLoad = () => {
+        setTimeout(() => {
+            if (refreshing.value) {
+                refreshing.value = false;
+            }
+            queryList();
+        }, 1000);
+    }
+    const onConfirm = (item) =>{
+        showPicker.value = false;
+        var obj = item.selectedOptions[0];
+        reason.value = obj.text;
+        checkCss.value = obj.value;
+        console.log(item);
     }
+      
+    
 </script>
 
 <style scoped>

src/views/enforce/scanQrCode.vue

@@ -47,11 +47,16 @@
             <!-- </refresh-list> -->
         </div>
 
+        
         <!-- 底部 -->
         <!-- <div class="footer_body">
             <footer-nav></footer-nav>
         </div> -->
     </div>
+    <!-- <van-popup v-model:show="data.showNoScanPicker" position="bottom">
+        <van-calendar v-model:show="data.showOperatingTermPicker" type="range"
+        :min-date="data.minDate" :max-date="data.maxDate" @confirm="onOperatingTermConfirm" />
+      </van-popup> -->
 
 </template>
 
@@ -64,6 +69,8 @@
     import {szyptGetToken} from "../../api/Home";
     import wx from "weixin-js-sdk";
 
+    import noScan from '@/views/enforce/noScan.vue';
+
     const {useCommon} = $globalStore;
     const router = useRouter();
     let carouselList = reactive([]); // 轮播列表
@@ -74,7 +81,9 @@
         listLoading: false, // 是否加载中
         listFinished: false, // 是否加载完成标识
     });
-    const data = reactive({});
+    const data = reactive({
+      showNoScanPicker: ref(false)
+    });
     const boutiqueAttr = reactive({
         columnNum: 4,
         itemClass: "boutique_item",

src/views/enforce/sign.vue

@@ -166,7 +166,6 @@
                     type="time"
                     v-model="data.currentDate"
                     @confirm="onConfirm"
-                    @cancel="data.showTimePicker = false"
             />
             <van-date-picker
                     v-if="data.showBl"
@@ -336,7 +335,7 @@
         //统一信用码
         enterpriseNumber: "",
         //执法时间
-        enforcementTime: formattedTimeYYYYmmdd(new Date()),
+        enforcementTime: formattedTime(new Date()),
         //后台保存图片列表
         fileList: [],
         //vant组件上传照片列表