From 86a98c135c7ebc417f8af2045aa105a94f2ccbeb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 23 五月 2023 18:45:17 +0800
Subject: [PATCH] 修改了财务和审批

---
 src/views/project/travelexpenseslistrecord/index.vue |  109 +++++++++++++++++++++++++++---------------------------
 1 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpenseslistrecord/index.vue
index 203a29e..8c968ae 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/src/views/project/travelexpenseslistrecord/index.vue
@@ -3,31 +3,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-        <!--
-        <el-col :span="6">
+        <!--        <el-col :span="6">
           <el-form-item label="鍑哄樊浜�" prop="travelers">
             <el-input v-model="queryParams.travelers" placeholder="璇疯緭鍏ュ嚭宸汉" clearable size="small"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
-        </el-col>
--->
-        <el-col :span="6">
-          <el-form-item label="缁忓姙浜�" prop="username">
-            <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ユ姤閿�浜�" clearable size="small"
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="6">
-          <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
-            <el-input v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" v-if="0"
-              @keyup.enter.native="handleQuery" />
-            <el-select v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
-              <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        </el-col>-->
         <el-col :span="8">
           <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
             <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
@@ -36,7 +17,20 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-
+        <el-col :span="5">
+          <el-form-item label="缁忓姙浜�" prop="username">
+            <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ユ姤閿�浜�" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
+            <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%">
+              <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -74,8 +68,9 @@
           <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
         </template>
       </el-table-column>
-      <el-table-column label="缁忓姙浜�" width="120" align="center" prop="username">
-      </el-table-column>
+      <el-table-column label="缁忓姙浜�" width="120" align="center" prop="username" />
+      <el-table-column label="鎵�灞炵粍鍒�" width="120" align="center" prop="deptmentname" />
+      <el-table-column label="缁勯暱" width="120" align="center" prop="managername" />
       <el-table-column label="鎶ラ攢閲戦" width="120" align="center" prop="amountrequested">
       </el-table-column>
       <el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason">
@@ -109,7 +104,7 @@
             涓嬭浇
           </el-button>
           <!-- v-hasPermi="['project:funddetail:edit']" -->
-          <el-button size="mini" type="text" icon="el-icon-delete" disabled
+          <el-button size="mini" type="text" icon="el-icon-delete" :disabled="true"
             @click="handleDelete(scope.row)">鍒犻櫎</el-button>
           <!-- v-hasPermi="['project:funddetail:remove']" -->
         </template>
@@ -125,33 +120,31 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
-              <el-date-picker style="width: 100%" v-model="form.createTime" disabled type="date"
+              <el-date-picker style="width: 100%" v-model="form.createTime" :disabled="true" type="date"
                 value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="缁忓姙浜�" prop="username">
-              <el-input v-model="form.username" placeholder="鎶ラ攢浜�" />
+              <el-input v-model="form.username" placeholder="鎶ラ攢浜�" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="鍖哄煙缁勯暱" prop="managerno">
-              <el-input v-model="form.managerno" placeholder="鍖哄煙缁勯暱" />
+            <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+              <el-input v-model="form.deptmentname" placeholder="鎵�灞炵粍鍒�" :disabled="true" />
+            </el-form-item> </el-col> <el-col :span="5">
+            <el-form-item label="缁勯暱" prop="managername">
+              <el-input v-model="form.managername" placeholder="缁勯暱" :disabled="true" />
             </el-form-item> </el-col>
-          <el-col :span="5"><el-form-item label="鎹愮尞鑰�" prop="donorname">
-              <el-input v-model="form.donorname" placeholder="鎹愮尞鑰�" />
-            </el-form-item>
-
-          </el-col></el-row> <!--
+        </el-row>
+        <!--
         <el-row>
           <el-col :span="8">
             <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
               <el-input disabled v-model="form.donorno" placeholder="鎹愮尞缂栧彿" />
             </el-form-item>
           </el-col>
-          
-
           <el-col :span="8">
             <el-form-item label="鍑哄樊浜�" prop="travelers">
               <el-input v-model="form.travelers" placeholder="鍑哄樊浜�" />
@@ -172,18 +165,29 @@
               <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
             </el-form-item>
           </el-col>          
-        </el-row>-->
-
+        </el-row>
+      -->
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
+              <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5"><el-form-item label="鎹愮尞鑰�" prop="donorname">
+              <el-input v-model="form.donorname" placeholder="鎹愮尞鑰�" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row style="margin-top: 10px">
           <el-col :span="5">
             <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
-              <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣" />
+              <el-input v-model="form.amountrequested" placeholder="鎶ラ攢閲戦" :disabled="true" />
             </el-form-item>
           </el-col>
 
           <el-col :span="10">
             <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
-              <el-input v-model="form.bigstrmoney" placeholder="棰嗘閲戦" />
+              <el-input v-model="form.bigstrmoney" placeholder="澶у啓閲戦" :disabled="true" />
             </el-form-item>
           </el-col><!-- 
           <el-col :span="6">
@@ -204,18 +208,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
-              <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row type="flex" :gutter="10" align="right" class="mb8">
           <el-col :span="6">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" disabled @click="addRow">鏂板涓�琛�</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" :disabled="true"
+              @click="addRow">鏂板涓�琛�</el-button>
           </el-col>
-        </el-row> <el-row>
+        </el-row>
+        <el-row style="margin-top: 25px; margin-bottom: 5px">
           <el-col :span="20">鎶ラ攢鏄庣粏淇℃伅锛�</el-col>
         </el-row>
         <el-row>
@@ -394,7 +393,7 @@
               <template slot-scope="scope">
                 <el-button @click.native.prevent="
                   deleteRow(scope.$index, rbDetails, scope.row)
-                  " type="text" size="small" disabled>
+                  " type="text" size="small" :disabled="true">
                   鍒犻櫎
                 </el-button>
               </template>
@@ -434,7 +433,7 @@
               <el-input v-model="form.financechecher" placeholder="璐㈠姟瀹℃牳" />
             </el-form-item> </el-col></el-row>
           -->
-        <el-row>
+        <el-row style="margin-top: 25px; margin-bottom: 5px">
           <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
         </el-row>
         <el-row style="margin-top: 30px">
@@ -513,7 +512,7 @@
             </el-table-column>
           </el-table>
         </el-row>
-        <el-row>
+        <el-row style="margin-top: 25px; margin-bottom: 5px">
           <el-col :span="20">鎶ラ攢闄勪欢锛�</el-col>
         </el-row>
         <el-row>
@@ -532,7 +531,7 @@
         </el-row>
       </el-form>
       <el-form label-width="120px">
-        <el-row>
+        <el-row style="margin-top: 25px; margin-bottom: 5px">
           <el-col :span="20">鎶ラ攢瀹℃壒璁板綍锛�</el-col>
         </el-row>
         <el-table :data="fundflowList" border>
@@ -629,7 +628,7 @@
     "sys_0_1",
     "sys_fund_type",
     "sys_financeitemtype",
-    "sys_travelexpensebelong",
+    "sys_travelexpensebelong"
   ],
   data() {
     return {
@@ -733,7 +732,9 @@
     },
     getList() {
       this.loading = true;
+      console.log("this.queryParams", this.queryParams)
       listbypowerone(this.queryParams).then((response) => {
+
         this.reimbursementList = response.rows;
         this.total = response.total;
         this.loading = false;

--
Gitblit v1.9.3