Jelajahi Sumber

Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

祁鹏飞 2 bulan lalu
induk
melakukan
8818039d26
1 mengubah file dengan 28 tambahan dan 26 penghapusan
  1. 28 26
      src/views/finance/index.vue

+ 28 - 26
src/views/finance/index.vue

@@ -41,8 +41,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -57,13 +56,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
-                  :props="tableProps"></el-cascader>
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                  @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="协议选择">
-                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable  filterable>
+                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
                     :label="item.agreementTitle"></el-option>
                 </el-select>
@@ -102,7 +101,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="isTrue?16:8" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="isTrue ? 16 : 8" style="display: flex;align-items: flex-start; justify-content: flex-end">
               <el-button plain @click="handleExport('0')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -194,8 +193,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -210,13 +208,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
-                  :props="tableProps"></el-cascader>
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                  @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="协议选择">
-                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable  filterable>
+                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
                     :label="item.agreementTitle"></el-option>
                 </el-select>
@@ -255,7 +253,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="isTrue?16:8" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="isTrue ? 16 : 8" style="display: flex;align-items: flex-start; justify-content: flex-end">
               <el-button plain @click="handleExport('1')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -349,8 +347,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -365,13 +362,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
-                  :props="tableProps"></el-cascader>
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                  @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="协议选择">
-                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable  filterable>
+                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
                     :label="item.agreementTitle"></el-option>
                 </el-select>
@@ -410,7 +407,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="isTrue?16:8" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="isTrue ? 16 : 8" style="display: flex;align-items: flex-start; justify-content: flex-end">
               <el-button plain @click="handleExport('2')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -505,8 +502,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -521,13 +517,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
-                  :props="tableProps"></el-cascader>
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                  @change="handleChange" :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="协议选择">
-                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable  filterable>
+                <el-select v-model="firstForm.agreementId" placeholder="请选择协议" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
                     :label="item.agreementTitle"></el-option>
                 </el-select>
@@ -785,7 +781,7 @@ const initData = (type) => {
       isProblem: 1
     }
   }
-  if(type == '0'){
+  if (type == '0') {
     obj.allTodoReceive = true;
   }
   api.financeApi.auditList(obj).then((res: any) => {
@@ -862,10 +858,16 @@ const viewDetail = (row) => {
 }
 // 数据导出// 数据导出
 const handleExport = (type: any) => {
-  api.financeApi.exportOrderExcel({
+  let obj = {
     ...firstForm.value,
     auditStatus: type,
-  }).then((res: any) => {
+  }
+  if(type=='0'){
+    obj.allTodoReceive = true;
+  }else{
+    delete obj.allTodoReceive;
+  }
+  api.financeApi.exportOrderExcel(obj).then((res: any) => {
     if (res.code == 200) {
       const link = document.createElement('a');
       link.href = res.msg;