ソースを参照

Merge branch 'master' into jenkins

lex 2 年 前
コミット
cb0e02e538

+ 6 - 0
src/views/process/list/all.vue

@@ -81,6 +81,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="报销金额"
+          align="center"
+          prop="reimbursement_amount"
+        >
+        </el-table-column>
         <el-table-column label="付款金额" align="center" prop="payment_amount">
         </el-table-column>
         <el-table-column

+ 8 - 2
src/views/process/list/my-create.vue

@@ -80,6 +80,12 @@
             <el-tag v-else size="mini" type="danger">是</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          label="报销金额"
+          align="center"
+          prop="reimbursement_amount"
+        >
+        </el-table-column>
         <el-table-column label="付款金额" align="center" prop="payment_amount">
         </el-table-column>
         <el-table-column
@@ -141,7 +147,7 @@
               icon="el-icon-refresh-right"
               v-if="scope.row.is_end === 1"
               @click="handleReopen(scope.row)"
-              >重</el-button
+              >重新发起</el-button
             >
             <el-button
               v-if="scope.row.is_end === 0"
@@ -218,7 +224,7 @@ export default {
       console.log(this.listQuery);
       workOrderList({
         ...this.listQuery,
-        search: this.listQuery.search ? this.listQuery.search.join(" ") : '',
+        search: this.listQuery.search ? this.listQuery.search.join(" ") : "",
       }).then((response) => {
         this.ticketList = response.data.data;
         this.queryParams.pageIndex = response.data.page;

+ 6 - 0
src/views/process/list/related.vue

@@ -80,6 +80,12 @@
             <el-tag v-else size="mini" type="danger">是</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          label="报销金额"
+          align="center"
+          prop="reimbursement_amount"
+        >
+        </el-table-column>
         <el-table-column label="付款金额" align="center" prop="payment_amount">
         </el-table-column>
         <el-table-column

+ 6 - 0
src/views/process/list/upcoming.vue

@@ -80,6 +80,12 @@
             <el-tag v-else size="mini" type="danger">是</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          label="报销金额"
+          align="center"
+          prop="reimbursement_amount"
+        >
+        </el-table-column>
         <el-table-column label="付款金额" align="center" prop="payment_amount">
         </el-table-column>
         <el-table-column

ファイルの差分が大きいため隠しています
+ 0 - 0
web/static/web/js/chunk-bbf11c9a.ab01ef6f.js


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません