From 8324c778ee797ea5a844614c47d93bdacf3ffeab Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 07 一月 2024 13:17:33 +0800
Subject: [PATCH] 11

---
 src/views/project/fund/expertFeeApply/index.vue |  176 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 102 insertions(+), 74 deletions(-)

diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index d0624fa..5813975 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -1,66 +1,6 @@
 <!--  -->
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="70px"
-    >
-      <el-row align="left">
-        <el-col :span="6">
-          <el-form-item label="濮撳悕" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="璇疯緭鍏ュ鍚�"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
-            <el-select
-              v-model="queryParams.recordstate"
-              placeholder="璇烽�夋嫨璁板綍鐘舵��"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_DonationStatus"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="鎹愮尞鑰�" prop="name">
-            <el-input
-              v-model="queryParams.donorname"
-              placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >鎼滅储</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >閲嶇疆</el-button
-          >
-        </el-col>
-      </el-row>
-    </el-form>
     <el-row>
       <el-col :span="6">
         <el-card shadow="never">
@@ -71,6 +11,54 @@
               </el-row>
             </el-col>
           </el-row>
+          <div>
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              :inline="true"
+              label-width="70px"
+            >
+              <el-form-item label="濮撳悕" prop="name">
+                <el-input
+                  v-model="queryParams.donorname"
+                  placeholder="璇疯緭鍏ュ鍚�"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
+                <el-select
+                  v-model="queryParams.recordstate"
+                  placeholder="璇烽�夋嫨璁板綍鐘舵��"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_DonationStatus"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <div style="float: right; margin-bottom: 10px;">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >鎼滅储</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >閲嶇疆</el-button
+                >
+              </div>
+            </el-form>
+          </div>
           <el-table
             v-loading="loading"
             highlight-current-row
@@ -104,7 +92,7 @@
         <el-card shadow="naver">
           <el-form ref="infoform" label-width="100px">
             <el-row :gutter="4" align="right" class="mb8">
-              <el-col :span="9">
+              <el-col :span="7">
                 <el-form-item label="鎹愮尞缂栧彿">
                   <el-input
                     v-model="curCase.donorno"
@@ -112,12 +100,20 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="9">
+              <el-col :span="8">
                 <el-form-item label="濮撳悕">
                   <el-input v-model="curCase.name" :disabled="true"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col> </el-col>
+              <el-col :span="3">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="allgetfundList"
+                  >妫�绱㈠叏閮�</el-button
+                >
+              </el-col>
             </el-row>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -141,12 +137,12 @@
                 <el-table-column
                   label="鐢宠鏃ユ湡"
                   align="center"
-                  prop="createTime"
+                  prop="applyTime"
                   width="180px"
                 >
                   <template slot-scope="scope">
                     <span>{{
-                      parseTime(scope.row.createTime, "{y}-{m}-{d}")
+                      parseTime(scope.row.applyTime, "{y}-{m}-{d}")
                     }}</span>
                   </template>
                 </el-table-column>
@@ -156,11 +152,17 @@
                   prop="username"
                   width="120px"
                 />
-                <el-table-column
+                <!-- <el-table-column
                   label="鐢宠閲戦"
                   align="center"
                   prop="pretaxcost"
                   width="200px"
+                /> -->
+                <el-table-column
+                  label="鎹愮尞浜�"
+                  align="center"
+                  prop="donorname"
+                  width="120px"
                 />
                 <el-table-column
                   label="缁勯暱"
@@ -183,6 +185,19 @@
                     <dict-tag
                       :options="dict.type.sys_recordstatus"
                       :value="scope.row.recordstatus"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="鐢宠鏉愭枡鐘舵��"
+                  width="140"
+                  align="center"
+                  prop="checkstatus"
+                >
+                  <template slot-scope="scope">
+                    <dict-tag
+                      :options="dict.type.sys_stage_type"
+                      :value="scope.row.checkstatus"
                     />
                   </template>
                 </el-table-column>
@@ -224,7 +239,7 @@
                     <el-button
                       size="mini"
                       type="text"
-                      icon="el-icon-edit"
+                      icon="el-icon-view"
                       @click="handleDetail(scope.row)"
                       >鏌ョ湅</el-button
                     >
@@ -276,11 +291,11 @@
       >
         <el-row style="text-align: left">
           <el-col :span="5">
-            <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+            <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
               <el-date-picker
                 clearable
                 style="width: 100%"
-                v-model="form.createTime"
+                v-model="form.applyTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="鐢宠鏃ユ湡"
@@ -389,10 +404,10 @@
             </el-form-item>
           </el-col>-->
           <el-col :span="5">
-            <el-form-item label="鎹愮尞鑰�" prop="name">
+            <el-form-item label="鎹愮尞鑰�" prop="donorname">
               <el-input
                 :disabled="true"
-                v-model="form.name"
+                v-model="form.donorname"
                 placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
               />
             </el-form-item>
@@ -1144,7 +1159,8 @@
     //"sys_financeitemtype",
     //"sys_expensetype",
     "sys_recordstatus",
-    "sys_professionaltitle"
+    "sys_professionaltitle",
+    "sys_stage_type"
   ],
 
   data() {
@@ -1211,7 +1227,7 @@
         username: [
           { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
         ],
-        createTime: [
+        applyTime: [
           { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
         ],
         deptmentname: [
@@ -1559,6 +1575,7 @@
 
     /** 涓婃姤鎸夐挳鎿嶄綔 */
     handleUp(row) {
+      console.log(row);
       this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
@@ -1568,6 +1585,9 @@
           //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
           //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
           row.recordstatus = 0;
+          var currenttime = new Date();
+          row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+
           updateFund(row).then(response => {
             if (response.code == 200) {
               this.$message({
@@ -2090,7 +2110,15 @@
       this.curCase = row;
       this.getfundList();
     },
-
+    allgetfundList() {
+      this.loading = true;
+      this.reset();
+      this.fundQueryParam.infoid = null;
+      listFund(this.fundQueryParam).then(response => {
+        this.loading = false;
+        this.donateconsolationfundList = response.rows;
+      });
+    },
     getfundList() {
       this.loading = true;
       this.reset();

--
Gitblit v1.9.3