投诉涉事地址的级联, 新增市外企业的必填

src/api/Home.js

@@ -7,6 +7,8 @@ export const testLogin = (params, success, error)  => _post("/app/thirdLogin/tes
 
 //查询字典
 export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);
+//获取级联街道字典
+export const getRegionCascade = (params, success, error) => _get("/app/code/item/getRegionCascade",params,success,error);
 
 //查询用户关联企业授权信息
 export const getEnterpriseMerchantAuthorization = (params, success, error) => _get("/app/code/authorization/queryList",params,success,error);

src/views/enforce/noScanFilter.vue

@@ -203,7 +203,12 @@ const props = defineProps( {
     const toRegister = () => {
         router.push({
             path: "/outsideRegister",
-
+            query: {
+              to_path: "/enterpriseScanPreview",
+              to_reason: reason.value,
+              to_checkCss: checkCss.value,
+              to_isNoScan: true,
+            }
         });
     };
 
@@ -453,7 +458,7 @@ const props = defineProps( {
     align-items: center;
     margin: -4% 0 0 8%;
     padding: 0.15rem 0.35rem;
-    width: 3.25rem;
+    width: 3.55rem;
     background-color: #fff;
     border-radius: 0.25rem;
     box-shadow: 0 0 0.15rem #dee9e9;
@@ -465,6 +470,6 @@ const props = defineProps( {
 
 .link-box > span > i.van-icon {
     position: absolute;
-    right: 0.2rem;
+    right: 0.1rem;
 }
 </style>

src/views/enforce/outsideRegister.vue

@@ -42,7 +42,7 @@
           :rules="[{ required: true, message: '必填项' }]"
         />
         <van-field
-          v-model="submitData.legalPerson"
+          v-model="submitData.enterpriseTel"
           label="联系电话"
           placeholder="必填 联系电话"
           required
@@ -168,6 +168,11 @@ const router = useRouter();
 const route = useRoute();
 let queryaddressId = ref("");
 const data = reactive({
+  to_path: route?.query?.to_path,
+  to_reason: route?.query?.to_reason,
+  to_checkCss: route?.query?.to_checkCss,
+  to_isNoScan: route?.query?.to_isNoScan,
+  
 	searchResult: [],
   showTypePicker: false,
   columns: [],
@@ -193,6 +198,8 @@ const submitData = reactive({
   enterpriseAddress:"",
   //法人
   legalPerson:"",
+  // 联系人电话
+  enterpriseTel: "",
   //成立日期
   establishmentTime:"",
   //注册资本
@@ -218,15 +225,28 @@ const submit = () =>{
       console.log(success)
       //跳转企业二维码地址
       if(success.success){
-        console.log("登记成功");
         showSuccessToast('登记成功');
-        router.push(
+        console.log(data.to_path)
-          { 
+        console.log(data.to_checkCss)
-            path: "/enterprise/qrCode",
+        console.log(submitData.enterpriseNumber)
+        console.log(data.to_isNoScan)
+        router.push({
+            path: data.to_path,
             query: {
-              enterpriseNumber: submitData.enterpriseNumber,
+                reason: data.to_reason,
-              } 
+                checkCss: data.to_checkCss,
+                enterpriseNumber: submitData.enterpriseNumber,
+                isNoScan: data.to_isNoScan,
+            }
         });
+
+        // router.push(
+        //   { 
+        //     path: "/enterprise/qrCode",
+        //     query: {
+        //       enterpriseNumber: submitData.enterpriseNumber,
+        //       } 
+        // });
       }
     },error=>{console.log("登记失败")})
   }).catch((errors) => {
@@ -305,7 +325,6 @@ const cancelSelectDate = () =>{
 
 onMounted(() => {
     currentDate();
-
 	getDict({"dictType": "enterpriseType"},success =>{
     success.data.forEach(res =>{
       console.log(res)

src/views/enforce/sign.vue

@@ -1529,4 +1529,29 @@
       margin-left: -0.2rem;
     }
 
+    .tip-txt {
+        position: relative;
+        margin: 1% var(--van-padding-md) 0;
+        padding-bottom: 0.25rem;
+        color: #999;
+        font-size: 0.3rem;
+        text-align: right;
+    }
+
+    .tip-txt:after {
+        position: absolute;
+        box-sizing: border-box;
+        content: " ";
+        pointer-events: none;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        border-bottom: 1px solid #ebedf0;
+        transform: scaleY(.5);
+    }
+
+    .noborder:after {
+        border: 0 !important;
+    }
+
 </style>

src/views/enterprise/companyFilter.vue

@@ -119,7 +119,9 @@
             toRegister() {
                 this.router.push({
                     path: "/outsideRegister",
-
+                    query: {
+                        to_path: "/appointmentBase",
+                    }
                 })
             },
 
@@ -376,7 +378,7 @@
         align-items: center;
         margin: -4% 0 0 8%;
         padding: 0.15rem 0.35rem;
-        width: 3.25rem;
+        width: 3.55rem;
         background-color: #fff;
         border-radius: 0.25rem;
         box-shadow: 0 0 0.15rem #dee9e9;
@@ -388,6 +390,6 @@
 
     .link-box > span > i.van-icon {
         position: absolute;
-        right: 0.2rem;
+        right: 0.1rem;
     }
 </style>

src/views/enterprise/complaint.vue

@@ -103,28 +103,31 @@
                     />-->
                     <div class="flex-div">
                         <van-field class="edit-div"
-                                v-model="data.districtText"
+                                v-model="data.cascaderValue"
                                 required
                                 is-link
                                 label="涉事地址"
-                                placeholder="选择区"
+                                placeholder="选择所在地区"
                                 readonly
                                 :rules="[{ required: true, message: '必填项' }]"
-                                @click="data.showTimePicker = true"
+                                @click="data.showRegionCascade = true"
                         />
+                        <van-popup v-model:show="data.showRegionCascade" round position="bottom">
+                            <van-cascader title="请选择所在地区" :options="data.regionCascade" @close="data.showRegionCascade = false" @finish="onFinish" />
+                        </van-popup>
                         <span class="site-city">深圳市</span>
-                        <van-field
+                        <!-- <van-field
                                 v-model="data.streetText"
                                 placeholder="选择街道"
                                 required
                                 readonly
                                 is-link
                                 :rules="[{ required: true, message: '必填项' }]"
-                                @click="data.hourPicker = true"
+                                @click="data.showRegionCascade = true"
-                        />
+                        /> -->
                     </div>
                         <van-field
-                                v-model="submitData.houseText"
+                                v-model="data.houseText"
                                 label=" "
                                 placeholder="详细地址（写字楼、小区、门牌等）"
                         />
@@ -170,7 +173,7 @@
 
     import {showSuccessToast, showLoadingToast, closeToast, Toast, showToast} from 'vant';
     import {addEnterpriseComplaint,selectRegistrationList} from '@/api/enterprise'
-    import {getDict} from '@/api/Home'
+    import {getDict, getRegionCascade} from '@/api/Home'
     import {uploadFile} from '@/util/fileUpload'
     import {reactive, ref} from "vue";
     import * as w6s from 'szient-js-sdk';
@@ -178,6 +181,7 @@
     import MssqFilter from '@/views/enterprise/compaint/selectMssqFilter.vue';
     import ItemPopup from './complaintItem.vue'
     import {queryDepts} from '@/api/user'
+import { da } from 'date-fns/locale';
 
     const {useCommon, useMy} = $globalStore
 
@@ -200,7 +204,12 @@
         comItemData:[],
         comItemContent:"",
         comItemIndex:0,
-        deptText:""
+        deptText:"",
+        // 做级联的
+        showRegionCascade: false,
+        regionCascade: [],
+        cascaderValue: '',
+        houseText: ''
         
     });
     //保存参数
@@ -241,6 +250,12 @@
         recordType:""
     })
 
+    // 全部选项选择完毕后，会触发 finish 事件
+    const onFinish = ({ selectedOptions }) => {
+        data.showRegionCascade = false;
+        data.cascaderValue = selectedOptions.map((option) => option.text).join('')
+    };
+
     const showItemPopup=(ind)=>{
          data.comItemPopup = true;
          data.comItemIndex=ind
@@ -313,6 +328,7 @@
     const submit = () => {
         submitData.enterpriseNumber = useCommon.enterpriseNumber;
         submitData.fileListObj = []
+        submitData.enterpriseAddress = "深圳市"+data.cascaderValue + data.houseText
         addEnterpriseComplaint(submitData, success => {
             //跳转企业二维码地址
             if (success.success) {
@@ -378,6 +394,9 @@
         return true;
     }
     onMounted(() => {
+        getRegionCascade({}, success => {
+            data.regionCascade = success.data;
+        });
 
         submitData.relId = route?.query?.id;
         submitData.complaintRecordItem = route?.query?.lawEnforcementItemText;
@@ -887,7 +906,7 @@
     .flex-div .van-field:first-child {
         float: left;
         padding-left: 0.2rem;
-        width: 75%;
+        width: 100%;
     }
 
     .site-city {

src/views/enterprise/complaintDetailView.vue

@@ -81,7 +81,7 @@
                     </div>
                   <van-divider class="divdsty"/>
 
-                  <van-field
+                  <van-field v-if="submitData.enterpriseAddress"
                           v-model="submitData.enterpriseAddress"
                           rows="3"
                           autosize

src/views/non-law/noScanFilter.vue

@@ -197,7 +197,12 @@ const props = defineProps( {
 const toRegister = () => {
     router.push({
         path: "/outsideRegister",
-
+        query: {
+          to_path: "/non-preview",
+          to_reason: reason.value,
+          to_checkCss: checkCss.value,
+          to_isNoScan: true,
+        }
     });
 };
 
@@ -446,7 +451,7 @@ const toRegister = () => {
     align-items: center;
     margin: -4% 0 0 8%;
     padding: 0.15rem 0.35rem;
-    width: 3.25rem;
+    width: 3.55rem;
     background-color: #fff;
     border-radius: 0.25rem;
     box-shadow: 0 0 0.15rem #dee9e9;
@@ -458,6 +463,6 @@ const toRegister = () => {
 
 .link-box > span > i.van-icon {
     position: absolute;
-    right: 0.2rem;
+    right: 0.1rem;
 }
 </style>