ly 1 ano atrás
pai
commit
80855338d2

+ 0 - 1
src/utils/request.js

@@ -161,7 +161,6 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   (res) => {
-    console.log("res config", res.config, res.config.data, typeof res.config.data)
 
     // 是否需要防止数据重复提交
     stopRepeatSubmitRequest(res.config);

+ 1 - 1
src/views/business/crm/order/form.vue

@@ -100,7 +100,7 @@
                     </el-icon>
                   </el-button> -->
                 </template>
-                <el-link type="primary" @click="handleInfo(form)" v-else>{{ form.companyName }}</el-link>
+                <el-link  :underline="false"   type="primary" @click="handleInfo(form)" v-else>{{ form.companyName }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">

+ 6 - 5
src/views/business/deduction/index.vue

@@ -86,7 +86,7 @@
       </el-table-column>
       <el-table-column label="状态" width="100" align="center">
         <template #default="scope">
-          <span v-if="scope.row.status === 0">待审核</span>
+          <span v-if="scope.row.status === 0">待确认扣款</span>
           <span v-if="scope.row.status === 1">可扣款</span>
           <span v-if="scope.row.status === 2">已扣款</span>
           <el-tooltip v-if="scope.row.status === 4" :content="scope.row.failureType === 1 ? scope.row.failureResult : '余额不足'
@@ -126,12 +126,13 @@
                 <el-button link v-hasPermi="['business:deduction:deduction']" style="margin-left: 5px; " type="primary"
                   size="small" @click="showFeedbackDialog(scope.row)">扣款失败</el-button>
               </div>
-              <div v-if="scope.row.status === 2">
-                <el-button link  style="margin-left: 5px; " type="primary"
-                size="small" @click="returnInit(scope.row)" v-hasPermi="['business:deduction:return']">退回</el-button>
-              </div>
+             
             </div>
           </div>
+          <div v-if="scope.row.status === 2">
+            <el-button link  style="margin-left: 5px; " type="primary"
+            size="small" @click="returnInit(scope.row)" v-hasPermi="['business:deduction:return']">退回</el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/views/business/entrust/statementAccount/index.vue

@@ -92,7 +92,7 @@
             type="warning"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:deduct:edit']"
-            >修改</el-button
+            >查看</el-button
           >
           <el-button
             v-show="scope.row.status !== 2"

+ 32 - 32
src/views/business/entrust/workOrder/currentMonth/index.vue

@@ -286,44 +286,44 @@
   }
 
   function transEntrustHandler() {
-    // proxy.$modal.confirm("确定流转到下一月?").then(() => {
-    //     transNext().then((res) => {
-    //       proxy.$modal.msgSuccess("流转成功");
-    //       checkCurrentMonthHandle();
-    //     });
-    //   });
-    let currentDate = new Date().getMonth() + 1;
-    let formattedMonth = currentDate.toString().padStart(2, '0');
-    let month = currentMonth.value.split('-')[1];
-    console.log(formattedMonth);
-    if (month < formattedMonth) {
-      proxy.$modal.confirm("确定流转到下一月?").then(() => {
+    proxy.$modal.confirm("确定流转到下一月?").then(() => {
         transNext().then((res) => {
           proxy.$modal.msgSuccess("流转成功");
           checkCurrentMonthHandle();
         });
       });
-    } else {
-      // //真实月 != 当前月 
-      if (month != formattedMonth) {
-        proxy.$modal.msgError("每月只可流转一次");
-      } else {
-        let currentDay = new Date().getDate()
-        let cutoffDay = 20;
-        //如果当前月时间小于20号
-        if (currentDay < cutoffDay) {
-          proxy.$modal.msgError("每月20号后才能流转");
-        } else {
-          proxy.$modal.confirm("确定流转到下一月?").then(() => {
-            transNext().then((res) => {
-              proxy.$modal.msgSuccess("流转成功");
-              checkCurrentMonthHandle();
-            });
-          });
-        }
+    // let currentDate = new Date().getMonth() + 1;
+    // let formattedMonth = currentDate.toString().padStart(2, '0');
+    // let month = currentMonth.value.split('-')[1];
+    // console.log(formattedMonth);
+    // if (month < formattedMonth) {
+    //   proxy.$modal.confirm("确定流转到下一月?").then(() => {
+    //     transNext().then((res) => {
+    //       proxy.$modal.msgSuccess("流转成功");
+    //       checkCurrentMonthHandle();
+    //     });
+    //   });
+    // } else {
+    //   // //真实月 != 当前月 
+    //   if (month != formattedMonth) {
+    //     proxy.$modal.msgError("每月只可流转一次");
+    //   } else {
+    //     let currentDay = new Date().getDate()
+    //     let cutoffDay = 20;
+    //     //如果当前月时间小于20号
+    //     if (currentDay < cutoffDay) {
+    //       proxy.$modal.msgError("每月20号后才能流转");
+    //     } else {
+    //       proxy.$modal.confirm("确定流转到下一月?").then(() => {
+    //         transNext().then((res) => {
+    //           proxy.$modal.msgSuccess("流转成功");
+    //           checkCurrentMonthHandle();
+    //         });
+    //       });
+    //     }
 
-      }
-    }
+    //   }
+    // }
 
   }
 

+ 25 - 24
src/views/business/entrust/workOrder/historyMonth/index.vue

@@ -8,11 +8,10 @@
         <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
             label-width="68px">
             <el-form-item label="工作月:">
-                <!-- <el-date-picker v-model="queryParams.date" 
+                <el-date-picker v-model="queryParams.date" 
                     format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="month" placeholder="请选择工作月"
-                    style="width: 150px" /> -->
-                <el-date-picker v-model="queryParams.date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="month"
-                    placeholder="请选择工作月" :disabled-date="disabledDate"></el-date-picker>
+                    style="width: 150px" />
+  
             </el-form-item>
             <el-form-item label="客户名称:" prop="companyName">
                 <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
@@ -136,30 +135,32 @@
 
     const { contract_verify_status } = proxy.useDict("contract_verify_status");
     const { contract_status } = proxy.useDict("contract_status");
-    /** 查询对象 */
-    const queryParams = ref({
-        pageNum: 1,
-        pageSize: 20,
-
-    });
+  /** 查询对象 */
+  const queryParams = ref({
+    pageNum: 1,
+    pageSize: 20,
+    companyName: "",
+    noContract: 0,
+    type: 1,
+  });
 
     const editStatus = {
         startMonth: false,
     };
-    function disabledDate(time) {
-        const currentMonth = new Date().getMonth();
-        const selectedMonth = time.getMonth();
-        const currentYear = new Date().getFullYear();
-        const selectedYear = time.getFullYear();
-
-        // 禁用当前年份之后的所有月份
-        if (selectedYear > currentYear) {
-            return true;
-        }
-
-        // 如果选择的是当前年份,只能选择当前月份之前的月份
-        return selectedYear === currentYear && selectedMonth >= currentMonth;
-    }
+    // function disabledDate(time) {
+    //     const currentMonth = new Date().getMonth();
+    //     const selectedMonth = time.getMonth();
+    //     const currentYear = new Date().getFullYear();
+    //     const selectedYear = time.getFullYear();
+
+    //     // 禁用当前年份之后的所有月份
+    //     if (selectedYear > currentYear) {
+    //         return true;
+    //     }
+
+    //     // 如果选择的是当前年份,只能选择当前月份之前的月份
+    //     return selectedYear === currentYear && selectedMonth >= currentMonth;
+    // }
 
     function checkCurrentMonthHandle() {
         checkCurrent().then((res) => {

+ 14 - 14
src/views/business/entrust/workOrderForFactory/history/index.vue

@@ -146,20 +146,20 @@
   const editStatus = {
       startMonth: false,
   };
-  function disabledDate(time) {
-      const currentMonth = new Date().getMonth();
-      const selectedMonth = time.getMonth();
-      const currentYear = new Date().getFullYear();
-      const selectedYear = time.getFullYear();
-
-      // 禁用当前年份之后的所有月份
-      if (selectedYear > currentYear) {
-          return true;
-      }
-
-      // 如果选择的是当前年份,只能选择当前月份之前的月份
-      return selectedYear === currentYear && selectedMonth >= currentMonth;
-  }
+//   function disabledDate(time) {
+//       const currentMonth = new Date().getMonth();
+//       const selectedMonth = time.getMonth();
+//       const currentYear = new Date().getFullYear();
+//       const selectedYear = time.getFullYear();
+
+//       // 禁用当前年份之后的所有月份
+//       if (selectedYear > currentYear) {
+//           return true;
+//       }
+
+//       // 如果选择的是当前年份,只能选择当前月份之前的月份
+//       return selectedYear === currentYear && selectedMonth >= currentMonth;
+//   }
 
   function checkCurrentMonthHandle() {
       checkCurrent().then((res) => {

+ 2 - 2
src/views/business/financial/collection/form.vue

@@ -213,12 +213,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="客户名称:" prop="companyName">
-                <el-link type="primary" @click="handleInfo(form)" >{{ form.companyName }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleInfo(form)" >{{ form.companyName }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="合同编号:" prop="remark">
-                <el-link type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">

+ 2 - 2
src/views/business/financial/contract/form.vue

@@ -121,12 +121,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="客户名称:" prop="companyName">
-                <el-link type="primary" @click="handleInfo(form)" >{{ form.companyName }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleInfo(form)" >{{ form.companyName }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="合同编号:" prop="remark">
-                <el-link type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
+                <el-link  :underline="false" type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">

+ 2 - 2
src/views/business/financial/payment/form.vue

@@ -124,7 +124,7 @@
                     </div>
                   </template>
                 </el-autocomplete>
-                <span v-else> <el-link type="primary" @click="handleInfo(form)">{{ form.companyName }}</el-link></span>
+                <span v-else> <el-link  :underline="false" type="primary" @click="handleInfo(form)">{{ form.companyName }}</el-link></span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -138,7 +138,7 @@
                 <span v-else style="width: 100%">
                     <!-- <el-button class="text-overflow" type="primary" link @click="(showContractDialog(currentContract.contractId))">{{ currentContract.formNo }}</el-button> -->
                     <!-- {{ form.contractNo }} -->
-                    <el-link type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
+                    <el-link :underline="false" type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
                 </span>
               </el-form-item>
             </el-col>

+ 117 - 104
src/views/business/housingFund/declare/form.vue

@@ -1,97 +1,107 @@
 <template>
-  <el-dialog title="公积金申报信息" v-model="visible" :width="width" append-to-body draggable @close="close"
+  <el-dialog title="公积金申报信息111" v-model="visible" :width="width" append-to-body draggable @close="close"
     :close-on-click-modal="false">
     <!-- 功能按钮 -->
-     <div v-loading="loading">
-    <div style="padding: 8px 24px 16px 24px">
-      <el-form size="small" label-width="120px" v-model="form">
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="客户名称">
-              <div>{{ form.companyName }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属月份">
-             <!-- <div>{{ form.year }}-{{ form.month }}</div> -->
-             <el-date-picker v-model="currentMonth" type="month" placeholder="请选择时间" format="YYYY-MM"
-             @change="changeMonthHandle" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.status === 4" :span="12">
-            <el-form-item label="驳回原因">
-              <div>{{ form.feedbackContent }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="窗口缴纳:" required class="edit-label">
-              <template #label>
-                <div>窗口缴纳</div>
-              </template>
-              <div>{{ form.isPayOnWindow === 1 ? "是" : "否" }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公积金单位账号" required class="edit-label">
-              <template #label>
-                <div>公积金单位账号</div>
-              </template>
-              <div>{{ form.housingFundUnitAccount }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公积金秘钥密码" required class="edit-label">
-              <template #label>
-                <div>公积金秘钥密码</div>
-              </template>
-              <div>{{ form.housingFundPassword }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公积金划款密码" required class="edit-label">
-              <template #label>
-                <div>公积金划款密码</div>
-              </template>
-              <div>{{ form.housingFundDeductionPassword }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-divider />
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位缴纳:">
-              <el-input-number v-model="form.unitAmount" size="small" v-if="form.status !==3" placeholder="单位缴纳" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+    <div v-loading="loading">
+      <div style="padding: 8px 24px 16px 24px">
+        <el-form size="small" label-width="120px" v-model="form">
+          <el-row :gutter="30">
+            <el-col :span="12">
+              <el-form-item label="客户名称">
+                <div>{{ form.companyName }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属月份">
+                <!-- <div>{{ form.year }}-{{ form.month }}</div> -->
+                <el-date-picker v-model="currentMonth" type="month" placeholder="请选择时间" format="YYYY-MM"
+                  @change="changeMonthHandle" />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="form.status === 4" :span="12">
+              <el-form-item label="驳回原因">
+                <div>{{ form.feedbackContent }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="窗口缴纳:" required class="edit-label">
+                <template #label>
+                  <div>窗口缴纳</div>
+                </template>
+                <div>{{ form.isPayOnWindow === 1 ? "是" : "否" }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="公积金单位账号" required class="edit-label">
+                <template #label>
+                  <div>公积金单位账号</div>
+                </template>
+                <div>{{ form.housingFundUnitAccount }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="公积金秘钥密码" required class="edit-label">
+                <template #label>
+                  <div>公积金秘钥密码</div>
+                </template>
+                <div>{{ form.housingFundPassword }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="公积金划款密码" required class="edit-label">
+                <template #label>
+                  <div>公积金划款密码</div>
+                </template>
+                <div>{{ form.housingFundDeductionPassword }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-divider />
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="单位缴纳:">
+                <el-input-number v-model="form.unitAmount" size="small" v-if="form.status !==3" placeholder="单位缴纳"
+                  :precision="2" :controls="false" style="width: 100%" @change="amountChangeHandler" />
                 <div v-else>{{ rowNum(form.unitAmount) }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="个人缴纳:">
-              <el-input-number v-model="form.individualAmount" v-if="form.status !==3" size="small" placeholder="个人缴纳" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="个人缴纳:">
+                <el-input-number v-model="form.individualAmount" v-if="form.status !==3" size="small" placeholder="个人缴纳"
+                  :precision="2" :controls="false" style="width: 100%" @change="amountChangeHandler" />
                 <div v-else>{{ rowNum(form.individualAmount) }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="合计:">
-              <div v-if="form.amount != 0">{{ rowNum(form.amount) }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-divider />
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model.trim="form.content" v-if="form.status !==3"  type="textarea" rows="2" />
-              <div v-else>{{form.content}}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="凭证" required>
-              <!-- <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合计:">
+                <div v-if="form.amount != 0">{{ rowNum(form.amount) }}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-divider />
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model.trim="form.content" v-if="form.status !==3" type="textarea" rows="2" />
+                <div v-else>{{form.content}}</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="凭证" required>
+                <dragUpload :accept="accept" style="width:100%" @file="upload"
+                  v-if="form.evidenceFiles == null || form.evidenceFiles == ''" />
+                <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFiles[0].fileUrl}`"
+                  class="avatar" @click="openEvidience('evidenceFiles[0]')" />
+                <div v-if="!isView|| emptyForm.status !== 3">
+                  <el-icon :size="20" v-if="form.evidenceFiles !== '' ||form.evidenceFiles == null "
+                    @click="form.evidenceFiles = []" class="delete-button">
+                    <Delete />
+                  </el-icon>
+                </div>
+                <!-- <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
                 <el-button size="small" type="primary" icon="Upload"  v-if="form.status !==3" >点击上传</el-button>
               </el-upload> -->
-              <dragUpload :accept="accept" style="width:100%" @file="upload"/>
+                <!-- <dragUpload :accept="accept" style="width:100%" @file="upload"/>
               <el-table style="margin-top: 15px;" ref="dbTable" :data="form.evidenceFiles" size="small" border
                 header-row-class-name="list-header-row" row-class-name="list-row">
                 <el-table-column label="文件名" prop="originalFileName" align="center" show-overflow-tooltip>
@@ -109,23 +119,24 @@
                       @click="handleDel(scope.row, scope.$index)"  v-if="form.status !==3" >删除</el-button>
                   </template>
                 </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" icon="close" v-if="form.status !== 3" style="float: right; margin-left: 12px; margin-right: 12px"
-        @click="close">取消</el-button>
-      <el-button type="primary" style="float: right" size="small" v-if="form.status !== 3" icon="Finished" @click="handleSave">
-        保存</el-button>
-        <el-button v-hasPermi="['business:housingFundDeclare:verify']" v-if="!stopUseBack" style="float: right;" icon="back" size="small"
-        type="warning" :disabled="
+              </el-table> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="form-btns-container" style="height: 40px">
+        <el-button size="small" icon="close" v-if="form.status !== 3"
+          style="float: right; margin-left: 12px; margin-right: 12px" @click="close">取消</el-button>
+        <el-button type="primary" style="float: right" size="small" v-if="form.status !== 3" icon="Finished"
+          @click="handleSave">
+          保存</el-button>
+        <el-button v-hasPermi="['business:housingFundDeclare:verify']" v-if="!stopUseBack" style="float: right;"
+          icon="back" size="small" type="warning" :disabled="
     form == null || form.status !== 3
   " @click="turnBack(form)">退回</el-button>
+      </div>
     </div>
-  </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
   </el-dialog>
@@ -207,8 +218,8 @@
     loading.value = true;
     form.value.year = proxy.moment(currentMonth.value).format("YYYY");
     form.value.month = proxy.moment(currentMonth.value).format("MM");
-    const {year,month,housingFundDeclareId,companyId} = form.value
-    const clearForm = {year,month,housingFundDeclareId,companyId}
+    const { year, month, housingFundDeclareId, companyId } = form.value
+    const clearForm = { year, month, housingFundDeclareId, companyId }
     getDetail(clearForm).then((res) => {
       form.value = { ...proxy.deepClone(emptyForm), ...res.data };
       // if (form.value.status === 2 || form.value.status === 3) {
@@ -342,7 +353,9 @@
   function changeEdit() {
     editStatus.value = !editStatus.value;
   }
-
+  function openEvidience() {
+    window.open(`${baseUrl.value}${form.value.evidenceFiles[0].fileUrl}`);
+  }
   function amountChangeHandler() {
     let amount = 0;
     amount += form.value.unitAmount == null ? 0 : form.value.unitAmount;

+ 11 - 3
src/views/business/housingFund/fileListDialog.vue

@@ -29,7 +29,9 @@
                 <i class="fa fa-th-list" aria-hidden="true" /> 文件信息
               </div>
             </div>
-            <div class="details-body">
+            <img  style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFile}`"
+            class="avatar" @click="openEvidience()" />
+            <!-- <div class="details-body">
               <div>
                 <el-table
                   ref="sourceTable"
@@ -64,7 +66,7 @@
                   </el-table-column>
                 </el-table>
               </div>
-            </div>
+            </div> -->
           </el-col>
         </el-row>
       </el-form>
@@ -168,11 +170,14 @@ function open(detail) {
   visible.value = true;
   form.value = detail;
   loadData();
+  console.log(form.value);
+  
 }
 
 function loadData() {
   getDetail(form.value).then((res) => {
     form.value = { ...proxy.deepClone(emptyForm), ...res.data };
+    form.value.evidenceFile =  form.value.evidenceFiles[0].fileUrl;
   });
 }
 
@@ -269,7 +274,10 @@ function handleVerify(status) {
       });
   }
 }
-
+function openEvidience() {
+    
+    window.open(`${baseUrl.value}${form.value.evidenceFile}`);
+  }
 function verify(data) {
   verifyDetail(data).then((res) => {
     reset();

+ 1 - 1
src/views/business/service/loop/socialSecurityForm.vue

@@ -226,7 +226,7 @@
                 type="textarea" rows="2" />
             </el-form-item>
           </el-col>
-          <el-divider content-position="left">社保申报信息222</el-divider>
+          <el-divider content-position="left">社保申报信息</el-divider>
           <el-col :span="12">
             <el-form-item label="单位养老金:">
               <el-input-number v-model="form.socialSecurityDeclare.unitPension" size="small" placeholder="单位养老金"

+ 17 - 4
src/views/business/socialSecurity/declare/form.vue

@@ -178,10 +178,20 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="凭证" required>
+                <dragUpload :accept="accept" style="width:100%" @file="upload"
+                v-if="form.evidenceFiles == null || form.evidenceFiles == ''" />
+              <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFiles[0].fileUrl}`"
+                class="avatar" @click="openEvidience('evidenceFiles[0]')" />
+              <div v-if="!isView|| emptyForm.status !== 3">
+                <el-icon :size="20" v-if="form.evidenceFiles !== '' ||form.evidenceFiles == null "
+                  @click="form.evidenceFiles = []" class="delete-button">
+                  <Delete />
+                </el-icon>
+              </div>
               <!-- <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
                   <el-button size="small" type="primary" icon="Upload" v-if="form.status !==3">点击上传</el-button>
                 </el-upload>" -->
-                <dragUpload :accept="accept" style="width:100%" @file="upload"/>
+                <!-- <dragUpload :accept="accept" style="width:100%" @file="upload"/>
                 <el-table ref="dbTable" :data="form.evidenceFiles" size="small" border
                   header-row-class-name="list-header-row" row-class-name="list-row">
                   <el-table-column label="文件名" prop="originalFileName" align="center" show-overflow-tooltip>
@@ -199,7 +209,7 @@
                         @click="handlerEportFilesDel(scope.row, scope.$index)">删除</el-button>
                     </template>
                   </el-table-column>
-                </el-table>
+                </el-table> -->
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -459,7 +469,6 @@
   }
 
   function upload(param) {
-    console.log(param);
     const formData = new FormData();
     formData.append("file", param);
     uploadFile(formData).then((res) => {
@@ -472,10 +481,14 @@
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
         form.value.evidenceFiles.push(file);
+        
       }
     });
   }
-
+  function openEvidience() {
+    
+    window.open(`${baseUrl.value}${form.value.evidenceFiles[0].fileUrl}`);
+  }
   function uploadStatement(param) {
     const formData = new FormData();
     formData.append("file", param.file);

+ 9 - 4
src/views/business/socialSecurity/fileListDialog.vue

@@ -29,7 +29,9 @@
                 <i class="fa fa-th-list" aria-hidden="true" /> 凭证
               </div>
             </div>
-            <div class="details-body">
+            <img  style="height: 148px; width: 148px" :src="`${baseUrl}/${form.evidenceFile}`"
+            class="avatar" @click="openEvidience()" />
+            <!-- <div class="details-body">
               <div>
                 <el-table
                   ref="sourceTable"
@@ -64,7 +66,7 @@
                   </el-table-column>
                 </el-table>
               </div>
-            </div>
+            </div> -->
           </el-col>
 
           <el-col :span="24" class="details-container">
@@ -209,7 +211,6 @@ const emptyForm = {
 };
 
 function open(detail) {
-  console.log(detail);
   visible.value = true;
   form.value = detail;
   loadData();
@@ -218,6 +219,7 @@ function open(detail) {
 function loadData() {
   getDetail(form.value).then((res) => {
     form.value = { ...proxy.deepClone(emptyForm), ...res.data };
+    form.value.evidenceFile =  form.value.evidenceFiles[0].fileUrl;
   });
 }
 
@@ -293,7 +295,10 @@ function getSummaries(param) {
   });
   return sums;
 }
-
+function openEvidience() {
+    
+    window.open(`${baseUrl.value}${form.value.evidenceFile}`);
+  }
 function openFile(row) {
   window.open(`${baseUrl.value}${row.fileUrl}`);
 }