From 76bbc0d46956f4959ba27c522c45aaad0060119e Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 18 Jun 2024 16:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                               |   3 +
 src/views/administrative/appointment.vue      |  52 +++-
 src/views/administrative/appointmentEdit.vue  |  66 +++++
 src/views/administrative/deptFilter.vue       | 256 ++++++++++++++++++
 src/views/enforce/lawFilter.vue               | 248 +++++++++++++++++
 src/views/enforce/sign.vue                    |  31 ++-
 .../enterprise/enterpriseInspectionDetail.vue |   4 -
 7 files changed, 650 insertions(+), 10 deletions(-)
 create mode 100644 src/views/administrative/deptFilter.vue
 create mode 100644 src/views/enforce/lawFilter.vue

diff --git a/src/api/user.js b/src/api/user.js
index 174645c..682be9a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -3,3 +3,6 @@ import { _get, _post,_form,_delete } from "../http/index";
 //查询用户列表
 export const queryUsers = (params, success, error) => _get("/app/listApp",params,success,error)
 export const queryAUsers = (params, success, error) => _get("/app/listAApp",params,success,error)
+
+//查询部门列表
+export const queryDepts = (params, success, error) => _get("/app/listDeptApp",params,success,error)
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 9641334..6745453 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -95,8 +95,28 @@
                         show-word-limit
                 />
 
+                <van-cell center title="是否联合检查">
+                    <template #right-icon>
+                        <van-switch v-model="data.checked" @click="!data.checked"/>
+                    </template>
+                </van-cell>
+                <van-field
+                        v-if="data.checked"
+                        v-model="submitData.deptTexts"
+                        label="检查部门"
+                        rows="2"
+                        autosize
+                        type="textarea"
+                        maxlength="50"
+                        placeholder="请选择"
+                        show-word-limit
+                        readonly
+                        @click="data.deptChecked=true"
+                />
+
 
-                    <van-action-bar>
+
+                <van-action-bar>
                         <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
                         <van-button round block type="info" native-type="submit" @click="submit112">提交</van-button>
                     </van-action-bar>
@@ -138,6 +158,9 @@
                         @cancel="gaCancel"
             />
         </van-popup>
+
+        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
+                   @reciveData="reciveDept"/>
     </div>
 </template>
 
@@ -158,6 +181,7 @@
     import {uploadFile} from "../../util/fileUpload";
     //用户筛选弹窗
     import UserPopup from './userFilter.vue';
+    import DeptPopup from './deptFilter.vue';
 
     const {useCommon} = $globalStore;
 
@@ -174,7 +198,10 @@
         checkRequireText: "",
         ga_columns: [],
         item_columns: [],
-        currentDate: []
+        currentDate: [],
+        checked: false,
+        deptChecked: false,
+        deptContent: '',
     });
     //保存参数
     const submitData = reactive({
@@ -216,7 +243,10 @@
         lawEnforcerTwoId: "",
         /** 备注 */
         remark: "",
-        userId: useCommon.userId
+        userId: useCommon.userId,
+        deptTexts: "",
+        deptObjs: [],
+        isUnite: 0,
     })
 
     const currentDate =() => {
@@ -247,6 +277,7 @@
     }
     const closePopup = () => {
         data.popupVisible = false;
+        data.deptChecked = false;
     }
     const reciveVisible = (item) => {
         submitData.lawEnforcerTwo = item.userName
@@ -256,6 +287,15 @@
         submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
     }
 
+    const reciveDept = (item) => {
+        submitData.deptTexts = "";
+        submitData.deptObjs = [];
+        for (var i=0; i<item.length; i++) {
+            submitData.deptTexts += item[i].deptName+";";
+            submitData.deptObjs.push({ deptId: item[i].deptId, deptName: item[i].deptName });
+        }
+    }
+
     /* 检查要求 start */
     const gaConfirm = ({selectedOptions}) => {
         data.checkRequireText = selectedOptions[0].text;
@@ -308,6 +348,8 @@
     const tmpSave = () => {
         // showSuccessToast('临时保存');
         submitData.lawCertificateNum = null;
+        submitData.isUnite = 0;
+        if (data.checked) { submitData.isUnite = 1; }
         addEnterpriseLawEnforcement(submitData, success => {
             //跳转企业二维码地址
             if (success.success) {
@@ -325,6 +367,8 @@
     const submit112 = () => {
         // showSuccessToast('登记成功');
         submitData.lawCertificateNum = null;
+        submitData.isUnite = 0;
+        if (data.checked) { submitData.isUnite = 1; }
         editEnterpriseLawEnforcement(submitData, success => {
             //跳转企业二维码地址
             if (success.success) {
@@ -380,7 +424,7 @@
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() => {
         // 数据填充
-        dataFillIn();
+        // dataFillIn();
 
         currentDate();
 
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 1167b8b..c82b49a 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -90,6 +90,25 @@
                         show-word-limit
                 />
 
+                <van-cell center title="是否联合检查">
+                    <template #right-icon>
+                        <van-switch v-model="data.checked" @click="!data.checked"/>
+                    </template>
+                </van-cell>
+                <van-field
+                        v-if="data.checked"
+                        v-model="submitData.deptTexts"
+                        label="检查部门"
+                        rows="2"
+                        autosize
+                        type="textarea"
+                        maxlength="50"
+                        placeholder="请选择"
+                        show-word-limit
+                        readonly
+                        @click="data.deptChecked=true"
+                />
+
                 <div class="warp_body">
                     <van-action-bar>
                         <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
@@ -131,6 +150,9 @@
                         @cancel="gaCancel"
             />
         </van-popup>
+
+        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
+                   @reciveData="reciveDept"/>
     </div>
 </template>
 
@@ -147,6 +169,7 @@
     import {uploadFile} from "../../util/fileUpload";
     //用户筛选弹窗
     import UserPopup from './userFilter.vue';
+    import DeptPopup from './deptFilter.vue';
     const router = useRouter();
     //路由参数
     const route = useRoute();
@@ -164,6 +187,10 @@
         checkRequireText: "",
         ga_columns: [],
         item_columns: [],
+        currentDate: [],
+        checked: false,
+        deptChecked: false,
+        deptContent: '',
     });
     //保存参数
     const submitData = reactive({
@@ -205,6 +232,10 @@
         lawEnforcerTwoId:"",
         /** 备注 */
         remark:"",
+        deptTexts: "",
+        deptObjs: [],
+        isUnite: 0,
+        uniteCheck:"",
     })
 
 
@@ -229,6 +260,7 @@
     }
     const closePopup = () =>{
         data.popupVisible = false;
+        data.deptChecked = false;
     }
     const reciveVisible = (item) =>{
         submitData.lawEnforcerTwo = item.userName
@@ -238,6 +270,15 @@
         submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
     }
 
+    const reciveDept = (item) => {
+        submitData.deptTexts = "";
+        submitData.deptObjs = [];
+        for (var i=0; i<item.length; i++) {
+            submitData.deptTexts += item[i].deptName+";";
+            submitData.deptObjs.push({ deptId: item[i].deptId, deptName: item[i].deptName });
+        }
+    }
+
     /* 检查要求 start */
     const gaConfirm = ({ selectedOptions }) => {
         data.checkRequireText = selectedOptions[0].text;
@@ -271,6 +312,7 @@
 
     const dataFillIn = (id) => {
         getByIdToDataFillIn(id,success =>{
+            console.log(success);
             //跳转企业二维码地址
             if(success.success){
                 Object.keys(submitData).forEach((item) => {
@@ -280,6 +322,16 @@
                 data.checkRequireText =success.data['params'].checkRequireText;
                 submitData.lawEnforcerText =success.data['lawEnforcer'];
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
+
+                if (success.data.deptObjs.length > 1) {
+                    data.checked = true;
+                }
+                submitData.deptTexts = "";
+                submitData.deptObjs = [];
+                for (var i=0; i<success.data.deptObjs.length; i++) {
+                    submitData.deptTexts += success.data.deptObjs[i].deptName+";";
+                    submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
+                }
                 // showSuccessToast('保存成功');
             }
         },error=>{
@@ -289,6 +341,13 @@
 
     const tmpSave = () => {
         showSuccessToast('临时保存');
+        submitData.isUnite = 0;
+        if (data.checked) {
+            submitData.isUnite = 1;
+        } else {
+            submitData.deptTexts = "";
+            submitData.deptObjs = [];
+        }
         addEnterpriseLawEnforcement(submitData,success =>{
             //跳转企业二维码地址
             if(success.success){
@@ -305,6 +364,13 @@
 
     const submit112 = () =>{
         showSuccessToast('登记成功');
+        submitData.isUnite = 0;
+        if (data.checked) {
+            submitData.isUnite = 1;
+        } else {
+            submitData.deptTexts = "";
+            submitData.deptObjs = [];
+        }
         editEnterpriseLawEnforcement(submitData,success =>{
             //跳转企业二维码地址
             if(success.success){
diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
new file mode 100644
index 0000000..2705f7b
--- /dev/null
+++ b/src/views/administrative/deptFilter.vue
@@ -0,0 +1,256 @@
+<template>
+    <div v-if="visible" class="van-overlay"></div>
+    <div v-if="visible" class="popup">
+        <div class="popup-title">部门查询</div>
+        <!-- 关闭按钮 -->
+        <label class="close-button" @click="closePopup"></label>
+
+        <!-- 弹窗的内容 -->
+        <div class="popup-content">
+            <div class="subsearch">
+                <input class="searchbox" v-model="searchParam.deptName" placeholder="请输入部门名称"/>
+            </div>
+            <div class="btnbox">
+                <button class='btn-reset' @click="cancel()">重置</button>
+                <button class='btn-search' @click="queryList()">搜索</button>
+                <button class='btn-search' @click="selectData()">确定</button>
+            </div>
+
+            <div class="search-result">
+                <van-checkbox-group v-model="checked">
+                    <van-cell-group inset>
+                        <van-cell v-for="(item, index) in dataList" :key="item" @click="toggle(index)" :title="item.deptName" clickable>
+                            <template #right-icon>
+                                <van-checkbox :name="item" :ref="el => checkboxRefs[index] = el" @click.stop/>
+                            </template>
+                        </van-cell>
+                    </van-cell-group>
+<!--                    <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">-->
+<!--                        <div class="case-title">部门：{{ item.deptName }}</div>-->
+<!--                        <div class="case-depart">电话：{{ item.phonenumber }}</div>-->
+<!--                        <div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>-->
+<!--                    </div>-->
+                </van-checkbox-group>
+            </div>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import {ref} from 'vue'
+    import {queryDepts} from '../../api/user'
+
+    const {useCommon} = $globalStore
+    export default {
+        props: {
+            visible: {
+                type: Boolean,
+                default: false
+            },
+            content: {
+                type: String,
+                default: ''
+            },
+        },
+        data() {
+            return {
+                searchParam: {
+                    //搜索框
+                    dataScopeId: useCommon.userId,
+                    deptName: '',
+                },
+                dataList: [],
+                checked: ref([]),
+                checkboxRefs: ref([]),
+            }
+        },
+        created() {
+            // this.queryList()
+        },
+        methods: {
+            toggle(index) {
+                this.checkboxRefs[index].toggle();
+            },
+            closePopup() {
+                this.$emit('close');
+            },
+            queryList() {
+                queryDepts(this.searchParam, success => {
+                    console.log(success);
+                    this.dataList = success.data
+                }, error => {
+                })
+            },
+            cancel() {
+                this.searchParam.userName = '';
+                this.queryList()
+            },
+            selectData() {
+                this.$emit("reciveData", JSON.parse(JSON.stringify(this.checked)));
+                this.$emit('close');
+            },
+        }
+
+    }
+</script>
+
+<style scoped>
+    .popup {
+        position: fixed;
+        z-index: 999;
+        top: 3rem;
+        left: 0;
+        width: 100%;
+        height: calc(100% - 3rem);;
+        background: #fff;
+        overflow: hidden;
+    }
+
+    .popup-title {
+        margin: 0.3rem 0 0;
+        width: 100%;
+        height: 1rem;
+        border-bottom: 1px solid #f3f4f5;
+        text-align: center;
+        font-size: 0.42rem;
+        font-weight: 600;
+    }
+
+    .close-button {
+        position: absolute;
+        top: 0.15rem;
+        right: 0.1rem;
+        width: 0.8rem;
+        height: 0.8rem;
+        background-color: rgba(255, 255, 255, .5);
+        border: 0.05rem solid rgba(255, 255, 255, .7);
+        border-radius: 50%;
+        transform: rotate(45deg);
+    }
+
+    .close-button:before,
+    .close-button:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        background: #333;
+        border-radius: 50%;
+        transform: translate(-50%, -50%);
+        height: 0.4rem;
+        width: 0.02rem;
+    }
+
+    .close-button:after {
+        height: 0.02rem;
+        width: 0.4rem;
+    }
+
+    .popup-content {
+        margin: 0.25rem 3% 0;
+        padding-bottom: 3rem;
+        width: 94%;
+        height: calc(100% - 1.6rem);
+        overflow-y: auto;
+        font-size: 0.38rem;
+    }
+
+    .subsearch {
+        width: 100%;
+        height: 1.25rem;
+    }
+
+    .searchbox {
+        margin: 2% 3%;
+        padding: 0.15rem 0.3rem 0.1rem 1.15rem;
+        width: 94%;
+        height: 1.0rem;
+        background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
+        background-position: left 0.5rem center;
+        background-size: auto 50%;
+        box-sizing: border-box;
+        border: 1px solid rgba(0, 0, 0, .05);
+        border-radius: 0.5rem;
+        color: #999999;
+        outline: none;
+    }
+
+    .subtitle {
+        margin: 0.5rem 0 0.25rem;
+        font-size: 0.4rem;
+        font-weight: 600;
+    }
+
+    .quick-item {
+        display: flex;
+    }
+
+    .quick-item span {
+        display: inline-block;
+        margin: 1% 0 2% 3.5%;
+        padding: 2% 3.75%;
+        background: #f2f3f4;
+        border: 0;
+        border-radius: 8px;
+        color: #4c4c4c;
+    }
+
+    .quick-item span.seled {
+        background: #e9f2fb;
+        color: #1367fe;
+    }
+
+    .btnbox {
+        display: flex;
+        justify-content: center;
+        margin: 5% 2%;
+        width: 96%;
+        height: 1.0rem;
+    }
+
+    .btn-reset,
+    .btn-search {
+        display: inline-block;
+        margin: 0 2%;
+        padding: 0;
+        width: 60%;
+        color: #fff;
+        font-size: 0.38rem;
+        border-radius: 1rem;
+        background: #1367fe;
+        border: 1px solid #1367fe;
+        text-align: center;
+    }
+
+    .btn-reset {
+        width: 35%;
+        background-color: #fff;
+        border-color: rgba(19, 103, 254, .7);
+        color: #1367fe;
+    }
+
+    .search-result {
+        width: 100%;
+        padding-bottom: 2rem;
+    }
+
+    .case-item {
+        margin: 3% 2%;
+        padding: 2% 0;
+        width: 96%;
+        font-size: 0.35rem;
+        border-bottom: 1px solid #f4f4f4;
+        color: #999;
+        line-height: 2;
+    }
+
+    .case-title {
+        margin: 2% 0;
+        font-size: 0.42rem;
+        color: #333;
+        line-height: 1.25;
+    }
+
+
+</style>
\ No newline at end of file
diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue
new file mode 100644
index 0000000..7b9503b
--- /dev/null
+++ b/src/views/enforce/lawFilter.vue
@@ -0,0 +1,248 @@
+<template>
+    <div v-if="visible" class="van-overlay"></div>
+    <div v-if="visible" class="popup">
+        <div class="popup-title">预约查询</div>
+        <!-- 关闭按钮 -->
+        <label class="close-button" @click="closePopup"></label>
+
+        <!-- 弹窗的内容 -->
+        <div class="popup-content">
+            <div class="subsearch">
+                <input class="searchbox" v-model="searchParam.enterpriseName" placeholder="请输入企业名称"/>
+            </div>
+            <div class="btnbox">
+                <button class='btn-reset' @click="cancel()">重置</button>
+                <button class='btn-search' @click="queryList()">搜索</button>
+            </div>
+
+            <div class="search-result">
+                <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-depart">执法项：{{ item.checkItem }}</div>
+<!--                    <div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>-->
+                </div>
+            </div>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import {ref} 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: ''
+            }
+        },
+        data() {
+            return {
+                searchParam: {
+                    //搜索框
+                    dataScopeId: useCommon.userId,
+                    enterpriseName: '',
+                },
+                dataList: [],
+            }
+        },
+        created() {
+            // this.queryList()
+        },
+        methods: {
+            closePopup() {
+                this.$emit('close');
+            },
+            queryList() {
+                queryEnforcementList({"lawEnforcementId": this.lawEnforcementId, "enterpriseNumber": this.enterpriseNumber, "isReg": 0, "isSubmit": 1}, success => {
+                    this.dataList = success.data
+                }, error => {
+                })
+            },
+            cancel() {
+                this.searchParam.userName = '';
+                this.queryList()
+            },
+            selectData(item) {
+                this.$emit("reciveData", JSON.parse(JSON.stringify(item)));
+                this.$emit('close');
+            },
+        }
+
+    }
+</script>
+
+<style scoped>
+    .popup {
+        position: fixed;
+        z-index: 999;
+        top: 3rem;
+        left: 0;
+        width: 100%;
+        height: calc(100% - 3rem);;
+        background: #fff;
+        overflow: hidden;
+    }
+
+    .popup-title {
+        margin: 0.3rem 0 0;
+        width: 100%;
+        height: 1rem;
+        border-bottom: 1px solid #f3f4f5;
+        text-align: center;
+        font-size: 0.42rem;
+        font-weight: 600;
+    }
+
+    .close-button {
+        position: absolute;
+        top: 0.15rem;
+        right: 0.1rem;
+        width: 0.8rem;
+        height: 0.8rem;
+        background-color: rgba(255, 255, 255, .5);
+        border: 0.05rem solid rgba(255, 255, 255, .7);
+        border-radius: 50%;
+        transform: rotate(45deg);
+    }
+
+    .close-button:before,
+    .close-button:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        background: #333;
+        border-radius: 50%;
+        transform: translate(-50%, -50%);
+        height: 0.4rem;
+        width: 0.02rem;
+    }
+
+    .close-button:after {
+        height: 0.02rem;
+        width: 0.4rem;
+    }
+
+    .popup-content {
+        margin: 0.25rem 3% 0;
+        padding-bottom: 3rem;
+        width: 94%;
+        height: calc(100% - 1.6rem);
+        overflow-y: auto;
+        font-size: 0.38rem;
+    }
+
+    .subsearch {
+        width: 100%;
+        height: 1.25rem;
+    }
+
+    .searchbox {
+        margin: 2% 3%;
+        padding: 0.15rem 0.3rem 0.1rem 1.15rem;
+        width: 94%;
+        height: 1.0rem;
+        background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat;
+        background-position: left 0.5rem center;
+        background-size: auto 50%;
+        box-sizing: border-box;
+        border: 1px solid rgba(0, 0, 0, .05);
+        border-radius: 0.5rem;
+        color: #999999;
+        outline: none;
+    }
+
+    .subtitle {
+        margin: 0.5rem 0 0.25rem;
+        font-size: 0.4rem;
+        font-weight: 600;
+    }
+
+    .quick-item {
+        display: flex;
+    }
+
+    .quick-item span {
+        display: inline-block;
+        margin: 1% 0 2% 3.5%;
+        padding: 2% 3.75%;
+        background: #f2f3f4;
+        border: 0;
+        border-radius: 8px;
+        color: #4c4c4c;
+    }
+
+    .quick-item span.seled {
+        background: #e9f2fb;
+        color: #1367fe;
+    }
+
+    .btnbox {
+        display: flex;
+        justify-content: center;
+        margin: 5% 2%;
+        width: 96%;
+        height: 1.0rem;
+    }
+
+    .btn-reset,
+    .btn-search {
+        display: inline-block;
+        margin: 0 2%;
+        padding: 0;
+        width: 60%;
+        color: #fff;
+        font-size: 0.38rem;
+        border-radius: 1rem;
+        background: #1367fe;
+        border: 1px solid #1367fe;
+        text-align: center;
+    }
+
+    .btn-reset {
+        width: 35%;
+        background-color: #fff;
+        border-color: rgba(19, 103, 254, .7);
+        color: #1367fe;
+    }
+
+    .search-result {
+        width: 100%;
+        padding-bottom: 2rem;
+    }
+
+    .case-item {
+        margin: 3% 2%;
+        padding: 2% 0;
+        width: 96%;
+        font-size: 0.35rem;
+        border-bottom: 1px solid #f4f4f4;
+        color: #999;
+        line-height: 2;
+    }
+
+    .case-title {
+        margin: 2% 0;
+        font-size: 0.42rem;
+        color: #333;
+        line-height: 1.25;
+    }
+
+
+</style>
\ No newline at end of file
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 0178f8c..de21190 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -75,8 +75,8 @@
                       v-model="data.lawEnforcementBasisText"
                       required
                       readonly
-                      label="检查依据"
                       :rules="[{ required: true, message: '必填项' }]"
+                      label="检查依据"
                       placeholder="必填 执法依据"
                       @click="showPopupqz"
                       type="textarea"
@@ -108,6 +108,17 @@
                       show-word-limit
                     />
 
+                    <van-field
+                            v-model="submitData.lawText"
+                            label="检查项"
+                            maxlength="50"
+                            placeholder="请选择"
+                            readonly
+                            required
+                            :rules="[{ required: true, message: '必填项' }]"
+                            @click="data.lawChecked=true"
+                    />
+
                     <van-divider class="divdsty" />
 
                     <div class="file-upload">
@@ -144,7 +155,7 @@
                 </van-cell-group>
 
                 <van-action-bar>
-                  <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
+<!--                  <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>-->
                   <van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button>
                 </van-action-bar>
             </van-form>
@@ -170,6 +181,9 @@
 <!--                        @cancel="gaCancel"-->
 <!--            />-->
 <!--        </van-popup>-->
+
+        <LawPopup :lawEnforcementId="submitData.lawEnforcementId" :enterpriseNumber="submitData.enterpriseNumber" :visible="data.lawChecked" :content="data.lawContent" @close="closePopup"
+                   @reciveData="reciveLaw"/>
 	</div>
 </template>
 
@@ -185,6 +199,7 @@ import {formattedTime} from "@/util/util";
 import Compressor from 'compressorjs'
 //用户筛选弹窗
 import Popup from './userFilter.vue';
+import LawPopup from './lawFilter.vue';
 import PopupA from './assistUserFilter.vue';
 import Popupzq from './zqyjjdmFilter.vue';
 import {getDict} from "../../api/Home";
@@ -216,6 +231,8 @@ const data = reactive({
     ga_columns: [],
     item_columns: [],
     isNoScan: false,
+    lawChecked: false,
+    lawContent: "",
 });
 var fileSize = 0;
 //保存参数
@@ -258,6 +275,9 @@ const submitData = reactive({
     fileListObj:[],
     // 数据保存或提交 0 保存 1提交
     isSubmit: 0,
+    lawId: "",
+    lawText: "",
+    uniteCheck: "",
 })
 
 const tapGood = () => {
@@ -313,6 +333,7 @@ onMounted(() =>{
     // dataFillIn();
     submitData.enforce = route?.query?.reason;
     data.isNoScan = route?.query?.isNoScan;
+    submitData.enterpriseNumber = route?.query?.enterpriseNumber;
     console.log(data.isNoScan)
 
     //查询企业信息
@@ -473,6 +494,7 @@ const closePopup = () =>{
     data.popupVisible = false;
     data.popupVisible2 = false;
     data.popupVisibleqz = false;
+    data.lawChecked = false;
 }
 const reciveData = (item) =>{
     submitData.lawEnforcerTwo = item.userName;
@@ -492,6 +514,11 @@ const reciveDataqz = (item) =>{
     // submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum;
     data.lawEnforcementBasisText = item.lawName;
 }
+const reciveLaw = (item) => {
+    submitData.lawId = item.id;
+    submitData.lawText = item.checkItem;
+    submitData.uniteCheck = item.uniteCheck;
+}
 
 const beforeRead = (file) =>{
       if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') {
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 77792a1..26d8a42 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -73,9 +73,6 @@
               rows="2"
               autosize
               type="textarea"
-              maxlength=""
-              placeholder=""
-              show-word-limit
               readonly
             />
         </van-form>
@@ -194,7 +191,6 @@ onMounted(() =>{
         submitData.linkMan = success.data.linkMan;
         submitData.linkTel = success.data.linkTel;
         submitData.checkTime = formattedTimeYYYYmmdd(success.data.checkTime);
-        
         submitData.remark = success.data.remark;
 
         setLinkageItem(submitData.checkItem);