test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
3 changed files with 70 additions and 6 deletions
Showing only changes of commit 63931b883c - Show all commits

View File

@ -58,6 +58,7 @@
"js-beautify": "1.13.0", "js-beautify": "1.13.0",
"jsencrypt": "3.3.1", "jsencrypt": "3.3.1",
"min-dash": "3.5.2", "min-dash": "3.5.2",
"moment": "^2.29.4",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"quill": "1.3.7", "quill": "1.3.7",

View File

@ -7,12 +7,16 @@
ref="search-bar" ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" /> @headBtnClick="handleSearchBarBtnClick" />
<!-- 操作工具栏 --> <div
<el-row :gutter="10" class="mb8"> class="st"
<right-toolbar style="border: 1px solid #ccc; padding: 12px; margin: 12px 0">
:showSearch.sync="showSearch" <base-table
@queryTable="getList"></right-toolbar> :table-props="tableProps"
</el-row> :page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-data="list"
@emit-fun="handleEmitFun" />
</div>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
@ -88,6 +92,8 @@
</template> </template>
<script> <script>
import moment from 'moment';
import { import {
createQualityInspectionType, createQualityInspectionType,
updateQualityInspectionType, updateQualityInspectionType,
@ -102,6 +108,55 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
tableData: [],
tableProps: [
{
prop: 'createTime',
label: '添加时间',
fixed: true,
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '检测类型名称', align: 'center' },
{ prop: 'code', label: '检测类型编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' },
{
label: '操作',
alignt: 'center',
subcomponent: {
render: function (h) {
return h(
'div',
null,
[
h(
'el-button',
{
props: {
icon: 'el-icon-edit',
size: 'mini',
type: 'text',
},
},
' 修改'
),
h(
'el-button',
{
props: {
icon: 'el-icon-edit',
size: 'mini',
type: 'text',
},
},
' 修改'
),
]
);
},
},
},
],
// //
loading: true, loading: true,
// //
@ -240,6 +295,9 @@ export default {
this.open = true; this.open = true;
this.title = '添加质量检测类型基础'; this.title = '添加质量检测类型基础';
}, },
handleEmitFun(val) {
console.log('emit unf', val);
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();

View File

@ -6842,6 +6842,11 @@ moddle@^5.0.2:
dependencies: dependencies:
min-dash "^3.0.0" min-dash "^3.0.0"
moment@^2.29.4:
version "2.29.4"
resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
move-concurrently@^1.0.1: move-concurrently@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz" resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"