-
+
@@ -241,7 +275,7 @@
title="条款内容"
:visible.sync="detailTextDialog"
width="50%">
-
+
@@ -261,13 +295,25 @@ export default {
selectedList: [],
exportName: '',
exportModelFlag: false,
- warningTableDatas:[],
+ warningTableDatas: [],
warningTableHeight: '',
applyArcticOptions: [], // 适用车型下拉框
isShowBtn: true,
activeName: "STANDARD", //tab 默认选中值
// 头部搜索框
dynamic: {
+ // 发布日期
+ startIssueTime: '',
+ endIssueTime: '',
+ // 实施日期
+ startSSRQ: '',
+ endSSRQ: '',
+ //新车型实施日期
+ startXCXSSRQ: '',
+ endXCXSSRQ: '',
+ // 在产车实施日期
+ startZCCSSRQ: '',
+ endZCCSSRQ: '',
//标准编号
standCode: "",
//标准名称
@@ -306,7 +352,75 @@ export default {
},
warningTableLoading: false,
// 记录当前分页器是哪个预警信息触发
- field: ''
+ field: '',
+
+ // 发布日期当前日期之前不可选择
+ pickerBeginDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.endIssueTime;
+ if (beginDateVal) {
+ return time.getTime() > beginDateVal;
+ }
+ }
+ },
+ pickerBeginDateAfter: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.startIssueTime;
+ if (beginDateVal) {
+ return time.getTime() < beginDateVal;
+ }
+ }
+ },
+
+ SSRQDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.endSSRQ;
+ if (beginDateVal) {
+ return time.getTime() > beginDateVal;
+ }
+ }
+ },
+ SSRQDateAfter: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.startSSRQ;
+ if (beginDateVal) {
+ return time.getTime() < beginDateVal;
+ }
+ }
+ },
+
+ XCXSSRQDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.endXCXSSRQ;
+ if (beginDateVal) {
+ return time.getTime() > beginDateVal;
+ }
+ }
+ },
+ XCXSSRQDateAfter: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.startXCXSSRQ;
+ if (beginDateVal) {
+ return time.getTime() < beginDateVal;
+ }
+ }
+ },
+ ZCCSSRQDateBefore: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.endZCCSSRQ;
+ if (beginDateVal) {
+ return time.getTime() > beginDateVal;
+ }
+ }
+ },
+ ZCCSSRQDateAfter: {
+ disabledDate: (time) => {
+ let beginDateVal = this.dynamic.startZCCSSRQ;
+ if (beginDateVal) {
+ return time.getTime() < beginDateVal;
+ }
+ }
+ },
};
},
methods: {
@@ -316,20 +430,20 @@ export default {
},
//确认导出
exportExcel() {
- console.log('293',this.selectedList)
+ console.log('293', this.selectedList)
const exportURL = interfaceUrl + 'sys/EarlyWarning/exportWarning?' +
- '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+ '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
this.exportModelFlag = false
},
- exportExcelBtn(){
- console.log('302',this.selectedList)
+ exportExcelBtn() {
+ console.log('302', this.selectedList)
this.exportName = ''
this.exportModelFlag = true
},
- selectChange(alldata){
- console.log('307',alldata)
+ selectChange(alldata) {
+ console.log('307', alldata)
this.selectedList = []
for (let i = 0; i < alldata.length; i++) {
this.selectedList.push(alldata[i]['id'])
@@ -499,17 +613,17 @@ export default {
//标准名称
standName: this.dynamic.standName,
//发布日期
- startIssueTime: this.dynamic.putTime[0],
- endIssueTime: this.dynamic.putTime[1],
+ startIssueTime: this.dynamic.startIssueTime ? this.$moment(this.dynamic.startIssueTime).format('YYYY-MM-DD') : '',
+ endIssueTime: this.dynamic.endIssueTime ? this.$moment(this.dynamic.endIssueTime).format('YYYY-MM-DD') : '',
//实施日期
- startSSRQ: this.dynamic.SSRQ[0],
- endSSRQ: this.dynamic.SSRQ[1],
+ startSSRQ: this.dynamic.startSSRQ ? this.$moment(this.dynamic.startSSRQ).format('YYYY-MM-DD') : '',
+ endSSRQ: this.dynamic.endSSRQ ? this.$moment(this.dynamic.endSSRQ).format('YYYY-MM-DD') : '',
//新车型实施日期
- startXCXSSRQ: this.dynamic.XCXSSRQ[0],
- endXCXSSRQ: this.dynamic.XCXSSRQ[1],
+ startXCXSSRQ: this.dynamic.startXCXSSRQ ? this.$moment(this.dynamic.startXCXSSRQ).format('YYYY-MM-DD') : '',
+ endXCXSSRQ: this.dynamic.endXCXSSRQ ? this.$moment(this.dynamic.endXCXSSRQ).format('YYYY-MM-DD') : '',
//在产车实施日期
- startZCCSSRQ: this.dynamic.ZCCSSRQ[0],
- endZCCSSRQ: this.dynamic.ZCCSSRQ[1],
+ startZCCSSRQ: this.dynamic.startZCCSSRQ ? this.$moment(this.dynamic.startZCCSSRQ).format('YYYY-MM-DD') : '',
+ endZCCSSRQ: this.dynamic.endZCCSSRQ ? this.$moment(this.dynamic.endZCCSSRQ).format('YYYY-MM-DD') : '',
//适用车型
applyType: this.dynamic.applyType
}, {
@@ -534,7 +648,7 @@ export default {
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
this.warningTableLoading = true
this.handlePageChange('page', 1)
- }else {
+ } else {
this.warningTableLoading = false
}
this.pageConfig.pageSize = res.data.size
@@ -573,16 +687,16 @@ export default {
roundButton: false
}).then(() => {
this.$http.get('sys/EarlyWarning/ChangePermissions', {
- id: row.id,
- }, {}, res => {
- if (res.ok === true) {
- this.pageConfig.page = 1
- this.pageConfig.newPolicyPage = 1
- this.pageConfig.oldPolicyPage = 1
- this.searchBtnClick()
- this.getEarlyDate()
- }
+ id: row.id,
+ }, {}, res => {
+ if (res.ok === true) {
+ this.pageConfig.page = 1
+ this.pageConfig.newPolicyPage = 1
+ this.pageConfig.oldPolicyPage = 1
+ this.searchBtnClick()
+ this.getEarlyDate()
}
+ }
)
}).catch(() => {
this.$message.warning('取消事件')
@@ -660,7 +774,7 @@ export default {
handlePageChange(field, page) {
this.pageConfig.page = page
this.searchBtnClick()
- console.log('735',this.warningTableDatas)
+ console.log('735', this.warningTableDatas)
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
},
@@ -670,7 +784,7 @@ export default {
// this.pageConfig[_pageSize] = pageSize
this.pageConfig.pageSize = pageSize
this.searchBtnClick()
- console.log('771',this.warningTableDatas)
+ console.log('771', this.warningTableDatas)
// this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
// this.field = field
},
@@ -679,7 +793,7 @@ export default {
openDialog(text) {
this.detailText = text
this.detailTextDialog = true
- }
+ },
},
props: {
reload: {
@@ -870,6 +984,7 @@ export default {
.container {
height: calc(100% - 139px);
+
/deep/ .el-tabs__header {
height: 50px;
}
@@ -909,13 +1024,14 @@ export default {
align-items: center;
justify-content: center;
+
/deep/ .el-input__inner {
width: 185px;
}
.choose-time-area {
/deep/ .el-input__inner {
- width: 210px;
+ width: 180px;
}
}
@@ -1075,11 +1191,16 @@ export default {
margin: 24px 0;
}
}
+
.textDialog {
/deep/ .el-dialog__body {
height: 400px;
overflow-y: auto;
}
}
+
+ /deep/ .el-date-editor.el-input {
+ width: 180px;
+ }
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 235b1ed63..96b83d483 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -407,7 +407,6 @@ export default {
mounted() {
this.getData();
this.processTable();
- this.getProductData();
/**
* 获取项目群筛选项的值
*/
@@ -457,6 +456,7 @@ export default {
delete item.termsConditions
})
})
+ this.getProductData();
});
},
choiceZRRS(row, type, index) {
@@ -481,7 +481,7 @@ export default {
_this: this
}, res => {
this.productData = res.data.records;
- this.totalNo = res.data.count;
+ this.totalNo = res.data.total;
});
},
//查询项目按钮
@@ -533,6 +533,7 @@ export default {
this.projectModel = false;
},
okProject() {
+ console.log(this.selectProjectList);
if (this.selectProjectList.length) {
let addFlag = true;
let projectNumbers = "";
@@ -548,8 +549,10 @@ export default {
});
}
if (addFlag) {
- let projectNames = "", projectNumbers = "";
+ let projectNames = "", projectNumbers = "", projectIds = "";
this.selectProjectList.forEach(items => {
+ projectIds += items.id;
+ projectIds += ',';
projectNames += items.projectName;
projectNames += ",";
projectNumbers += items.projectNumber;
@@ -558,6 +561,7 @@ export default {
this.dataList.push({
projectName: projectNames,
projectNumber: projectNumbers,
+ projectIds: projectIds,
managementHostName: this.selectProjectList[0].managementHostName,
developmentHostName: this.selectProjectList[0].developmentHostName,
categoryName: this.selectProjectList[0].categoryName,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
index ddc9b44ac..0a78312ec 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
@@ -17,11 +17,6 @@
>
-
-
+
+
-->
-
-
-
-
-
+
+
@@ -80,12 +80,19 @@
-
+
+
+
-
-
-
+
-
+
+
+
@@ -44,6 +49,10 @@
+
+
@@ -63,9 +72,11 @@
-
-
+
-
-
-
-
+
+
+
+
+
+
@@ -231,49 +252,12 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -94,10 +98,6 @@
>
-
-
-
-
@@ -258,18 +258,30 @@
clearable
>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -285,28 +297,16 @@
:disabled="true"
>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -513,7 +513,12 @@
},
data () {
return {
- opinionsStand:[
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
+ opinionsStand:[
{value: '1',label: '制定'},
{value: '2',label: '修订'},
{value: '3',label: '修改'},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index b2df99568..8818845d9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -49,6 +49,12 @@
value-format="yyyy-MM-dd"
>
+
+
@@ -60,11 +66,12 @@
-
-
-
-
-
+
+
@@ -102,6 +109,13 @@
+
+
+
+
+
+
@@ -331,20 +355,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{'手动查找'}}
+
{
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+ _this: this
+ }, res => {
+ const obj = res.data
+ let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
+ this.form.standSn = standSn
+ this.form.standNumber = standSn
+ this.form.standYear = year // 待带入立项标准
+ this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
+ }, e => {
+ })
+ }
+
+ },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
@@ -2287,12 +2408,14 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if (this.selectedListRep.length + textArr.length > 1) {
return this.$message({
- message: '标准最多选择20项',
+ message: '标准最多选择1项',
type: 'warning'
})
}
+ let textArr2 = []
+ this.form.selListRep2 = []
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
@@ -2300,14 +2423,27 @@
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
- // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
+ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -2690,6 +2826,10 @@
// test
this.isSubmit = false
this.saveLoading = false
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
// this.changeTree(this.form.modelData)
this.$refs['form'].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index baebe0ccb..b373b8bc4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -612,6 +612,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -788,6 +793,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
index 9e1fcacce..5bcc7d41b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
@@ -613,6 +613,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -789,6 +794,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
index c58efb1db..4bf55cfe3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
@@ -612,6 +612,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -788,6 +793,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index c9d3d826c..954d113d8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -628,6 +628,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -747,6 +752,7 @@
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -808,6 +814,8 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
standStatus:'', // 标准状态
planId:'',
planStatus:'',
@@ -985,7 +993,7 @@
{ required: true, message: '请选择标准状态', trigger: 'change' }
],
issueTime: [
- { required: false, message: '请选择企标发布日期', trigger: 'change'}
+ { required: true, message: '请选择企标发布日期', trigger: 'change'}
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1072,11 +1080,17 @@
}
}
},
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("")
+ }
+ }
+ },
'form.standStatus': {
handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
- console.log(val)
- this.getStandInfoByReviseStatus()
+ this.getStandInfoByReviseStatus("1")
}
}
},
@@ -1851,48 +1865,35 @@
})
}
let textArr2 = []
- if(this.selectedListRep.length === 1){
- this.selectedListRep.map((item) => {
- let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
- }
- // 标准状态 修改 更新当前标准
- if(this.form.standStatus === '3'){
- this.form.standSort = item.standSort
- this.form.standNumber = item.standNumber
- this.form.standYear = item.standYear
- this.form.standCode = texts
- this.form.id = item.id
- }
- textArr2.push(item.standNumber)
- textArr.push(texts)
- textArr = [...new Set(textArr)]
- textArr2 = [...new Set(textArr2)]
- this.replaceLawsNumModel = false
- })
- }else {
- this.selectedListRep.map((item) => {
- let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
- }
- textArr2.push(item.standNumber)
- textArr.push(texts)
- textArr = [...new Set(textArr)]
- textArr2 = [...new Set(textArr2)]
- this.replaceLawsNumModel = false
- })
- }
+ this.form.selListRep2 = []
+ this.selectedListRep.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
+ textArr.push(texts)
+ textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
+ this.replaceLawsNumModel = false
+ })
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
- this.form.standNum = this.form.standNum ? this.form.standNum + ',' + textArr2.join(',') : textArr2.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -1904,6 +1905,7 @@
}
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
+ this.formKey++
},
// 点击查看
handlePreview (item) {
@@ -2484,6 +2486,13 @@
this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id
+ this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+ this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+ this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+ this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+ this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+ this.XGDFileList=this.assemble(item.XGD,item.XGDName);
+ this.getStandInfoByReviseStatus()
this.formKey++
})
},
@@ -2513,12 +2522,6 @@
this.commentCycleDate = dateArr
}
this.getFormFieldList(processForm)
- this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
- this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
- this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
- this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
- this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
- this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
this.formKey++
}
}).catch(e => {
@@ -2546,10 +2549,11 @@
}
return data
},
- getStandInfoByReviseStatus() {
+ getStandInfoByReviseStatus(type) {
let date = new Date();
let year = date.getFullYear();
if(this.form.standStatus === '2'){
+ this.form.id = ""
this.FBGBUSSFileList = []
this.LSBBBUSSFileList = []
this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
@@ -2585,13 +2589,35 @@
this.FBGBUSSFileList= []
this.FBGBUSS = ""
this.FBGBUSSName = ""
- this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
- }else {
- this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_'+this.form.reviseStatus}, {
+ if(this.form.selListRep2.length === 1){
+ this.form.selListRep2.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ this.formKey++
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
_this: this
}, res => {
const obj = res.data
@@ -2608,6 +2634,10 @@
this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
this.formKey++
}, e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index 34a58da75..6e562d173 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -611,6 +611,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -789,6 +794,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index c8f39b0ca..d44fdd8d2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -672,6 +672,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -790,6 +795,7 @@
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -852,6 +858,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1054,6 +1068,20 @@
}
},
watch:{
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("")
+ }
+ }
+ },
+ 'form.standStatus': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("1")
+ }
+ }
+ },
'form.issueTime': {
handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1099,6 +1127,72 @@
},
},
methods: {
+ regDate(data){
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+ data = data + ' X'
+ }
+ return data
+ },
+ getStandInfoByReviseStatus(type) {
+ let date = new Date();
+ let year = date.getFullYear();
+ if(this.form.standStatus === '2'){
+ this.form.id = ""
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
+ this.form.standSn = this.form.standNum
+ this.form.standNumber = this.form.standNum
+ this.form.standYear = this.regDate(year)
+ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ }
+ }else if(this.form.standStatus === '3' ){
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.selListRep2.length === 1){
+ this.form.selListRep2.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+ _this: this
+ }, res => {
+ const obj = res.data
+ let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
+ this.form.standSn = standSn
+ this.form.standNumber = standSn
+ this.form.standYear = year // 待带入立项标准
+ this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
+ }, e => {
+ })
+ }
+ },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
@@ -1838,12 +1932,14 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if (this.selectedListRep.length + textArr.length > 1) {
return this.$message({
- message: '标准最多选择20项',
+ message: '标准最多选择1项',
type: 'warning'
})
}
+ let textArr2 = []
+ this.form.selListRep2 = []
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
@@ -1851,14 +1947,27 @@
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
index ee3aed98e..f5ba8628a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
@@ -611,6 +611,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -788,6 +793,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 830c01728..c48af796a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -705,6 +705,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -885,9 +890,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
planId:'',
planStatus:'',
reviseStatus:'',
+ standSn:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
@@ -945,7 +955,6 @@
CBCD:'',
CYBZ:'',
YYBZ:'',
- standNum:'',
}, // 标准信息
roleForm:{
hzUserId: this.$store.getters.userInfo.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 2cefdfb5f..7f156f43d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -742,6 +742,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -860,6 +865,7 @@
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -922,6 +928,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1133,6 +1147,20 @@
}
},
watch:{
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus()
+ }
+ }
+ },
+ 'form.standStatus': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus()
+ }
+ }
+ },
'form.issueTime': {
handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1178,6 +1206,72 @@
},
},
methods: {
+ regDate(data){
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+ data = data + ' X'
+ }
+ return data
+ },
+ getStandInfoByReviseStatus(type) {
+ let date = new Date();
+ let year = date.getFullYear();
+ if(this.form.standStatus === '2'){
+ this.form.id = ""
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
+ this.form.standSn = this.form.standNum
+ this.form.standNumber = this.form.standNum
+ this.form.standYear = this.regDate(year)
+ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ }
+ }else if(this.form.standStatus === '3' ){
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.selListRep2.length === 1){
+ this.form.selListRep2.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+ _this: this
+ }, res => {
+ const obj = res.data
+ let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
+ this.form.standSn = standSn
+ this.form.standNumber = standSn
+ this.form.standYear = year // 待带入立项标准
+ this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
+ }, e => {
+ })
+ }
+ },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
@@ -1929,12 +2023,14 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if (this.selectedListRep.length + textArr.length > 1) {
return this.$message({
- message: '标准最多选择20项',
+ message: '标准最多选择1项',
type: 'warning'
})
}
+ let textArr2 = []
+ this.form.selListRep2 = []
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
@@ -1942,14 +2038,27 @@
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index c1f658edd..f072c64bb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -633,6 +633,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -808,6 +813,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
index 768283d8f..63797a4a2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
@@ -613,6 +613,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -789,6 +794,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
index cd06beda4..9688f6d75 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
@@ -613,6 +613,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -789,6 +794,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 3e609621e..05d84ccc3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -636,7 +636,7 @@
let Base64 = require('js-base64').Base64;
export default {
- name: "bussLibraryProduct3",
+ name: "bussLibraryProductC3",
components: {
ProcessHeader,
ProcessFooter,
@@ -672,6 +672,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -699,7 +704,7 @@
}
}]
},
- taskInfo:'重新企标编写汇总修订',
+ taskInfo:'企标编写汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -790,6 +795,7 @@
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -852,6 +858,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1054,6 +1068,20 @@
}
},
watch:{
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("")
+ }
+ }
+ },
+ 'form.standStatus': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("1")
+ }
+ }
+ },
'form.issueTime': {
handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1099,6 +1127,72 @@
},
},
methods: {
+ regDate(data){
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+ data = data + ' X'
+ }
+ return data
+ },
+ getStandInfoByReviseStatus(type) {
+ let date = new Date();
+ let year = date.getFullYear();
+ if(this.form.standStatus === '2'){
+ this.form.id = ""
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
+ this.form.standSn = this.form.standNum
+ this.form.standNumber = this.form.standNum
+ this.form.standYear = this.regDate(year)
+ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ }
+ }else if(this.form.standStatus === '3' ){
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.selListRep2.length === 1){
+ this.form.selListRep2.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+ _this: this
+ }, res => {
+ const obj = res.data
+ let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
+ this.form.standSn = standSn
+ this.form.standNumber = standSn
+ this.form.standYear = year // 待带入立项标准
+ this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
+ }, e => {
+ })
+ }
+ },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
@@ -1838,12 +1932,14 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if (this.selectedListRep.length + textArr.length > 1) {
return this.$message({
- message: '标准最多选择20项',
+ message: '标准最多选择1项',
type: 'warning'
})
}
+ let textArr2 = []
+ this.form.selListRep2 = []
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
@@ -1851,14 +1947,27 @@
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -2494,7 +2603,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){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 0d2956be1..5c13c93c9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -706,7 +706,7 @@
let Base64 = require('js-base64').Base64;
export default {
- name: "bussLibraryProduct6",
+ name: "bussLibraryProductC6",
components: {
ProcessHeader,
ProcessFooter,
@@ -742,6 +742,11 @@
callback()
};
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -769,7 +774,7 @@
}
}]
},
- taskInfo:'重新意见汇总及标准修改',
+ taskInfo:'意见汇总及标准修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
@@ -860,6 +865,7 @@
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -922,6 +928,14 @@
countryArr:'',
commentCycleDate:'',
form: {
+ selListRep2:[],
+ id:'',
+ standNum:'',
+ standStatus:'', // 标准状态
+ planId:'',
+ planStatus:'',
+ reviseStatus:'',
+ standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1133,6 +1147,20 @@
}
},
watch:{
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus()
+ }
+ }
+ },
+ 'form.standStatus': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus()
+ }
+ }
+ },
'form.issueTime': {
handler: function() {
if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1178,6 +1206,72 @@
},
},
methods: {
+ regDate(data){
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+ data = data + ' X'
+ }
+ return data
+ },
+ getStandInfoByReviseStatus(type) {
+ let date = new Date();
+ let year = date.getFullYear();
+ if(this.form.standStatus === '2'){
+ this.form.id = ""
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
+ this.form.standSn = this.form.standNum
+ this.form.standNumber = this.form.standNum
+ this.form.standYear = this.regDate(year)
+ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ }
+ }else if(this.form.standStatus === '3' ){
+ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+ this.$message.warning("请选择一条代替企标编号")
+ return
+ }
+ if(this.form.selListRep2.length === 1){
+ this.form.selListRep2.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ // 标准状态 修改 更新当前标准
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ })
+ }
+ }else if(this.form.standStatus === '1' ){
+ this.form.id = ""
+ if(type === '1'){
+ this.isSubmit = true
+ this.saveLoading = true
+ }
+ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+ _this: this
+ }, res => {
+ const obj = res.data
+ let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
+ this.form.standSn = standSn
+ this.form.standNumber = standSn
+ this.form.standYear = year // 待带入立项标准
+ this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+ if(type === '1'){
+ this.isSubmit = false
+ this.saveLoading = false
+ }
+ }, e => {
+ })
+ }
+ },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
@@ -1929,12 +2023,14 @@
type: 'warning'
})
}
- if (this.selectedListRep.length + textArr.length > 20) {
+ if (this.selectedListRep.length + textArr.length > 1) {
return this.$message({
- message: '标准最多选择20项',
+ message: '标准最多选择1项',
type: 'warning'
})
}
+ let textArr2 = []
+ this.form.selListRep2 = []
this.selectedListRep.map((item) => {
let texts = ''
if (item.standYear != null && item.standYear !== '') {
@@ -1942,14 +2038,27 @@
} else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
+ // 标准状态 修改 更新当前标准
+ if(this.form.standStatus === '3'){
+ this.form.standSort = item.standSort
+ this.form.standName = item.standName
+ this.form.standNumber = item.standNumber
+ this.form.standYear = item.standYear
+ this.form.standCode = texts
+ this.form.id = item.id
+ }
+ this.form.selListRep2.push(item)
+ textArr2.push(item.standNumber)
textArr.push(texts)
textArr = [...new Set(textArr)]
+ textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+ this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.standNum = textArr2.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -2584,7 +2693,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){
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
new file mode 100644
index 000000000..56a377757
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -0,0 +1,509 @@
+
+
-
+
-
-
-
+
+
+
@@ -36,81 +36,113 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+ v-model="dynamic.startIssueTime"
+ type="date"
+ size="mini"
+ :picker-options="pickerBeginDateBefore"
+ format="yyyy-MM-dd"
+ placeholder="选择开始时间">
+
+
+
+
+ v-model="dynamic.startXCXSSRQ"
+ type="date"
+ size="mini"
+ :picker-options="XCXSSRQDateBefore"
+ format="yyyy-MM-dd"
+ placeholder="选择开始时间">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ v-model="dynamic.startZCCSSRQ"
+ type="date"
+ size="mini"
+ :picker-options="ZCCSSRQDateBefore"
+ format="yyyy-MM-dd"
+ placeholder="选择开始时间">
+
+
+
+
+ style="margin: 6px 8px 0 0"
+ type="primary"
+ size="mini"
+ @click="searchBtnClick"
+ class="common-button-primary">
查询
+ style="margin: 6px 0 0 0"
+ size="mini"
+ @click="clearBtnClick"
+ class="common-button-primary">
清空
@@ -121,21 +153,21 @@
导出Excel
-
+
+ type="selection"
+ width="55"
+ align="center">
@@ -173,7 +205,9 @@
align="center">
- {{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}
+ {{
+ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0, 20) + '...'
+ }}
@@ -199,23 +233,23 @@
-
- 取消预警
-
-
-
+
+ 取消预警
+
+
+
{{ item.name }}
@@ -286,6 +270,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -492,6 +513,11 @@
},
data () {
return {
+ opinionsStand:[
+ {value: '1',label: '制定'},
+ {value: '2',label: '修订'},
+ {value: '3',label: '修改'},
+ ],
opinionsAdoptedOptions:[
{value: '1',label: '采纳'},
{value: '2',label: '部分采纳'},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
index dcf660dfe..6a51a9ac2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
@@ -31,6 +31,10 @@
+ {{ item.name }}
+
+
+
+
+
+
- {{ item.name }}
-
-
-
-
-
-
-
+
+ 企标制修订立项计划流程
+ 发起流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
new file mode 100644
index 000000000..0f498ab5b
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -0,0 +1,231 @@
+
+
+
+ 基础信息
+ 人员信息
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 上传
+ 模板下载
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+ 责任人
+
+
+
+
+
+
+
+ 企标制修订立项计划流程
+ 发起流程
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 1e32ad45f..9f30935f0 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -574,6 +574,12 @@
name: 'qbzxdjhgkStep1'
})
break
+ // 企标制修订立项计划流程
+ case '26':
+ this.$router.push({
+ name: 'qbzxdlxStep1'
+ })
+ break
}
},
checkPermission(permissionIdArray) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
index 9b9d45fad..055a2f4ae 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
@@ -264,7 +264,21 @@
+
+ 基础信息
+ 人员信息
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+ {{ '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ 企标制修订立项计划
+
+