From e20c8cf7ad6d2a85817c5627fc9ee7c755884d5b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 09:22:53 +0800
Subject: [PATCH] 1.统计报表 加上车间名称的查询条件
---
src/views/basicSettings/roleList.vue | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index c6ff9a3..c940480 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -3,6 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=4')">瀵煎叆</el-button>
</div>
<div class="bodyTopFormGroup">
@@ -89,11 +90,11 @@
<el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
</template>
</el-table-column>
- <el-table-column
- prop="dataname"
- label="鏉冮檺鑼冨洿"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="dataname"-->
+ <!-- label="鏉冮檺鑼冨洿"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="description"
label="澶囨敞"
@@ -190,55 +191,55 @@
<el-input v-model="dialogForm.rolename" style="width: 200px" />
</el-form-item>
-<!-- <el-form-item required label="鏁版嵁鑼冨洿">-->
-<!-- <el-select-->
-<!-- v-model="dialogForm.datacode"-->
-<!-- style="width:200px"-->
-<!-- placeholder="璇烽�夋嫨"-->
-<!-- :popper-append-to-body="false"-->
-<!-- >-->
-<!-- <el-option-->
-<!-- v-for="item in datacodeArr"-->
-<!-- :key="item.datacode"-->
-<!-- :label="item.dataname"-->
-<!-- :value="item.datacode"-->
-<!-- />-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item required label="鏁版嵁鑼冨洿">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.datacode"-->
+ <!-- style="width:200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in datacodeArr"-->
+ <!-- :key="item.datacode"-->
+ <!-- :label="item.dataname"-->
+ <!-- :value="item.datacode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item required label="鐘舵��">
<el-radio-group v-model="dialogForm.status" style="width: 200px">
<el-radio label="Y">姝ｅ父</el-radio>
<el-radio label="N">鍋滅敤</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item v-if="dialogForm.datacode==='CUSTOM'" label="鏁版嵁鏉冮檺" style="margin: 0">
- <el-checkbox-group v-model="checkboxGroupSelected" @change="checkboxGroupChange">
- <el-checkbox v-for="item in checkboxGroup" :key="item" :label="item">
- {{ item }}
- <el-tooltip class="item" effect="dark" content="鍕鹃�夌埗鑺傜偣鏄惁鍚屾椂閫変腑瀛愯妭鐐�" placement="top">
- <i v-if="item==='鐖跺瓙鑱斿姩'" class="el-icon-question" />
- </el-tooltip>
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- <el-card
- v-if="dialogForm.datacode==='CUSTOM'"
- class="box-card"
- shadow="never"
- style="margin-bottom: 30px;width: 78%;margin-left: 12%;"
- >
+ <!-- <el-form-item v-if="dialogForm.datacode==='CUSTOM'" label="鏁版嵁鏉冮檺" style="margin: 0">-->
+ <!-- <el-checkbox-group v-model="checkboxGroupSelected" @change="checkboxGroupChange">-->
+ <!-- <el-checkbox v-for="item in checkboxGroup" :key="item" :label="item">-->
+ <!-- {{ item }}-->
+ <!-- <el-tooltip class="item" effect="dark" content="鍕鹃�夌埗鑺傜偣鏄惁鍚屾椂閫変腑瀛愯妭鐐�" placement="top">-->
+ <!-- <i v-if="item==='鐖跺瓙鑱斿姩'" class="el-icon-question" />-->
+ <!-- </el-tooltip>-->
+ <!-- </el-checkbox>-->
+ <!-- </el-checkbox-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-card-->
+ <!-- v-if="dialogForm.datacode==='CUSTOM'"-->
+ <!-- class="box-card"-->
+ <!-- shadow="never"-->
+ <!-- style="margin-bottom: 30px;width: 78%;margin-left: 12%;"-->
+ <!-- >-->
- <el-tree
- ref="tree"
- :key="checkboxGroupSelected.toString()"
- :data="treeData"
- show-checkbox
- :check-strictly="!checkboxGroupSelected.includes('鐖跺瓙鑱斿姩')"
- :default-expand-all="checkboxGroupSelected.includes('灞曞紑/鎶樺彔')"
- node-key="torg_code"
- :props="defaultProps"
- />
- </el-card>
+ <!-- <el-tree-->
+ <!-- ref="tree"-->
+ <!-- :key="checkboxGroupSelected.toString()"-->
+ <!-- :data="treeData"-->
+ <!-- show-checkbox-->
+ <!-- :check-strictly="!checkboxGroupSelected.includes('鐖跺瓙鑱斿姩')"-->
+ <!-- :default-expand-all="checkboxGroupSelected.includes('灞曞紑/鎶樺彔')"-->
+ <!-- node-key="torg_code"-->
+ <!-- :props="defaultProps"-->
+ <!-- />-->
+ <!-- </el-card>-->
<el-form-item label="澶囨敞">
<el-input v-model="dialogForm.description" type="textarea" style="width:500px" />
--
Gitblit v1.9.3