diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js
index 9afc943..5b77aa3 100644
--- a/src/common/globalRouter.js
+++ b/src/common/globalRouter.js
@@ -4,8 +4,8 @@ let routes = [
 	{
 		path: "/",
 		// redirect: "/home",
-		redirect: "/enforceHome",
-		// redirect: "/login",
+		// redirect: "/enforceHome",
+		redirect: "/login",
 		name: "App",
 	},
 	{
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 97e6d6e..e4cd5e9 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -111,6 +111,7 @@
         router.push({
             path: "/enterprise/complaint",
             query: {
+                comOrOpi: 0,
                 isSelect: true
             }
         });
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index f2c1cb7..15b9566 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -167,23 +167,23 @@
                 data.finished = true;
                 return;
             }
-            for (let index = 0; index < success.rows.length; index++) {
-              const element = success.rows[index];
-              console.log(element);
-              // element.planName = element.planYear + element.planName;
-              if(element.timeType == 'quarter'){
-                let val = "";
-                if(element.quarter == "1") val = "一季度";
-                if(element.quarter == "2") val = "二季度";
-                if(element.quarter == "3") val = "三季度";
-                if(element.quarter == "4") val = "四季度";
-                element.planName = element.planYear + "年" + val +  element.planName;
-              }else if (element.timeType == 'month') {
-                const val = element.mouth + "月";
-                element.planName = element.planYear + "年" + val +  element.planName;
-              }
-              element.planName = element.bureauDeptName + element.planName;
-            }
+            // for (let index = 0; index < success.rows.length; index++) {
+            //   const element = success.rows[index];
+            //   console.log(element);
+            //   // element.planName = element.planYear + element.planName;
+            //   if(element.timeType == 'quarter'){
+            //     let val = "";
+            //     if(element.quarter == "1") val = "一季度";
+            //     if(element.quarter == "2") val = "二季度";
+            //     if(element.quarter == "3") val = "三季度";
+            //     if(element.quarter == "4") val = "四季度";
+            //     element.planName = element.planYear + "年" + val +  element.planName;
+            //   }else if (element.timeType == 'month') {
+            //     const val = element.mouth + "月";
+            //     element.planName = element.planYear + "年" + val +  element.planName;
+            //   }
+            //   element.planName = element.bureauDeptName + element.planName;
+            // }
             // data.dataList = success.data;
             data.dataList.push(...success.rows);
 
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index e644497..8eec170 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -305,10 +305,13 @@
        data.showIsPublish = true;
     }
     const addPlan = (val) =>{
+      var tmpPlanName = submitData.planName;
+      submitData.planName = nameObj.bureauDept + nameObj.planYear + nameObj.quarter + nameObj.mouth + nameObj.planName;
       addEnforcementInspectionProgram(submitData, success => {
                 //跳转企业二维码地址
+                submitData.planName = tmpPlanName;
                 if (success.success) {
-                data.showIsPublish = false;
+                  data.showIsPublish = false;
                     showSuccessToast('保存成功');
                     router.push(
                         {
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 091aee6..570ea13 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -270,10 +270,10 @@
         // getSzyptLoginAuth(route?.query?.code,success =>{
         getSzyptLoginAuth(code, success => {
             console.log(success)
-            // useCommon.SET_USER_ID(success.data.userId);
-            // useCommon.SET_TOKEN(success.data.token);
-            // useCommon.SET_HAS_LAW(success.data.lawOfficer);
-            useCommon.SET_HAS_LAW(true);
+            useCommon.SET_USER_ID(success.data.userId);
+            useCommon.SET_TOKEN(success.data.token);
+            useCommon.SET_HAS_LAW(success.data.lawOfficer);
+            // useCommon.SET_HAS_LAW(true);
             // if (useCommon.firstLoad) {
                 isLoading.value = false;
             // }
diff --git a/src/views/enterprise/compaint/compaintDetailIndex.vue b/src/views/enterprise/compaint/compaintDetailIndex.vue
index cbefdb6..f2ca6ce 100644
--- a/src/views/enterprise/compaint/compaintDetailIndex.vue
+++ b/src/views/enterprise/compaint/compaintDetailIndex.vue
@@ -89,7 +89,7 @@
       complaintInfoProcessById({id:route?.query?.id},success =>{
         console.log("====> : ", success)
         responData.value = success.data;
-        console.log(responData.value);
+        console.log('---->',responData.value);
         indexTab.value = 0;
       },error =>{})
     })
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index c5e4b62..2d376a5 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -10,7 +10,7 @@
             </header-nav>
         </div>-->
         <!-- 中间 -->
-        <div v-if="submitData.comOrOpi==1">
+        <!-- <div v-if="submitData.comOrOpi==1">
             <van-form @failed="onFailed" @submit="submit">
                 <van-cell-group>
                     <view v-if="data.isSelect=='true'">
@@ -80,12 +80,11 @@
                     </div>
                 </van-cell-group>
                 <van-action-bar>
-                    <!--                <van-action-bar-button color="#1367fe" text="提交" @click="submit"/>-->
                     <van-button round block type="info" native-type="submit">提交</van-button>
                 </van-action-bar>
             </van-form>
-        </div>
-        <div v-else class="warp_body">
+        </div> -->
+        <div class="warp_body">
             <!-- <span class="rigbtn" @click="toNoScanView">入企不扫码投诉</span> -->
             <van-form @failed="onFailed" @submit="submit">
                 <van-cell-group>
@@ -115,16 +114,31 @@
                         />
                     </view>
                     <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
-                    <van-field
-                            v-model="submitData.enforceTypeText"
-                            required
-                            :rules="[{ required: true, message: '请选择投诉类型' }]"
-                            label="投诉类型"
-                            placeholder="请选择"
-                            is-link
-                            readonly
-                            clickable
-                    />
+                    <view v-if="submitData.comOrOpi==0">
+                        <van-field
+                                v-model="submitData.enforceTypeText"
+                                required
+                                :rules="[{ required: true, message: '请选择投诉类型' }]"
+                                label="投诉类型"
+                                placeholder="请选择"
+                                is-link
+                                readonly
+                                clickable
+                        />
+                    </view>
+                    <view v-else>
+                        <van-field
+                                v-model="submitData.enforceTypeText"
+                                required
+                                :rules="[{ required: true, message: '请选择投诉类型' }]"
+                                label="投诉类型"
+                                placeholder="请选择"
+                                is-link
+                                readonly
+                                clickable
+                                @click="data.showPicker = true"
+                        />
+                    </view>
                             <!-- @click="selectType" -->
                     <van-popup v-model:show="data.showPicker" position="bottom">
                         <van-picker
@@ -223,7 +237,8 @@
             </van-form>
         </div>
     </div>
-    <UniteDept :visible="data.popupVisible" :deptList="data.dataList" @close="closePopup" @reciveData="reciveDept"/>
+    <!-- <UniteDept :visible="data.popupVisible" :deptList="data.dataList" @close="closePopup" @reciveData="reciveDept"/> -->
+    <MssqFilter :visible="data.popupVisible" :deptList="data.dataList" @close="closePopup" @reciveData="reciveDept"/>
 </template>
 
 <script setup name="register">
@@ -235,6 +250,7 @@
     import {reactive, ref} from "vue";
     import * as w6s from 'szient-js-sdk';
     import UniteDept from '@/views/enterprise/compaint/uniteDept.vue';
+    import MssqFilter from '@/views/enterprise/compaint/selectMssqFilter.vue';
 
     const {useCommon, useMy} = $globalStore
 
@@ -313,6 +329,9 @@
           deptNameArr.push(element.text);
           deptIdArr.push(element.id);
         }
+
+        submitData.fileListObj = []
+
         submitData.complaintDepartmentIds = deptIdArr.join(",");
         submitData.complaintDepartments = deptNameArr.join(",");
         addEnterpriseComplaint(submitData, success => {
@@ -404,15 +423,6 @@
         return true;
     }
     onMounted(() => {
-        console.log("================")
-        console.log(submitData.userId);
-        console.log("================")
-
-        // 如果是直接投诉页面则直接定死字典
-        if (submitData.comOrOpi!=1) {
-            submitData.enforceType = 3;
-            submitData.enforceTypeText = "入企不扫码";
-        }
 
         submitData.relId = route?.query?.id;
         submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText;
@@ -421,8 +431,20 @@
         data.isSelect = route?.query?.isSelect;
         submitData.comOrOpi = route?.query?.comOrOpi;
 
+        // 如果是直接投诉页面则直接定死字典
+        if (submitData.comOrOpi!=1) {
+            submitData.enforceType = 3;
+            submitData.enforceTypeText = "入企不扫码";
+        }
+        console.log("================")
+        console.log(submitData.comOrOpi);
+        console.log("================")
+
         if(route?.query?.complaintDepartmentIds != null && route?.query?.complaintDepartmentIds != ''){
           data.depts = [{text: route?.query?.complaintDepartments,id: route?.query?.complaintDepartmentIds}]
+        } else {
+          data.depts = [{text: route?.query?.bureauDeptName,id: route?.query?.bureauDeptId}]
+          submitData.complaintItemCodes = route?.query?.bureauDeptId
         }
         
 
diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue
index 63127fc..c7f4472 100644
--- a/src/views/enterprise/complaintDetail.vue
+++ b/src/views/enterprise/complaintDetail.vue
@@ -374,6 +374,7 @@
     });
     const initData = (id) => {
         getEnterpriseComplaintById(id, success => {
+            console.log(success.data)
             if (null != success.data) {
                 submitData.relId = id;
                 submitData.problemDescription = success.data.problemDescription;
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index 6d46829..7a37247 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -25,13 +25,11 @@
                               readonly
                       />
                   </view>
-                  <view v-if="data.isNoScan==true">
-                      <van-field
-                              v-model="submitData.enforcementTime"
-                              label="检查时间"
-                              readonly
-                      />
-                  </view>
+                    <van-field
+                            v-model="submitData.createTime"
+                            label="投诉时间"
+                            readonly
+                    />
                   <view v-if="data.isNoScan==false">
                       <van-field
                               v-model="submitData.status"
@@ -73,23 +71,28 @@
                     show-word-limit
                 />
                   <van-divider class="divdsty"/>
-                  <div class="file-upload">
+                  <!-- <div class="file-upload">
                       <van-image v-for="(item, index) in submitData.fileList" :key="index"
                               width="100"
                               height="100"
                               :src="item.url"
+                              @click="showBig(item.url)"
                       />
                       <div class="file-upload-center">
                           <label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label>
                       </div>
-<!--                      <van-uploader v-model="submitData.fileListObj" class="file" multiple max-count="9"-->
-<!--                                    :after-read="uploadFiles" :before-delete="deleteFile">-->
-<!--                          <template #preview-cover="{ file }">-->
-<!--                              <div class="preview-cover van-ellipsis">{{ file.name }}</div>-->
-<!--                          </template>-->
-<!--                      </van-uploader>-->
-
-                  </div>
+                  </div> -->
+                  <div class="file-upload">
+                        <div class="file-upload-center">
+                        <label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label>
+                        </div>
+                        <div class="zoom">
+                        <img v-for="(ite, index) in data.imageList" class="img" :src="ite" alt="预览图片" @click="imagePreview(index)" :key="index" />
+                        <van-image-preview v-model:show="data.show" :images="data.imageList" @change="onChange" ref="imagePre" >
+                            <template v-slot:index>第{{ indexImg + 1 }}页</template>
+                        </van-image-preview>
+                        </div>
+                    </div>
                   <van-divider class="divdsty"/>
 
                   <van-field
@@ -117,10 +120,10 @@
                       <span class="remsty" style="color: gray;">是否授权</span>
                       <span class="accept-item" style="color: gray;">
 
-                        <input disabled="true" class="checksty" type="checkbox" name="checkData" :data-id="0" value="0" v-model="submitData.authorization">同意</span>
+                        <input disabled="true" class="checksty" type="checkbox" name="checkData" v-model="data.has_authorization">同意</span>
 
                       <span class="accept-item" style="color: gray;">
-                        <input disabled="true" class="checksty" type="checkbox" name="checkData" :data-id="1" value="1" v-model="submitData.authorization" >不同意</span>
+                        <input disabled="true" class="checksty" type="checkbox" name="checkData" v-model="data.no_authorization" >不同意</span>
                   </div>
                   <div class="agree-remark">
                       <span class="accept-item">注：选择“同意”，处置部门将通过登记的联系人、联系电话与您联系，并对您的个人信息严格保密。</span>
@@ -138,10 +141,12 @@
 
   import {showSuccessToast, showLoadingToast, closeToast, Toast} from 'vant';
   import {addEnterpriseComplaint, complaintInfoById, mssqQueryEndInfo, toMssqAppraise} from '../../api/enterprise'
+  import { baseUrl } from "@/config/env";
   import {getDict} from '../../api/Home'
   import {uploadFile} from '@/util/fileUpload'
     import { formattedTimeYYYYmmdd } from '@/util/util'
   import {reactive, ref} from "vue";
+  import { showImagePreview } from 'vant'
   import * as w6s from 'szient-js-sdk';
   import {nameCorrect} from'@/util/fileUpload';
 
@@ -150,6 +155,7 @@
   const router = useRouter();
   const route = useRoute();
   let queryaddressId = ref("");
+    const indexImg = ref(0);
   const data = reactive({
       searchResult: [],
       showPicker: false,
@@ -159,9 +165,13 @@
       isCheckedon: false,
       isCheckedoff: false,
       isMssq: false,
+      imageList: [],
+      show: ref(false),
       mssqParams: {},
       // 判断是否入企不扫码
       isNoScan: false,
+      has_authorization: false,
+      no_authorization: false,
   });
   const deptArr = ref([]);
   //保存参数
@@ -302,7 +312,19 @@
       data.isSelect = route?.query?.isSelect;
       submitData.comOrOpi = route?.query?.comOrOpi;
       complaintInfoById({id:route?.query?.id},success =>{
-        console.log("====> : ", success)
+        submitData.authorization = success.data.authorization;
+        if (submitData.authorization == 0) {
+            data.has_authorization = false;
+            data.no_authorization = true;
+        } else if (submitData.authorization == 1) {
+            data.has_authorization = true;
+            data.no_authorization = false;
+        } else {
+            data.has_authorization = false;
+            data.no_authorization = false;
+        }
+        submitData.createTime = success.data.createTime;
+        submitData.enforceType = success.data.enforceType;
         submitData.enforceTypeText = success.data.enforceTypeText;
         submitData.problemDescription = success.data.problemDescription;
         submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
@@ -350,12 +372,22 @@
 
         if ("0"!=success.data.params.res) {
 
+            // data.mssqParams = {
+            //     assessServiceCode: success.data.params.res.proWoCode,
+            //     assessObjectName: success.data.params.res.handleOrgName,
+            //     assessObjectCode: success.data.params.res.proWoCode,
+            //     deptCode: success.data.params.res.handleOrgCode,
+            //     evaluatorName: success.data.params.res.replyDetails,
+            //     evaluatorPapersPhone: success.data.linkmanTel,
+            //     backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
+            //     // backUrl: "http://192.168.31.196:3301/",
+            // }
             data.mssqParams = {
-                assessServiceCode: success.data.params.res.proWoCode,
-                assessObjectName: success.data.params.res.handleOrgName,
-                assessObjectCode: success.data.params.res.proWoCode,
-                deptCode: success.data.params.res.handleOrgCode,
-                evaluatorName: success.data.params.res.replyDetails,
+                assessServiceCode: success.data.proWoCode,
+                assessObjectName: success.data.handleOrgName,
+                assessObjectCode: success.data.proWoCode,
+                deptCode: success.data.handleOrgCode,
+                evaluatorName: success.data.replyDetails,
                 evaluatorPapersPhone: success.data.linkmanTel,
                 backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
                 // backUrl: "http://192.168.31.196:3301/",
@@ -366,7 +398,8 @@
             for (var i=0; i<success.data.params.file.length; i++) {
                 console.log("===> ", success.data.params.file[i].uploadPath)
                 // submitData.fileList.push({"url": "http://127.0.0.1:85/"+success.data.params.file[i].uploadPath})
-                submitData.fileList.push({"url": "http://10.132.108.3:85/"+success.data.params.file[i].uploadPath})
+                submitData.fileList.push({"url": "http://jdm.szssfj.cn/"+success.data.params.file[i].uploadPath})
+                data.imageList.push(baseUrl + success.data.params.file[i].uploadPath);
             }
         }
 
@@ -389,6 +422,15 @@
           path: "/enterprise/complaintNoScan"
       })
   }
+
+  const imagePreview = (newIndex) => {
+    data.show = ref(true);
+  };
+
+    const onChange = (newIndex) => {
+        indexImg.value = newIndex;
+    };
+    
   const reciveData = (item) => {
       console.log(item)
       submitData.lawEnforcementIncidentText = item.lawEnforcementItemText;
diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue
index cadbd07..035740d 100644
--- a/src/views/enterprise/complaintList.vue
+++ b/src/views/enterprise/complaintList.vue
@@ -259,6 +259,7 @@
             //   }
             // }
             data.dataList.push(...success.rows);
+            console.log(data.dataList)
         }, error => {
       })
   }
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index a282dc6..70d845f 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -113,7 +113,7 @@
                                     </div>
                                     <div class="btn-list">
                                        <a v-if="item.outTimeDayNum<=5 && item.isComplaint==0"
-                                          @click.stop="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText)">
+                                          @click.stop="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText, item.bureauDeptName, item.bureauDeptId)">
                                            <van-icon name="warning-o"/>
                                            投诉</a>
                                         <a @click.stop="toEvaluate(item.id,item.lawEnforcementItemText)" v-if="item.outTimeDayNum<=5 && item.isEvaluate==0">
@@ -277,7 +277,7 @@
      * @param {*} id
      * @param {*} name
      */
-    const toComplaintView = (id, name, text) => {
+    const toComplaintView = (id, name, text, bureauDeptName, bureauDeptId) => {
         console.log(id, name)
         router.push({
             path: "/enterprise/complaint",
@@ -285,6 +285,9 @@
                 id: id,
                 lawEnforcementIncident: name,
                 lawEnforcementItemText: text,
+                bureauDeptName: bureauDeptName,
+                bureauDeptId: bureauDeptId,
+                comOrOpi: 1,
                 isSelect: false
             }
         });