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-14 14:03:05 +08:00
parent 2f588ca217 095f434199
commit 53eeefa23d
27 changed files with 1322 additions and 1085 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+10 -10
View File
@@ -514,7 +514,7 @@ export default {
}
break;
case '3':
if (row.taskInfo === '责任部门对接人选择责任人') {
if (row.taskInfo === '任务分发') {
this.$router.push({
name: 'bzzqyjStep2',
query: {
@@ -525,7 +525,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人反馈'){
} else if (row.taskInfo === '意见反馈'){
this.$router.push({
name: 'bzzqyjStep3',
query: {
@@ -536,7 +536,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
} else if (row.taskInfo === '意见汇总报批') {
this.$router.push({
name: 'bzzqyjStep4',
query: {
@@ -547,7 +547,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '审批人审批') {
} else if (row.taskInfo === '意见审批（经理、研发副总裁）') {
this.$router.push({
name: 'bzzqyjStep4-1',
query: {
@@ -558,7 +558,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '标准法规工程师分线审核') {
} else if (row.taskInfo === '管理员（起草节点一个人）') {
this.$router.push({
name: 'bzzqyjStep4-2',
query: {
@@ -569,7 +569,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '标准法规工程师汇总') {
} else if (row.taskInfo === '意见处理') {
this.$router.push({
name: 'bzzqyjStep5',
query: {
@@ -580,7 +580,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人会签') {
} else if (row.taskInfo === '会签（选择会签人部长）') {
this.$router.push({
name: 'bzzqyjStep6',
query: {
@@ -591,7 +591,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '部长+对接人审核') {
} else if (row.taskInfo === '审核（李部、会签人部长）') {
this.$router.push({
name: 'bzzqyjStep7',
query: {
@@ -602,7 +602,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) {
} else if (row.taskInfo === '审定（阚主任、技术委员会相关专委会主任/研究总院职能部门领导）' ) {
this.$router.push({
name: 'bzzqyjStep8',
query: {
@@ -613,7 +613,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '工程研究总院院长批准') {
} else if (row.taskInfo === '批准（工程研究总院院长批准、标准法规主管副院长）') {
this.$router.push({
name: 'bzzqyjStep9',
query: {
src/pages/processCenter/pages/components/ProcessFooter.vue
-1
View File
@@ -59,7 +59,6 @@
v-if="showOver"
>撤销申请</el-button>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-s-promotion"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -1
View File
@@ -1715,8 +1715,9 @@ export default {
filterText(val) {
this.$refs.tree.filter(val);
},
'form.standInData' : {
'form' : {
handler: function () {
console.log(this.form.standInData)
if(this.form.standInData === '1') {
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -8
View File
@@ -44,7 +44,7 @@
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
<el-option
v-for="item in standSortOptions"
@@ -127,7 +127,7 @@
</el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData=='0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
@@ -2661,7 +2661,7 @@ export default {
}
}
},
'form.standInData' : {
'form' : {
handler: function () {
if(this.form.standInData === '1') {
this.rules.standYear[0].required = false;
@@ -2672,11 +2672,6 @@ export default {
}
}
},
form(val){
if(this.form){
}
}
}
}
</script>
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
+632 -488
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+3
View File
@@ -655,6 +655,7 @@
}
}]
},
taskInfo:'总院标准法规部产品标准工程师发布',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
@@ -2389,6 +2390,7 @@
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
this.form.topId = this.pId
@@ -2404,6 +2406,7 @@
// this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面
this.isSubmit = false
this.saveLoading = false
this.processCreateBuss(json)
// if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功")
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+2 -2
View File
@@ -699,7 +699,7 @@
}
}]
},
taskInfo:'',
taskInfo:'企标编写汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2494,7 +2494,7 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
this.taskInfo = '企标编写汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+1 -1
View File
@@ -732,7 +732,7 @@
}
}]
},
taskInfo: '',
taskInfo: '会签征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+2 -2
View File
@@ -769,7 +769,7 @@
}
}]
},
taskInfo:'',
taskInfo:'意见汇总及标准修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2584,7 +2584,7 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
this.taskInfo = '意见汇总及标准修改'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+3 -4
View File
@@ -636,7 +636,7 @@
let Base64 = require('js-base64').Base64;
export default {
name: "bussLibraryProductC3",
name: "bussLibraryProduct3",
components: {
ProcessHeader,
ProcessFooter,
@@ -699,7 +699,7 @@
}
}]
},
taskInfo:'',
taskInfo:'重新企标编写汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -719,7 +719,6 @@
XGDFileList: [],
caFileList: [],
FBGBJBDFileList: [],
xgdFileList: [],
ZCWBLAWSFileList: [],
GCWBLAWSFileList: [],
JDWJLAWSFileList: [],
@@ -2495,7 +2494,7 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
this.taskInfo = '重新企标编写汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+5 -4
View File
@@ -706,7 +706,7 @@
let Base64 = require('js-base64').Base64;
export default {
name: "bussLibraryProductC6",
name: "bussLibraryProduct6",
components: {
ProcessHeader,
ProcessFooter,
@@ -769,7 +769,7 @@
}
}]
},
taskInfo:'',
taskInfo:'重新意见汇总及标准修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -1095,7 +1095,8 @@
userType:'', // 选择用户ID判断
opinionsAdoptedOptions:[
{value: '1',label: '采纳'},
{value: '2',label: '不采纳'},
{value: '2',label: '部分采纳'},
{value: '3',label: '不采纳'},
],
countryOptions:[],//国家地区
standSortOptions: [], // 标准类别
@@ -2583,7 +2584,7 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
this.taskInfo = '重新意见汇总及标准修改'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
+1 -1
View File
@@ -562,7 +562,7 @@
</template>
<script>
import formList from './common/formList.vue'
import formList from './common/formListIn.vue'
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+621 -511
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+8 -10
View File
@@ -228,8 +228,11 @@
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
show-save
show-submit
:saveLoading="saveLoading"
:submitLoading="isSubmit"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -2215,19 +2218,14 @@
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程')
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
// prcForm: this.prcForm,
// sarAccessInfoList: this.sarAccessInfoList,
// sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
// bzqdForm: this.bzqdForm,
// listInfo: this.listInfo,
// id: this.id
taskInfo: '申请人发起',
prcNum:this.prcNum,
taskInfo: '主起草人培训',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+8 -10
View File
@@ -229,8 +229,11 @@
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
show-save
show-submit
:saveLoading="saveLoading"
:submitLoading="isSubmit"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -2198,19 +2201,14 @@
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程')
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
// prcForm: this.prcForm,
// sarAccessInfoList: this.sarAccessInfoList,
// sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
// bzqdForm: this.bzqdForm,
// listInfo: this.listInfo,
// id: this.id
taskInfo: '申请人发起',
prcNum:this.prcNum,
taskInfo: '标准法规部标准化工程师发布',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+1 -1
View File
@@ -2226,7 +2226,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -3
View File
@@ -701,7 +701,7 @@
}
}]
},
taskInfo:'',
taskInfo:'企标编写汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2400,7 +2400,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
@@ -2519,7 +2519,6 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+1 -2
View File
@@ -906,7 +906,7 @@
}
}]
},
taskInfo: '',
taskInfo: '会签征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
@@ -2750,7 +2750,6 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '会签征求意见'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+1 -2
View File
@@ -933,7 +933,7 @@
}
}]
},
taskInfo:'',
taskInfo:'技术委员会评审/评审意见修改评审',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2897,7 +2897,6 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+1 -1
View File
@@ -769,7 +769,7 @@
},
loading: false,
disabledState: true,
taskInfo:'标准法规工程师复审',
taskInfo:'标准法规部标准化工程师复审',
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+1 -1
View File
@@ -589,7 +589,7 @@
},
loading: false,
drawerModal: false,
taskInfo:'技术委员会负责人/起草中心主任审核',
taskInfo:'起草单位高级经理审核',
assigneeNewLoading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+1 -1
View File
@@ -768,7 +768,7 @@
},
loading: false,
drawerModal: false,
taskInfo:'标准法规部部长审核',
taskInfo:'标准法规部高级经理审核',
assigneeNewLoading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+1 -2
View File
@@ -701,7 +701,7 @@
}
}]
},
taskInfo:'',
taskInfo:'重新企标编写汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2519,7 +2519,6 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+1 -2
View File
@@ -933,7 +933,7 @@
}
}]
},
taskInfo:'',
taskInfo:'重新技术委员会评审/评审意见修改评审',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -2897,7 +2897,6 @@
pId: this.pId
}).then(res => {
if (res) {
this.taskInfo = '企标汇总修订'
const processForm = JSON.parse(res.mesg)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
src/pages/processCenter/pages/processDetail/index.vue
+3
View File
@@ -233,6 +233,9 @@ export default {
}else if(prcType === 'buss1'){
//企标入库
this.toProcessDetail('bussLibraryDetail',row)
}else if(prcType === 'buss2'){
//企标入库
this.toProcessDetail('bussLibraryProductDetail',row)
}else if(prcType === '4'){
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+7 -16
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="责任部门" class="search-item" prop="responseUnit">
<el-input
v-model="standardForm.responseUnit"
v-model="standardForm.zrbm"
placeholder="请输入责任部门"
>
</el-input>
@@ -284,20 +284,11 @@
</el-select>
</el-form-item>
<el-form-item label="责任部门">
<el-select
class="showBox"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
<el-input
v-model="standardForm.zrbm"
placeholder="请输入责任部门"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-input>
</el-form-item>
<el-form-item label="适用产品线">
<el-select
@@ -668,11 +659,11 @@ export default {
},
pageChange(page) {
this.standardForm.page = page;
// this.selectInfobyAccid();
this.selectInfobyAccid();
},
pageSizeChange(pageSize) {
this.standardForm.Size = this.$store.getters.userInfo.configContent;
// this.selectInfobyAccid();
this.selectInfobyAccid();
},
// 请求部门结构树
getOrgTreeSource() {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -3305,7 +3305,7 @@ export default {
if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
}
nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
_this: this,
loading: 'isSubmit'