Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into hcb

src/views/caseManagement/caseList.vue

@@ -130,7 +130,7 @@
             checkPermi(['caseManagement:list:pay']) && btnStatus
             ">缴费</el-button>
           <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="paymentconfirmationRow(scope.row)"  v-if="checkPermi(['caseManagement:list:payconfirm']) && btnStatus&&scope.row.caseStatus==3">确认缴费</el-button>  
-           <el-button size="mini" type="text" icon="el-icon-edit" @click="viewpaymentformRow(scope.row)" v-if="checkPermi(['caseManagement:list:detail'])">查看缴费单</el-button>
+           <el-button size="mini" type="text" icon="el-icon-edit" @click="viewpaymentformRow(scope.row)" v-if="checkPermi(['caseManagement:list:detail'])&&scope.row.caseStatus>2">查看缴费单</el-button>
           <el-button size="mini" type="text" icon="el-icon-tickets" @click="evidenceListS(scope.row)" >证据清单</el-button>
           <!-- <el-button
             size="mini"

src/views/caseManagement/components/caseCompressionPackage.vue

@@ -31,7 +31,7 @@
         </el-row>
         <el-row>
           <el-form-item :span="24" label="案件压缩包上传：" prop="upload">
-            <el-upload class="upload-demo" ref="uploadZipBatch" :limit="1" accept=".zip" :headers="upload.headers"
+            <el-upload class="upload-demo" ref="uploadZipBatch" :limit="1" accept=".zip" :headers="upload.headers" :on-error="onError"
               :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
               :on-success="handleFileSuccess" :auto-upload="false" :data="paramsData" drag>
               <i class="el-icon-upload"></i>
@@ -50,7 +50,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span></el-button>
+        <el-button type="primary" @click="submitForm" class="endbutton" :loading="loadingSubmit"><span>确 定</span></el-button>
         <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
       </div>
     </el-dialog>
@@ -70,6 +70,7 @@ export default {
       form: {},
       fileList: [],
       templateList: [],
+      loadingSubmit:false,
       rules: {
         // upload: [
         //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
@@ -111,10 +112,14 @@ export default {
   },
   methods: {
     submitForm() {
+      
       this.paramsData.templateId = this.form.templateId;
       this.$refs["form"].validate((valid) => {
+         this.loadingSubmit = true
         if (valid) {
+         
           this.$refs.uploadZipBatch.submit();
+          
         }
       })
     },
@@ -159,6 +164,7 @@ export default {
       this.upload.isUploading = false;
       this.$refs.uploadZipBatch.clearFiles();
       if (response.code == 200) {
+        this.loadingSubmit = false
         this.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
           response.msg +
@@ -166,7 +172,9 @@ export default {
           "导入结果",
           { dangerouslyUseHTMLString: true }
         )
+        this.$emit("getcaseApply", this.queryParams);
       } else {
+        this.loadingSubmit = false
         this.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
           "导入压缩失败" +
@@ -176,8 +184,11 @@ export default {
         )
       }
 
-      this.getcaseApply(this.queryParams);
+      
     },
+    onError(){
+      this.loadingSubmit = false
+    }
   },
 };
 </script>

src/views/caseManagement/components/caseentryDialog.vue

@@ -80,7 +80,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-           <el-col :span="24"  v-if="flag == '1'">
+           <el-col :span="24">
             <el-form-item label="是否书面审理" prop="applicantIsWrittenHear">
               <el-radio-group v-model="formData.applicantIsWrittenHear">
                 <el-radio :label="1">是</el-radio>
@@ -543,6 +543,7 @@
             <el-col :span="12">
               <el-form-item label="姓名：" :prop="'paymentArr1.' + index + '.nameAgent'" :rules="[
                 {
+                  required: true,
                   message: '姓名不能为空',
                   trigger: 'blur',
                 },
@@ -555,6 +556,7 @@
               <!--  -->
               <el-form-item label="身份证号：" :prop="'paymentArr1.' + index + '.identityNumAgent'" :rules="[
                 {
+                  required: true,
                   message: '身份证号不能为空',
                   trigger: 'blur',
                 },
@@ -571,6 +573,7 @@
             <el-col :span="12">
               <el-form-item label="联系电话：" :prop="'paymentArr1.' + index + '.contactTelphoneAgent'" :rules="[
                 {
+                  required: true,
                   message: '联系电话不能为空',
                   trigger: 'blur',
                 },
@@ -586,6 +589,7 @@
             <el-col :span="12">
               <el-form-item label="联系地址：" :prop="'paymentArr1.' + index + '.contactAddressAgent'" :rules="[
                 {
+                  required: true,
                   message: '联系地址不能为空',
                   trigger: 'blur',
                 },
@@ -604,7 +608,7 @@
         @click="generateForm1()"
         >新增被申请人主体信息</el-button
       > -->
-        <div v-if="flag == '0'">
+        <div v-if="flag == '0'|| flag == '1'">
           <div style="display: inline-flex">
               <div class="infoIcon"></div>
               <div class="caseInfo2">仲裁申请书:</div>

src/views/caseManagement/components/judgmentInformation.vue

@@ -115,7 +115,7 @@
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button> -->
         <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
-        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">5提交</el-button>
+        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">提交</el-button>
         <!-- <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button> -->
         <!-- <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button> -->
         <!-- <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button> -->