From fe37beed44df3d9f98aad764f3977b18ef557784 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期五, 26 五月 2023 20:05:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-ui/src/views/economy/index.vue | 72 ++++++++++++++++------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue index 5a00a83..88d62f6 100644 --- a/ruoyi-ui/src/views/economy/index.vue +++ b/ruoyi-ui/src/views/economy/index.vue @@ -107,28 +107,24 @@ </el-row> <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔--> <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 --> - <el-table v-loading="loading" :data="economyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> + <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> + <el-table-column type="selection" width="55" align="center" /> <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/> - <el-table-column label="鍩洪噾/鍙拌处" prop="type" sortable width="120" > - <template slot-scope="scope"> - {{ getSrc1(scope.row.type) }} - </template> - </el-table-column> + <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="100" align="center"> <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" /> + <el-table-column label="鍙拌处" prop="type" sortable width="100" /> + <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" > + + </el-table-column> <el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" /> <el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" /> <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" > - <template slot-scope="scope"> - {{ getSrc2(scope.row.kind) }} - </template> + <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="浣欓" prop="balance" sortable width="100" /> - <el-table-column label="澶囨敞" prop="remark" sortable width="100" /> <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" > <template slot-scope="scope" > <img @@ -149,7 +145,9 @@ > </template> </el-table-column> - + <el-table-column label="澶囨敞" prop="remark" sortable width="100" > + <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> + </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> <el-button @@ -173,7 +171,6 @@ </template> </el-table-column> </el-table> - <pagination v-show="total>0" :total="total" @@ -187,11 +184,8 @@ <!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� --> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> - <el-form-item label="鍩洪噾/鍙拌处" prop="type"> - <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> + <el-form-item label="鍙拌处" prop="type"> + <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="鏃堕棿" prop="happenTime"> @@ -202,7 +196,14 @@ ></el-date-picker> </el-form-item> <el-form-item label="鏀跺叆/鏀嚭" prop="price"> - <el-input v-model="formDat.price" placeholder="璇疯緭鍏ユ敹鍏�/鏀嚭" clearable :style="{width: '100%'}" ></el-input> + <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + </el-form-item> + <el-form-item label="閲戦" prop="balance"> + <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" > + </el-input> </el-form-item> <el-form-item label="鐢ㄩ��" prop="useFor"> <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" > @@ -212,14 +213,8 @@ <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" > </el-input> </el-form-item> - <el-form-item label="鐜伴噾/鑷姩鎵e垝" prop="kind"> - <el-select v-model="formDat.kind" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鎵e垝" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="浣欓" prop="balance"> - <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" > + <el-form-item label="鏀粯鏂瑰紡" prop="kind"> + <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="澶囨敞" prop="remark"> @@ -394,17 +389,17 @@ }], type: [{ required: true, - message: '璇烽�夋嫨鍩洪噾/鍙拌处', - trigger: 'change' + message: '璇疯緭鍏ュ彴璐﹀唴瀹�', + trigger: 'blur' }], balance: [{ required: true, - message: '璇疯緭鍏ヤ綑棰�', + message: '璇疯緭鍏ラ噾棰�', trigger: 'blur' }], kind: [{ - required: true, - message: '璇疯緭鍏ュ搴彿', + // required: true, + message: '璇疯緭鍏ユ敮浠樻柟寮�', trigger: 'blur' }], createTime: [{ @@ -420,14 +415,13 @@ }, typeOptions: [ { - value: '0', - label: '鍩洪噾', + value: '鏀跺叆', + label: '鏀跺叆', }, { - value: '1', - label: '鍙拌处', - } - ], + value: '鏀嚭', + label: '鏀嚭', + }], typeOptions1: [ { value: '0', -- Gitblit v1.9.1