Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-12 09:55:38
+ * @LastEditTime: 2023-08-17 15:20:29
 -->
 <template>
   <div class='ywdialog'>
     <el-table
-      v-if="formData.result"
+      v-if="formData.result && formData.result.length>0"
       :data="formData.result"
       height="200">
       <el-table-column
@@ -18,6 +18,7 @@
         label="状态">
       </el-table-column>
     </el-table>
+    <el-link type="primary" :underline="false" v-else>{{formData.message}}</el-link>
   </div>
 </template>
 <script>

@@ -170,7 +170,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -196,7 +196,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -475,7 +475,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -488,8 +488,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
 
         <div v-if="ruleForm.ywrData">
           <div class="slxx_title title-block">

@@ -390,7 +390,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -403,8 +403,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
 
         <div>
           <div class="slxx_title title-block">
@@ -415,7 +415,7 @@
             v-if="ruleForm.ywrData"
             :tableData="ruleForm.ywrData"
             :key="key"
-            :disabled="ableOperation"
+            :ableOperation="ableOperation"
             @upDateQlrxxList="upDateYwrxxList" />
         </div>
       </div>

@@ -80,7 +80,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -400,7 +400,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -412,9 +412,9 @@
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
-          :disabled="ableOperation"
+          :ableOperation="ableOperation"
           :key="key"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :gyfs="ruleForm.qlxx.gyfs" />
       </div>
       <el-row class="btn" v-if="ableOperation">
         <el-form-item>

@@ -80,7 +80,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -253,7 +253,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -266,8 +266,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
       </div>
       <el-row class="btn" v-if="ableOperation">
         <el-form-item>

@@ -101,7 +101,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -354,7 +354,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -367,8 +367,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
       </div>
       <el-row class="btn" v-if="ableOperation">
         <el-form-item>

@@ -102,7 +102,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -164,7 +164,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -174,6 +174,12 @@
           </el-col>
         </el-row>
         <el-row :gutter="10">
+            <el-col :span="8">
+            <el-form-item label="不动产登记证明号：" prop="qlxx.bdcqzh"
+              :rules="rules.bdcqzhrules">
+              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="权利类型：">
               <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
@@ -222,7 +228,7 @@
               label="登簿人："
               prop="qlxx.dbr"
               :rules="rules.dbrrules">
-              <el-input v-model="ruleForm.qlxx.dbr"></el-input>
+              <el-input maxlength="20" v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -287,7 +293,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="用途名称：">
-              <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
+              <el-input maxlength="10" v-model="ruleForm.ygdj.ytmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -334,6 +340,7 @@
               <div class="flex">
                 <el-input
                   v-model="ruleForm.ygdj.jzmj"
+                  maxlength="13"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select
                   v-model="ruleForm.ygdj.mjdw"
@@ -366,7 +373,7 @@
                 type="date"
                 class="width100"
                 placeholder="选择日期"
-                value-format="yyyy-MM-dd HH/mm/ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -384,6 +391,7 @@
               <div class="flex">
                 <el-input
                   v-model="ruleForm.ygdj.qdjg"
+                  maxlength="11"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select
                   v-model="ruleForm.ygdj.jedw"
@@ -401,7 +409,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="担保范围：">
-              <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
+              <el-input maxlength="10"  v-model="ruleForm.ygdj.dbfw"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -429,12 +437,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col> -->
-          <el-col :span="8">
-            <el-form-item label="不动产登记证明号：" prop="qlxx.bdcqzh"
-              :rules="rules.bdcqzhrules">
-              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
             <el-form-item label="附记：">
               <el-input v-model="ruleForm.ygdj.fj"></el-input>
@@ -450,7 +452,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -463,8 +465,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
 
         <div v-if="ruleForm.ywrData">
           <div class="slxx_title title-block">
@@ -475,7 +477,7 @@
             v-if="ruleForm.ywrData"
             :tableData="ruleForm.ywrData"
             :key="key"
-            :disabled="ableOperation"
+            :ableOperation="ableOperation"
             @upDateQlrxxList="upDateYwrxxList" />
         </div>
       </div>

@@ -101,7 +101,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -121,7 +121,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item
-              label="不动产权证号："
+              label="不动产登记证明号："
               prop="qlxx.bdcqzh"
               :rules="rules.bdcqzhrules">
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
@@ -145,7 +145,7 @@
               label="登簿人："
               prop="qlxx.dbr"
               :rules="rules.dbrrules">
-              <el-input v-model="ruleForm.qlxx.dbr"></el-input>
+              <el-input maxlength="20" v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -210,7 +210,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="用途名称：">
-              <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
+              <el-input maxlength="10" v-model="ruleForm.ygdj.ytmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -257,6 +257,7 @@
               <div class="flex">
                 <el-input
                   v-model="ruleForm.ygdj.jzmj"
+                  maxlength="13"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select
                   v-model="ruleForm.ygdj.mjdw"
@@ -274,20 +275,20 @@
           </el-col>
           <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销预告业务号：">
-              <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');"  v-model="ruleForm.qlxx.zxywh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+           <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销预告原因：">
-              <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
+              <el-input v-model="ruleForm.ygdj.zxyy"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+             <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销时间：">
               <el-date-picker
-                v-model="ruleForm.ygdj.zxsj"
-                class="width100"
+                v-model="ruleForm.qlxx.zxsj"
                 type="date"
+                class="width100"
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd">
@@ -311,6 +312,7 @@
               <div class="flex">
                 <el-input
                   v-model="ruleForm.ygdj.qdjg"
+                  maxlength="11"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select
                   v-model="ruleForm.ygdj.jedw"
@@ -328,7 +330,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="担保范围：">
-              <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
+              <el-input maxlength="10" v-model="ruleForm.ygdj.dbfw"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -347,11 +349,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="不动产登记证明号：">
-              <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
             <el-form-item label="附记：">
               <el-input v-model="ruleForm.ygdj.fj"></el-input>
@@ -367,7 +364,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -380,8 +377,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
 
         <div v-if="ruleForm.ywrData">
           <div class="slxx_title title-block">
@@ -392,7 +389,7 @@
             v-if="ruleForm.ywrData"
             :tableData="ruleForm.ywrData"
             :key="key"
-            :disabled="ableOperation"
+            :ableOperation="ableOperation"
             @upDateQlrxxList="upDateYwrxxList" />
         </div>
       </div>

@@ -161,7 +161,7 @@
               label="业务号："
               prop="qlxx.ywh"
               :rules="rules.ywhrules">
-              <el-input maxlength="10" v-model="ruleForm.qlxx.ywh"></el-input>
+              <el-input maxlength="20" onkeyup="this.value=this.value.replace(/[^\w_]/g,'');" v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -317,7 +317,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -330,8 +330,8 @@
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
           :key="key"
-          :disabled="ableOperation"
-          :gyfs="ruleForm.sldy.gyfs" />
+          :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs" />
         <div v-if="ruleForm.ywrData">
           <div class="slxx_title title-block">
             义务人信息
@@ -341,7 +341,7 @@
             v-if="ruleForm.ywrData"
             :tableData="ruleForm.ywrData"
             :key="key"
-            :disabled="ableOperation"
+            :ableOperation="ableOperation"
             @upDateQlrxxList="upDateYwrxxList" />
         </div>
       </div>

@@ -45,6 +45,7 @@
                 <el-col :span="16">
                   <el-form-item label="审查人">
                     <el-input
+                      maxlength="20"
                       :disabled="!ableOperation"
                       v-model="item.shryxm"
                     ></el-input>
@@ -98,7 +99,7 @@ export default {
     yjsqOptions: {
       handler(val) {
         if(this.monitor){
-          this.add(val);
+          this.add("");
           this.monitor=false
         }else{
           this.add(val);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 09:47:54
+ * @LastEditTime: 2023-08-17 15:26:20
 -->
 <template>
   <div>
@@ -36,9 +36,9 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="发起业务单元类型" v-if="form.sqdjyw">
-              <el-select v-model="form.sqdjyw.sqywdylx"  placeholder="请选择" class="width100">
-                 <el-option v-for="item in sqywdylx" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                  </el-option>
+              <el-select v-model="form.sqdjyw.sqywdylx" placeholder="请选择" class="width100">
+                <el-option v-for="item in sqywdylx" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -134,7 +134,7 @@
     </div>
     <div slot="footer" class="dialog_footer text-center">
       <el-button @click="$popupCacel()">取 消</el-button>
-      <el-button type="primary" @click="submit" plain>提 交</el-button>
+      <el-button type="primary" @click="submit" :loading="loading">提 交</el-button>
     </div>
   </div>
 </template>
@@ -152,19 +152,19 @@
         default: () => { }
       }
     },
-   
     data () {
       return {
+        loading: false,
         key: 0,
         tn: 0,
         n: 0,
         djlxList: [],
-        sqywdylx:store.getters.dictData['sqywdylx'],
+        sqywdylx: store.getters.dictData['sqywdylx'],
         options: [
-          {label:"正常申请",value:"1"},
-          {label:"一并申请",value:"2"},
-          {label:"补录申请",value:"3"}
-          ],
+          { label: "正常申请", value: "1" },
+          { label: "一并申请", value: "2" },
+          { label: "补录申请", value: "3" }
+        ],
         imgUploadUrl: uploadUrl(),
         title: "",
         activeName: "1",
@@ -255,7 +255,7 @@
         let _this = this
         getSqdjywDetail(bsmSqyw).then((res) => {
           if (res.code === 200) {
-             _this.form=res.result;
+            _this.form = res.result;
             // _this.form.bsmSqyw = res.result.bsmSqyw;
             // _this.form.ywDetail = res.result.ywDetail;
             // _this.$set(_this.form, 'djqx', res.result.djqx);
@@ -270,14 +270,15 @@
           }
         })
       },
-      //提交保存数据
       /**
        * @description: 提交保存数据
        * @author: renchao
        */
       submit () {
         let that = this;
+        this.loading = true
         saveSqdjyw(this.form).then((res) => {
+          this.loading = false
           if (res.code == 200) {
             that.$message({
               message: "修改成功",
@@ -287,7 +288,6 @@
           }
         })
       },
-      // 上移下移
       /**
        * @description: 上移下移
        * @param {*} index

@@ -136,7 +136,8 @@ export default {
       getSpyjList(formdata).then((res) => {
         this.$endLoading();
         if (res.code === 200 && res.result) {
-          this.tableData = res.result;
+          this.$nextTick(() => {
+               this.tableData = res.result;
           if(this.shows){
               this.shows=false
           }
@@ -168,6 +169,8 @@ export default {
               item.show = false;
             }
           });
+          })
+
         }
       });
     },

@@ -145,7 +145,11 @@
               this.$popupCacel()
 
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+              if (res.result.length > 0) {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+              } else {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+              }
             }
           }).catch(() => {
             this.loading = false

@@ -138,7 +138,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -258,7 +258,11 @@
               }
               this.$popupCacel()
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+              if (res.result.length > 0) {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+              } else {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+              }
             }
           }).catch(() => {
             this.loading = false
@@ -279,7 +283,11 @@
               store.dispatch('user/refreshPage', true);
               this.$popupCacel()
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+              if (res.result.length > 0) {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+              } else {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+              }
             }
           }).catch(() => {
             this.loading = false

@@ -120,7 +120,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -121,7 +121,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -145,7 +145,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -182,7 +182,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -126,7 +126,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:56:33
+ * @LastEditTime: 2023-08-17 15:20:56
 -->
 <template>
   <div class="from-clues">
@@ -134,7 +134,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -254,7 +254,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:59:18
+ * @LastEditTime: 2023-08-17 15:09:55
 -->
 <template>
   <div class="from-clues">
@@ -127,7 +127,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -134,7 +134,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,11 @@
               this.$popupCacel()
             }
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -123,7 +123,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,11 @@
               this.$popupCacel()
             }
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -126,7 +126,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,11 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            } else {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            }
           }
         }).catch(() => {
           this.loading = false