This commit is contained in:
zhutianqi
2022-01-18 11:44:03 +08:00
parent efdad74867
commit 93e462bfef
13 changed files with 145 additions and 131 deletions
@@ -132,21 +132,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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="newData" prop="newData"
width="180" width="180"
@@ -177,6 +162,21 @@
prop="zrUserName" prop="zrUserName"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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
label="操作" label="操作"
width="240" width="240"
@@ -164,22 +164,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
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column <el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1" v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint" prop="changePoint"
@@ -219,6 +203,22 @@
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
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column <el-table-column
label="责任人" label="责任人"
width="170" width="170"
@@ -139,21 +139,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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="newData" prop="newData"
width="180" width="180"
@@ -178,6 +163,21 @@
{{ scope.row.applyArctic.toString() }} {{ scope.row.applyArctic.toString() }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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
label="责任人" label="责任人"
width="170" width="170"
@@ -114,21 +114,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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="newData" prop="newData"
width="180" width="180"
@@ -153,6 +138,21 @@
{{ JSON.parse(scope.row.applyArctic).join(',') }} {{ JSON.parse(scope.row.applyArctic).join(',') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</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
label="执行人" label="执行人"
width="170" width="170"
@@ -113,14 +113,6 @@
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="newData" prop="newData"
width="180" width="180"
@@ -159,6 +151,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
:disabled="acceptShow" :disabled="acceptShow"
prop="changePoint" prop="changePoint"
@@ -108,22 +108,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="180" width="180"
@@ -162,6 +146,22 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="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"
@@ -108,22 +108,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="180" width="180"
@@ -162,6 +146,22 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="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"
@@ -108,22 +108,6 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="180" width="180"
@@ -162,6 +146,22 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="changePoint"
width="150"
v-show="form.itemsNum1"
label="基于上一版本差异"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="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"
@@ -449,13 +449,13 @@
}, },
saveUserInfo2 () { saveUserInfo2 () {
for( let a = 0; a < this.data.length; a++) { for( let a = 0; a < this.data.length; a++) {
if (a === this.itemId) { if (this.data[a].id === this.itemId) {
this.data[a].chapterNumber = this.editForm.chapterNumber // this.data[a].chapterNumber = this.editForm.chapterNumber
this.data[a].chapterName = this.editForm.chapterName // this.data[a].chapterName = this.editForm.chapterName
this.data[a].oldText = this.editForm.oldText // this.data[a].oldText = this.editForm.oldText
this.data[a].newText = this.editForm.newText // this.data[a].newText = this.editForm.newText
this.data[a].reason = this.editForm.reason // this.data[a].reason = this.editForm.reason
this.data[a].cause = this.editForm.cause // this.data[a].cause = this.editForm.cause
this.$set(this.data, a, this.editForm); this.$set(this.data, a, this.editForm);
} }
} }
@@ -465,7 +465,7 @@
this.modalshowflag2 = false this.modalshowflag2 = false
}, },
itemEdit (row, index) { itemEdit (row, index) {
this.itemId = index this.itemId = row.id
this.modalshowflag2 = true this.modalshowflag2 = true
this.editForm = { this.editForm = {
chapterNumber: row.chapterNumber, chapterNumber: row.chapterNumber,
@@ -597,7 +597,6 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
console.log(data);
this.commentText5 = data.commentText5 || '' this.commentText5 = data.commentText5 || ''
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
@@ -105,7 +105,7 @@
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="data" :data="data2"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
@@ -299,6 +299,7 @@
name: "bzzqyjStep6", name: "bzzqyjStep6",
data() { data() {
return { return {
data2: [],
commentText6: '', commentText6: '',
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
@@ -435,6 +436,8 @@
return "上报"; return "上报";
} else if (row === "2") { } else if (row === "2") {
return "处理后上报"; return "处理后上报";
} else {
return "不上报";
} }
}, },
upload(row, title) { upload(row, title) {
@@ -526,7 +529,6 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
console.log(data);
this.commentText6 = data.commentText6 || '' this.commentText6 = data.commentText6 || ''
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
@@ -544,6 +546,7 @@
} }
}) })
this.json = data this.json = data
this.data2 = newArr
this.data = arr this.data = arr
}).catch(e => { }).catch(e => {
}); });
@@ -97,7 +97,7 @@
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="data" :data="data2"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
@@ -284,6 +284,7 @@ export default {
name: "bzzqyjStep7", name: "bzzqyjStep7",
data() { data() {
return { return {
data2: [],
commentText7: '', commentText7: '',
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
@@ -437,6 +438,8 @@ export default {
return '上报' return '上报'
} else if (row === '2') { } else if (row === '2') {
return '处理后上报' return '处理后上报'
} else {
return '不上报'
} }
}, },
handleTabs(name) { handleTabs(name) {
@@ -502,6 +505,7 @@ export default {
} }
}) })
this.json = data this.json = data
this.data2 = newArr
this.data = arr this.data = arr
}).catch(e => { }).catch(e => {
}) })
@@ -97,7 +97,7 @@
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="data" :data="data2"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
name: "bzzqyjStep8", name: "bzzqyjStep8",
data() { data() {
return { return {
data2: [],
commentText8: '', commentText8: '',
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
return '上报' return '上报'
} else if (row === '2') { } else if (row === '2') {
return '处理后上报' return '处理后上报'
} else {
return '不上报'
} }
}, },
handleTabs(name) { handleTabs(name) {
@@ -505,6 +508,7 @@ export default {
} }
}) })
this.json = data this.json = data
this.data2 = newArr
this.data = arr this.data = arr
}).catch(e => { }).catch(e => {
}) })
@@ -97,7 +97,7 @@
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="data" :data="data2"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
name: "bzzqyjStep9", name: "bzzqyjStep9",
data() { data() {
return { return {
data2: [],
commentText9: '', commentText9: '',
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
return "上报"; return "上报";
} else if (row === "2") { } else if (row === "2") {
return "处理后上报"; return "处理后上报";
} else {
return "不上报";
} }
}, },
handleTabs(name) { handleTabs(name) {
@@ -506,6 +509,7 @@ export default {
}) })
this.json = data this.json = data
this.data = arr this.data = arr
this.data2 = newArr
}).catch(e => { }).catch(e => {
}); });
}); });