commit
This commit is contained in:
@@ -116,13 +116,6 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
|
||||||
v-if="!form.itemsNum1"
|
|
||||||
prop="technicalRequir"
|
|
||||||
label="核心技术要求"
|
|
||||||
show-overflow-tooltip
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
@@ -147,6 +140,13 @@
|
|||||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
v-if="!form.itemsNum1"
|
||||||
|
prop="technicalRequir"
|
||||||
|
label="核心技术要求"
|
||||||
|
show-overflow-tooltip
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
v-if="form.itemsNum1"
|
v-if="form.itemsNum1"
|
||||||
@@ -163,12 +163,12 @@
|
|||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="执行人"
|
label="责任人"
|
||||||
width="170"
|
width="170"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-model="scope.row.zxUserId" style="display: none;"/>
|
<el-input v-model="scope.row.zxUserId" style="display: none;"/>
|
||||||
<el-input v-model="scope.row.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRRS(scope.row.zxUserId, 1, scope.$index)"/>
|
<el-input v-model="scope.row.zxUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zxUserId, 1, scope.$index)"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -392,14 +392,14 @@
|
|||||||
choiceZRRS (row, type, index) {
|
choiceZRRS (row, type, index) {
|
||||||
this.type = type
|
this.type = type
|
||||||
if (type === 1) {
|
if (type === 1) {
|
||||||
this.drawerTitle = '选择执行人'
|
this.drawerTitle = '选择责任人'
|
||||||
this.nodeList2 = []
|
this.nodeList2 = []
|
||||||
this.zxIndex = index
|
this.zxIndex = index
|
||||||
this.nodeList2.push(row)
|
this.nodeList2.push(row)
|
||||||
this.modalshowflag2 = true
|
this.modalshowflag2 = true
|
||||||
} else {
|
} else {
|
||||||
// 批量
|
// 批量
|
||||||
this.drawerTitle = '批量选择执行人'
|
this.drawerTitle = '批量选择责任人'
|
||||||
if (this.zxIdList.length > 0) {
|
if (this.zxIdList.length > 0) {
|
||||||
this.nodeList2 = []
|
this.nodeList2 = []
|
||||||
this.modalshowflag2 = true
|
this.modalshowflag2 = true
|
||||||
@@ -513,7 +513,7 @@
|
|||||||
}
|
}
|
||||||
this.sarType = data.standInData || data.sarType
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
let arr
|
let arr = []
|
||||||
if (typeof(data.itemList) === 'string') {
|
if (typeof(data.itemList) === 'string') {
|
||||||
arr = JSON.parse(data.itemList)
|
arr = JSON.parse(data.itemList)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -114,14 +114,6 @@
|
|||||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
|
||||||
v-if="!form.itemsNum1"
|
|
||||||
prop="technicalRequir"
|
|
||||||
width="200"
|
|
||||||
label="核心技术要求"
|
|
||||||
show-overflow-tooltip
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
@@ -161,10 +153,10 @@
|
|||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
v-if="!form.itemsNum1"
|
||||||
prop="changePoint"
|
prop="technicalRequir"
|
||||||
width="150"
|
width="200"
|
||||||
label="相对于国行标差异点"
|
label="核心技术要求"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -177,6 +169,14 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||||
|
prop="changePoint"
|
||||||
|
width="150"
|
||||||
|
label="相对于国行标差异点"
|
||||||
|
show-overflow-tooltip
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="complianceRequir"
|
prop="complianceRequir"
|
||||||
width="150"
|
width="150"
|
||||||
|
|||||||
@@ -109,14 +109,6 @@
|
|||||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
|
||||||
v-if="!form.itemsNum1"
|
|
||||||
prop="technicalRequir"
|
|
||||||
width="200"
|
|
||||||
label="核心技术要求"
|
|
||||||
show-overflow-tooltip
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
@@ -155,6 +147,14 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
v-if="!form.itemsNum1"
|
||||||
|
prop="technicalRequir"
|
||||||
|
width="200"
|
||||||
|
label="核心技术要求"
|
||||||
|
show-overflow-tooltip
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
|
|||||||
@@ -109,14 +109,6 @@
|
|||||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
|
||||||
v-if="!form.itemsNum1"
|
|
||||||
prop="technicalRequir"
|
|
||||||
width="200"
|
|
||||||
label="核心技术要求"
|
|
||||||
show-overflow-tooltip
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
@@ -155,6 +147,14 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
v-if="!form.itemsNum1"
|
||||||
|
prop="technicalRequir"
|
||||||
|
width="200"
|
||||||
|
label="核心技术要求"
|
||||||
|
show-overflow-tooltip
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
|
|||||||
@@ -109,14 +109,6 @@
|
|||||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
|
||||||
v-if="!form.itemsNum1"
|
|
||||||
prop="technicalRequir"
|
|
||||||
width="200"
|
|
||||||
label="核心技术要求"
|
|
||||||
show-overflow-tooltip
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
@@ -155,6 +147,14 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
v-if="!form.itemsNum1"
|
||||||
|
prop="technicalRequir"
|
||||||
|
width="200"
|
||||||
|
label="核心技术要求"
|
||||||
|
show-overflow-tooltip
|
||||||
|
align="center">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
|
|||||||
Reference in New Issue
Block a user