From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/document/index.vue | 130 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue
index c642dc1..f648f62 100644
--- a/src/views/technology/document/index.vue
+++ b/src/views/technology/document/index.vue
@@ -11,21 +11,21 @@
ref="documentTable"
>
<template #toolbar>
- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
+ <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
>ERP鍚屾</el-button
- >
+ > -->
<el-button
type="primary"
@click="deleteBatch"
v-if="permissions.technology_document_del"
>鎵归噺鍒犻櫎</el-button
>
- <el-button
+ <!-- <el-button
type="primary"
@click="bindTestStandard"
v-if="permissions.technology_document_standard_upload"
>鎵归噺缁戝畾妫�娴嬫爣鍑�</el-button
- >
+ > -->
</template>
</ttable>
<el-dialog
@@ -141,26 +141,26 @@
isSearch: true,
searchInfoType: 'text'
},
- // 缁濈紭棰滆壊
- {
- minWidth: '120',
- prop: 'insulationColor',
- label: '缁濈紭棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- // 鎶ゅ棰滆壊
- {
- minWidth: '120',
- prop: 'sheathColor',
- label: '鎶ゅ棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // // 缁濈紭棰滆壊
+ // {
+ // minWidth: '120',
+ // prop: 'insulationColor',
+ // label: '缁濈紭棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // // 鎶ゅ棰滆壊
+ // {
+ // minWidth: '120',
+ // prop: 'sheathColor',
+ // label: '鎶ゅ棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'testStandard',
@@ -230,47 +230,47 @@
searchInfoType: 'text',
noShowTip: false
},
- {
- minWidth: '120',
- prop: 'projectNo',
- label: '椤圭洰鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'projectType',
- label: '椤圭洰绫诲埆',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- optList: () => {
- return this.getProjectTypeOptionList()
- },
- formatter: (row, column, cellValue) => {
- var formatVal
- if (cellValue == 0) {
- formatVal = '鍥藉唴椤圭洰'
- } else if (cellValue == 1) {
- formatVal = '鐗圭紗鐮斿彂椤圭洰'
- } else {
- formatVal = ''
- }
- return formatVal
- }
- },
- {
- minWidth: '120',
- prop: 'country',
- label: '鍥藉',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'projectNo',
+ // label: '椤圭洰鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'projectType',
+ // label: '椤圭洰绫诲埆',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // optList: () => {
+ // return this.getProjectTypeOptionList()
+ // },
+ // formatter: (row, column, cellValue) => {
+ // var formatVal
+ // if (cellValue == 0) {
+ // formatVal = '鍥藉唴椤圭洰'
+ // } else if (cellValue == 1) {
+ // formatVal = '鐗圭紗鐮斿彂椤圭洰'
+ // } else {
+ // formatVal = ''
+ // }
+ // return formatVal
+ // }
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'country',
+ // label: '鍥藉',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鎻忚堪
{
--
Gitblit v1.9.3