From 0e734f176f3f69237489e1103f93699781655944 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 18 Aug 2024 18:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=85=A5=E4=BC=81=E4=B8=8D?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=AF=A6=E6=83=85=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterprise/complaint.vue           |  2 +-
 src/views/enterprise/complaintDetail.vue     | 26 +----------
 src/views/enterprise/complaintDetailView.vue | 48 ++++++--------------
 src/views/enterprise/complaintList.vue       |  2 +-
 src/views/enterprise/complaintNoScan.vue     |  6 +--
 5 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index b77fd0d..f9f0ebe 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -118,6 +118,7 @@
                     <van-field
                             v-model="submitData.enforceTypeText"
                             required
+                            :rules="[{ required: true, message: '请选择投诉类型' }]"
                             label="投诉类型"
                             placeholder="请选择"
                             is-link
@@ -288,7 +289,6 @@
     };
 
     const submit = () => {
-        console.log(submitData);
         submitData.enterpriseNumber = useCommon.enterpriseNumber;
         addEnterpriseComplaint(submitData, success => {
 
diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue
index 5481a1e..c322327 100644
--- a/src/views/enterprise/complaintDetail.vue
+++ b/src/views/enterprise/complaintDetail.vue
@@ -1,14 +1,5 @@
 <template>
     <div class="address_edit">
-        <!-- 导航栏 -->
-        <!-- <div class="header_body">
-            <header-nav
-                    :slefBack="true"
-                    @goBack="goBack"
-                    :titelText="`在线投诉`"
-            >
-            </header-nav>
-        </div>-->
         <!-- 中间 -->
         <div v-if="submitData.comOrOpi==1">
             <van-form @failed="onFailed" @submit="submit">
@@ -69,20 +60,7 @@
                             required
                             :rules="[{ validator, message: '请输入正确内容' }]"
                     />
-<!--                    <div class="agree-box">-->
-<!--                        <span class="remsty">是否授权</span>-->
-<!--                        <span class="accept-item"><input class="checksty" type="checkbox" name="" value=""-->
-<!--                                                         v-model="data.isCheckedon" @click="selectCh(1)">同意</span>-->
-<!--                        <span class="accept-item"><input class="checksty" type="checkbox" name="" value=""-->
-<!--                                                         v-model="data.isCheckedoff" @click="selectCh(0)">不同意</span>-->
-<!--                    </div>-->
-<!--                    <div class="agree-remark">-->
-<!--                        <span class="accept-item">注：选择“同意”，处置部门将通过登记的联系人、联系电话与您联系，并对您的个人信息严格保密。</span>-->
-<!--                    </div>-->
                 </van-cell-group>
-<!--                <van-action-bar>-->
-<!--                    <van-button round block type="info" native-type="submit">提交</van-button>-->
-<!--                </van-action-bar>-->
             </van-form>
         </div>
         <div v-else class="warp_body">
@@ -139,12 +117,12 @@
                             v-model="submitData.problemDescription"
                             rows="5"
                             autosize
-                            label="诉求内容"
+                            label="诉投诉内容"
                             type="textarea"
                             maxlength="300"
                             placeholder="请输入"
                             required
-                            :rules="[{ required: true, message: '请输入诉求内容' }]"
+                            :rules="[{ required: true, message: '请输入投诉内容' }]"
                             show-word-limit
                     />
                     <van-divider class="divdsty"/>
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index 6226a37..170a920 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -1,54 +1,27 @@
 <template>
   <div class="address_edit">
-      <!-- 导航栏 -->
-      <!-- <div class="header_body">
-          <header-nav
-                  :slefBack="true"
-                  @goBack="goBack"
-                  :titelText="`在线投诉`"
-          >
-          </header-nav>
-      </div>-->
       <!-- 中间 -->
       <div class="warp_body">
           <van-form>
               <van-cell-group>
-                  <!-- <view v-if="data.isSelect=='true'">
+                  <view v-if="data.isNoScan==false">
                       <van-field
                               v-model="submitData.lawEnforcementIncidentText"
-                              label="投诉案件"
+                              label="投诉事项"
                               placeholder="请选择"
                               readonly
-                              required
-                              :rules="[{ required: true, message: '请选择投诉案件' }]"
                               clickable
                               is-link
-                              @click="showPopup"
                       />
                   </view>
-                  <view v-else>
-                      <van-field
-                              v-model="submitData.lawEnforcementIncidentText"
-                              label="投诉案件"
-                              placeholder="请选择"
-                              readonly
-                              required
-                              :rules="[{ required: true, message: '请选择投诉案件' }]"
-                              clickable
-                              is-link
-                      />
-                  </view> -->
                   <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
-                  <!-- <van-field
+                  <van-field
                           v-model="submitData.enforceTypeText"
-                          required
                           label="投诉类型"
-                          placeholder="请选择"
                           readonly
                           clickable
                           is-link
-                          @click="selectType"
-                  /> -->
+                  />
                   <van-popup v-model:show="data.showPicker" position="bottom">
                       <van-picker
                               v-model="data.selectTypeValue"
@@ -62,12 +35,12 @@
                           v-model="submitData.problemDescription"
                           rows="5"
                           autosize
-                          label="诉求内容"
+                          label="投诉内容"
                           type="textarea"
                           maxlength="300"
                           placeholder="请输入"
                           readonly
-                          :rules="[{ required: true, message: '请输入诉求内容' }]"
+                          :rules="[{ required: true, message: '请输入投诉内容' }]"
                           show-word-limit
                   />
                   <van-divider class="divdsty"/>
@@ -159,6 +132,8 @@
       isCheckedoff: false,
       isMssq: false,
       mssqParams: {},
+      // 判断是否入企不扫码
+      isNoScan: false,
   });
   //保存参数
   const submitData = reactive({
@@ -274,10 +249,17 @@
       data.isSelect = route?.query?.isSelect;
       submitData.comOrOpi = route?.query?.comOrOpi;
       complaintInfoById({id:route?.query?.id},success =>{
+          console.log("====> : ", success)
+        submitData.enforceTypeText = success.data.enforceTypeText;
         submitData.problemDescription = success.data.problemDescription;
+        submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
         submitData.enterpriseAddress = success.data.enterpriseAddress;
         submitData.linkman = success.data.linkman;
         submitData.linkmanTel = success.data.linkmanTel;
+        // 判断是否入企不扫码
+          if (null == success.data.enforceType || null == success.data.relId) {
+              data.isNoScan = true;
+          }
         if(success.data.status == 1){
           data.isMssq = true;
         }
diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue
index 7b4621f..b23a8bf 100644
--- a/src/views/enterprise/complaintList.vue
+++ b/src/views/enterprise/complaintList.vue
@@ -26,7 +26,7 @@
             </van-button>
 
             <van-button plain hairline :class="0==data.checkNum?'search-button active':'search-button'"
-                        @click="searchDateType(0)" round type="primary" size="mini">已处理
+                        @click="searchDateType(0)" round type="primary" size="mini">处理中
             </van-button>
 
             <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'"
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 21a25da..9674b67 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -148,7 +148,7 @@
         //纳税识别号
         enterpriseNumber: "",
         //执法投诉
-        enforceType: "",
+        enforceType: null,
         enforceTypeText: "",
         //投诉内容
         problemDescription: "",
@@ -179,13 +179,13 @@ const goBack = () => {
 
     const submit = () => {
         // console.log(submitData);
-        showSuccessToast('投诉成功');
+        submitData.enterpriseNumber = useCommon.enterpriseNumber;
         addEnterpriseComplaint(submitData, success => {
 
             console.log(success)
             //跳转企业二维码地址
             if (success.success) {
-                // console.log("登记成功");
+                showSuccessToast('投诉成功');
                 // Toast.loading('投诉成功');
 
                 setTimeout(() => {