From 1b82be7ee8ce6f462d8d090e6a3e3216e3aba567 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 09 十一月 2023 17:54:53 +0800
Subject: [PATCH] modified: src/views/basic/template/index.vue modified: src/views/technology/document/index.vue
---
src/views/basic/template/index.vue | 9 +-
src/views/technology/document/index.vue | 122 ++++++++++++++++++++--------------------
2 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index d6fc5da..a076b9c 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -67,7 +67,7 @@
align="center"
>
</el-table-column>
- <!-- <el-table-column
+ <el-table-column
label="鍙傛暟绫诲瀷"
prop="type"
align="center"
@@ -106,7 +106,7 @@
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center">
- </el-table-column> -->
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button
@@ -116,13 +116,13 @@
@click="saveSample(scope.$index, scope.row)"
>淇濆瓨
</el-button>
- <!-- <el-button
+ <el-button
type="text"
v-if="!scope.row.isUpdate"
size="mini"
@click="editSample(scope.$index, scope.row)"
>缂栬緫
- </el-button> -->
+ </el-button>
<el-button
type="text"
size="mini"
@@ -444,7 +444,6 @@
},
// 娣诲姞
relateOperationParam() {
- console.log(11111);
if (this.templateId !== 0) {
// 绛涢�夊嚭褰撳墠椤甸潰宸叉湁鐨勫弬鏁�
this.paramSelArr = []
diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue
index 7db3d0f..f648f62 100644
--- a/src/views/technology/document/index.vue
+++ b/src/views/technology/document/index.vue
@@ -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