FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-22 08:32:14 +08:00
parent 00f1078f1a 2ed370e48c
commit 566219dddd
12 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+3
View File
@@ -423,6 +423,7 @@
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
@@ -430,6 +431,7 @@
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="500"
@@ -437,6 +439,7 @@
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="500"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+3
View File
@@ -431,6 +431,7 @@
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
@@ -438,6 +439,7 @@
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="500"
@@ -445,6 +447,7 @@
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="500"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+6
View File
@@ -302,6 +302,7 @@
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 style="width: 100%;"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 style="width: 100%;">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
@@ -309,6 +310,7 @@
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="500"
@@ -316,6 +318,7 @@
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="500"
@@ -386,6 +389,7 @@
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150> <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="editForm.technicalRequir" v-model="editForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
@@ -393,6 +397,7 @@
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="editForm.changePoint" v-model="editForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="500"
@@ -400,6 +405,7 @@
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input <el-input
type="textarea"
v-model="editForm.changePoint" v-model="editForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="500"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -2
View File
@@ -659,7 +659,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="体系类别" class="add-form-item form-item-disabled"> <!--<el-form-item v-show="form.standInData === '0'" label="体系类别" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
@@ -669,7 +669,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!--适用产品线--> <!--适用产品线-->
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+2 -2
View File
@@ -466,7 +466,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <!--<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
@@ -476,7 +476,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+2 -2
View File
@@ -377,7 +377,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <!--<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
@@ -387,7 +387,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -2
View File
@@ -866,7 +866,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <!--<el-form-item v-if="form.standInData === '0'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
@@ -876,7 +876,7 @@
:label="item.label" :label="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!--适用产品线--> <!--适用产品线-->
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+17 -4
View File
@@ -432,7 +432,6 @@
} }
} }
}, },
saveUserInfo2 () { saveUserInfo2 () {
if (this.addType === 'add') { if (this.addType === 'add') {
this.data.push(this.editForm) this.data.push(this.editForm)
@@ -446,8 +445,23 @@
this.data[a].reason = this.editForm.reason this.data[a].reason = this.editForm.reason
} }
} }
this.modalshowflag2 = false if (this.addType === 'add') {
console.log(this.editForm); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
this.itemId = id
this.editForm = {
chapterNumber: '',
chapterName: '',
oldText: '',
newText: '',
reason: '',
id: id,
department: this.$store.getters.userInfo.institutionName,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
} else if (this.addType === 'edit') {
this.modalshowflag2 = false
}
}, },
addModal() { addModal() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
@@ -480,7 +494,6 @@
reason: row.reason, reason: row.reason,
} }
}, },
cancleUserInfo2 () { cancleUserInfo2 () {
this.modalshowflag2 = false this.modalshowflag2 = false
}, },
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+17 -1
View File
@@ -486,7 +486,23 @@ export default {
this.data[a].reason = this.editForm.reason this.data[a].reason = this.editForm.reason
} }
} }
this.modalshowflag2 = false if (this.addType === 'add') {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
this.itemId = id
this.editForm = {
chapterNumber: '',
chapterName: '',
oldText: '',
newText: '',
reason: '',
id: id,
department: this.$store.getters.userInfo.institutionName,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
} else if (this.addType === 'edit') {
this.modalshowflag2 = false
}
}, },
addModal() { addModal() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
-6
View File
@@ -450,12 +450,6 @@
saveUserInfo2 () { saveUserInfo2 () {
for( let a = 0; a < this.data.length; a++) { for( let a = 0; a < this.data.length; a++) {
if (this.data[a].id === this.itemId) { if (this.data[a].id === this.itemId) {
// this.data[a].chapterNumber = this.editForm.chapterNumber
// this.data[a].chapterName = this.editForm.chapterName
// this.data[a].oldText = this.editForm.oldText
// this.data[a].newText = this.editForm.newText
// this.data[a].reason = this.editForm.reason
// this.data[a].cause = this.editForm.cause
this.$set(this.data, a, this.editForm); this.$set(this.data, a, this.editForm);
} }
} }
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+10
View File
@@ -291,6 +291,16 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '发起企标制修订流程'){
this.$router.push({
name: 'bussLibrary1',
query: {
type: 'buss1',
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '企标编写汇总修订'){ }else if (mes.taskInfo === '企标编写汇总修订'){
this.$router.push({ this.$router.push({
name: 'bussLibrary3', name: 'bussLibrary3',
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+11 -2
View File
@@ -210,7 +210,7 @@
<el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item"> <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
<el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input> <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item"> <el-form-item label="修改前" label-width="" class="add-form-item">
<div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div> <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
</el-form-item> </el-form-item>
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item"> <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
@@ -465,9 +465,18 @@ export default {
if (res.respCode === '200') { if (res.respCode === '200') {
this.form.page = 1 this.form.page = 1
this.getList() this.getList()
if (this.type === 'edit') {
this.isDialog = false
} else {
this.id = ''
this.opinionContent.partCode = ''
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.cause = ''
}
} }
}) })
this.isDialog = false
} }
}) })
}, },