From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交
---
company/src/views/enterprise/add_subtract.vue | 101 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 8a89ddc..1fbd4a1 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -9,20 +9,23 @@
<el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
- <el-option label="宸查��鍥�" value="2"></el-option>
- <el-option label="宸插叧闂�" value="3"></el-option>
+<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
+ <el-option label="宸查��鍥�" value="5"></el-option>
+ <el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="寰呭嚭鍗�" value="7"></el-option>
+ <el-option label="鎵规敼鐢宠涓�" value="9"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="solutionsId">
- <el-select v-model="searchForm.solutionsId" placeholder="璇烽�夋嫨" @change="search">
- <el-option
- v-for="item in list"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
+ <el-select v-model="searchForm.baseSolutionsId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="item in solutionList"
+ :key="item.baseId"
+ :label="item.name"
+ :value="item.baseId">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鎻愪氦鏃ユ湡" prop="status">
<el-date-picker
@change="changeTime"
@@ -41,41 +44,61 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:applychange:create']">
- <li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
- </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
>
- <el-table-column label="搴忓彿" width="80px">
+ <el-table-column align="center" label="搴忓彿" width="50px" fixed>
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
+ <el-table-column align="center" prop="status" label="淇濆崟鐘舵��" width="80px" fixed>
<template slot-scope="{row}">
- <span v-if="row.status === 0">寰呯缃�</span>
- <span v-if="row.status === 1">宸茬绔�</span>
- <span v-if="row.status === 2">宸蹭笂浼犳壒鍗�</span>
- <span v-if="row.status === 3">閫�鍥炵敵璇�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 7">寰呭嚭鍗�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 9">鎵规敼鐢宠涓�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">鐢宠閫�鍥�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">宸查��鍥�</span>
</template>
</el-table-column>
- <el-table-column prop="code" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鍑忎繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column align="center" prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="150px" fixed></el-table-column>
+ <el-table-column align="center" prop="solutionsName" label="淇濋櫓鏂规" min-width="150px" fixed></el-table-column>
+ <el-table-column align="center" label="绫诲瀷" fixed width="80px">
+ <template slot-scope="{row}">
+ <span style="color: #00BA92" v-if="row.solutionType == 1">濮旀墭鎶曚繚</span>
+ <span style="color: #F95601;" v-else>鐩存帴鎶曚繚</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="addNum" label="鍔犱繚浜烘暟" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.addNum||0}} 浜�
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="delNum" label="鍑忎繚浜烘暟" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.delNum||0}} 浜�
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="fee" label="璐圭敤鍙樻洿" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="validTime" label="鐢宠鏃ユ湡" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
label="鎿嶄綔"
+ align="center"
min-width="120"
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -87,7 +110,7 @@
</pagination>
</template>
<!-- 璇︽儏 -->
- <add_subtractDetails ref="add_subtractDetails" @success="handlePageChange"/>
+ <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -96,23 +119,25 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import add_subtractDetails from '@/components/enterprise/add_subtractDetails'
- import { all } from '@/api/business/solutions'
+ import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+ import {all as solutionAll, all} from '@/api/business/solutions'
+ import { mapState } from 'vuex'
export default {
name: 'add_subtract',
extends: BaseTable,
- components: { TableLayout, Pagination, add_subtractDetails },
+ components: { TableLayout, Pagination, add_subtractDetails, OperaApplyChangeDetailWindow },
data () {
return {
// 鎼滅储
searchForm: {
status: '',
type: '0',
- solutionsId: '',
+ baseSolutionsId: '',
createDateE: '',
createDateS: '',
time: []
},
- list: []
+ solutionList: []
}
},
created () {
@@ -127,10 +152,10 @@
},
methods: {
getAll() {
- all()
- .then(res => {
- this.list = res
- })
+ solutionAll({dataType:2}).then(res => {
+ this.solutionList = res
+ }).catch(err => {
+ })
},
changeTime(e) {
if (e.length > 0) {
--
Gitblit v1.9.3