+
-
-
-
+
+
+
@@ -36,23 +36,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+ v-model="dynamic.startIssueTime"
+ type="date"
+ size="mini"
+ :picker-options="pickerBeginDateBefore"
+ format="yyyy-MM-dd"
+ placeholder="选择开始时间">
+
+
+
+
@@ -61,56 +68,77 @@
+ v-model="dynamic.startSSRQ"
+ type="date"
+ size="mini"
+ :picker-options="SSRQDateBefore"
+ 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 +149,21 @@
导出Excel
-
+
+ type="selection"
+ width="55"
+ align="center">
@@ -173,7 +201,9 @@
align="center">
- {{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}
+ {{
+ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0, 20) + '...'
+ }}
@@ -199,23 +229,23 @@
-
- 取消预警
-
-
-
+
+ 取消预警
+
+
+
handlePageChange('page', page)"
- @pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)">
+ style="position: static;"
+ :page="pageConfig.page"
+ :pageSize="pageConfig.pageSize"
+ :total="pageConfig.total"
+ autoSize
+ @pageChange="page => handlePageChange('page', page)"
+ @pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)">
@@ -241,7 +271,7 @@
title="条款内容"
:visible.sync="detailTextDialog"
width="50%">
-
+
@@ -261,13 +291,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 +348,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 +426,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 +609,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 +644,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 +683,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 +770,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 +780,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 +789,7 @@ export default {
openDialog(text) {
this.detailText = text
this.detailTextDialog = true
- }
+ },
},
props: {
reload: {
@@ -870,6 +980,7 @@ export default {
.container {
height: calc(100% - 139px);
+
/deep/ .el-tabs__header {
height: 50px;
}
@@ -909,13 +1020,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 +1187,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/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 @@
+
+
+
+ 企标制修订立项计划流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+ 新增
+ 上传
+ 模板下载
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@