From d3d255c214d71f33c38c44e8a9fcbd428bbd6a19 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 22 四月 2023 10:49:01 +0800
Subject: [PATCH] yxh

---
 src/views/project/travelexpenseslist/index.vue |  154 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 84 insertions(+), 70 deletions(-)

diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 7fb498d..8a5b2b2 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -122,31 +122,7 @@
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="1400px" append-to-body
       @close="reset">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-        <!-- 
-            <el-form-item label="澶囨敞" prop="reason">
-              <el-input v-model="form.reason" placeholder="涓撹亴浜哄憳 鍗忚皟鍛�" />
-            </el-form-item> 
-                                                                                -->
-          <el-col :span="5">
-            <el-form-item label="鎶ラ攢鍒嗙被" prop="costtype">
-              <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
-                <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="濉姤浜�" prop="username">
-              <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
-                default-first-option placeholder="璇烽�夋嫨">
-                <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
-                  :value="item.reportName">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
+        <el-row><el-col :span="5">
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
               <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="鐢宠鏃ユ湡">
@@ -154,6 +130,40 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
+            <el-form-item label="缁忓姙浜�" prop="username">
+              <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
+                default-first-option placeholder="璇烽�夋嫨">
+                <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
+                  :value="item.reportName">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col><el-col :span="5">
+            <el-form-item label="鍖哄煙缁勯暱" prop="managername">
+              <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5">
+            <el-form-item label="鎹愮尞鑰�" prop="infoid">
+              <el-select  v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+                <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
+                </el-option>
+              </el-select>
+            </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 :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
+              <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
+            </el-form-item>
+          </el-col><el-col :span="5">
             <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
               <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
                 <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
@@ -162,7 +172,21 @@
             </el-form-item>
           </el-col>
         </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="costtype">
+              <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
+                <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="5">
             <el-form-item label="鎶ラ攢浜�" prop="travelers">
               <el-select v-model="form.travelers" clearable filterable allow-create ref="getReportname"
@@ -190,41 +214,21 @@
           </el-col>
         </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="managername">
-              <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="20"><el-divider></el-divider></el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
-            <el-form-item label="鎹愮尞鑰�" prop="infoid">
-              <el-select :disabled = "true" v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
-                <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
             <el-form-item label="瀹跺睘璐圭敤" prop="donoramount">
-              <el-input :disabled = "true" v-model="form.donoramount" placeholder="瀹跺睘璐圭敤" @blur="
+              <el-input :disabled="true" v-model="form.donoramount" placeholder="瀹跺睘璐圭敤" @blur="
                 (val) => {
                   sumTotalFee();
                 }
               " onchange="if(/[^0-9.]/.test(this.value)){alert('璇锋纭緭鍏ユ暣鏁版暟瀛楁垨灏忔暟锛�');this.value='';}" />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="15">
             <el-form-item label="璐圭敤璇存槑" prop="donorremark">
-              <el-input :disabled = "true" v-model="form.donorremark" placeholder="瀹跺睘璐圭敤璇存槑" />
+              <el-input :disabled="true" v-model="form.donorremark" placeholder="瀹跺睘璐圭敤璇存槑" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -250,6 +254,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+                -->
       <!-- 
         <el-row type="flex" :gutter="10" align="right" class="mb8">
           <el-col :span="6">
@@ -263,12 +268,25 @@
             >
           </el-col>
           </el-row>
-            -->
+                      -->
         <el-row>
           <el-table :data="applicationDetailArr" border highlight-current-row>
             <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="120">
+              <template slot-scope="scope">
+                <el-select v-model="form.persontype" value-key="value" placeholder="浜哄憳绫诲埆" @change="getTravelers">
+                <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="personname" slot="" label="鍑哄樊浜�" align="center" fixed width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.personname" placeholder="鍑哄樊浜�" />
               </template>
             </el-table-column>
             <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
@@ -293,14 +311,14 @@
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column prop="departure" slot="" label="鍑哄彂鍦扮偣" align="center" fixed width="100">
+            <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" fixed width="100">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦扮偣" />
+                <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
               </template>
             </el-table-column>
-            <el-table-column label="鍒拌揪鍦扮偣" prop="destination" align="center" fixed width="100">
+            <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" fixed width="100">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦扮偣" @blur="getallowance(scope.row)" />
+                <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" />
               </template>
             </el-table-column>
             <el-table-column prop="days" label="澶╂暟" width="65" align="center">
@@ -308,9 +326,17 @@
                 <el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="澶╂暟" />
               </template>
             </el-table-column>
-            <el-table-column prop="traffictype" label="浜ら�氬伐鍏�" align="center" width="100">
+            <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.traffictype" placeholder="浜ら�氬伐鍏�">
+                <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+                  <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
                   <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
                     :value="dict.label"></el-option>
                 </el-select>
@@ -336,7 +362,7 @@
                 </el-input>
               </template>
             </el-table-column>
-                                                                                                                            -->
+                                                                                                                                      -->
             <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
@@ -407,18 +433,6 @@
             </el-table-column>
           </el-table>
         </el-row>
-        <el-row style="margin-top: 10px">
-          <el-col :span="6">
-            <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
-              <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
-              <el-input v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
-            </el-form-item>
-          </el-col>
-        </el-row>
 
       <!--
         <el-row>
@@ -450,14 +464,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-                                                                                      -->
+                                                                                                -->
         <el-row>
           <el-col :span="14">
           <!--
           <el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
               <el-input v-model="form.fileurl" placeholder="璇疯緭鍏ユ枃浠跺湴鍧�" />
           </el-form-item>
-                                                                                    -->
+                                                                                              -->
             <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
               <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
               <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"

--
Gitblit v1.9.3