From a68bf12a2975405f57f9a9d51b91c13a93c026f0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 31 一月 2024 21:01:36 +0800
Subject: [PATCH] Mr.Shi
---
company/src/views/enterprise/add_subtract.vue | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 54b14c0..9f45503 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -14,16 +14,16 @@
<el-option label="宸插叧闂�" value="6"></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"
@@ -42,6 +42,12 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+<<<<<<< HEAD
+=======
+ <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>
+>>>>>>> 48eb5dc61ac07d232632b13d040006128ed5cceb
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -60,12 +66,12 @@
<span v-if="row.status === 3">閫�鍥炵敵璇�</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="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
+ <el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+ <el-table-column prop="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="delNum" label="鍑忎繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="fee" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
label="鎿嶄綔"
@@ -94,7 +100,7 @@
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 {all as solutionAll, all} from '@/api/business/solutions'
export default {
name: 'add_subtract',
extends: BaseTable,
@@ -105,12 +111,12 @@
searchForm: {
status: '',
type: '0',
- solutionsId: '',
+ baseSolutionsId: '',
createDateE: '',
createDateS: '',
time: []
},
- list: []
+ solutionList: []
}
},
created () {
@@ -125,10 +131,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