From a9ca0823ab8f33ca85abebcf6ec4a8da235adb49 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 14:36:49 +0800
Subject: [PATCH] 开发业务接口
---
company/src/views/business/dispatchUnitReview.vue | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/company/src/views/business/dispatchUnitReview.vue b/company/src/views/business/dispatchUnitReview.vue
index 081779a..6d0c29c 100644
--- a/company/src/views/business/dispatchUnitReview.vue
+++ b/company/src/views/business/dispatchUnitReview.vue
@@ -2,30 +2,22 @@
<TableLayout :permissions="['business:dispatchunit:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎵�灞炰紒涓�" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="娲鹃仯鍗曚綅" prop="name">
- <el-select v-model="searchForm.name" placeholder="璇烽�夋嫨" @change="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="鎵�灞炰笟" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="item in companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娲鹃仯鍗曚綅" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ淳閬ｅ崟浣�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
- <el-button @click="$refs.dispatchUnitReviewDetails.open('娲鹃仯鍗曚綅璇︽儏')">璇︽儏</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -40,13 +32,17 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="companyId" label="鎵�灞炰紒涓�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px"></el-table-column>
<el-table-column prop="name" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.unitStatus === 0">寰呭鏍�</span>
- <span v-if="row.unitStatus === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ <span style="color: #2E68EC" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span v-if="row.unitStatus === 1">
+ <span style="color:#2E68EC" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
+ <span style="color: green" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span style="color: red" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ </span>
+ <span style="color: red" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" min-width="100px"></el-table-column>
@@ -57,7 +53,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaDispatchUnitWindow.open('缂栬緫娲鹃仯鍗曚綅淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:dispatchunit:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.dispatchUnitDetailsPlat.open('娲鹃仯鍗曚綅璇︽儏', row)" icon="el-icon-edit" v-permissions="['business:dispatchunit:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -69,7 +65,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <dispatchUnitReviewDetails ref="dispatchUnitReviewDetails" @success="handlePageChange"/>
+ <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -77,18 +73,20 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
- import dispatchUnitReviewDetails from '@/components/business/dispatchUnitReviewDetails'
+ import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
+ import {pageAll as companyAll} from '@/api/business/company'
export default {
name: 'dispatchUnitReview',
extends: BaseTable,
- components: { TableLayout, Pagination, dispatchUnitReviewDetails },
+ components: { TableLayout, Pagination, dispatchUnitDetailsPlat },
data () {
return {
// 鎼滅储
searchForm: {
name: '',
companyId: ''
- }
+ },
+ companyList:[]
}
},
created () {
@@ -99,6 +97,19 @@
'field.main': 'id'
})
this.search()
+ this.loadSelectList()
+ },
+ methods:{
+ // handlePageChange() {
+ // this.search()
+ // },
+ loadSelectList() {
+ companyAll({}).then(res => {
+ this.companyList = res
+ }).catch(err => {
+ })
}
+
+ }
}
</script>
--
Gitblit v1.9.3