diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 24e890362..738fc2820 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -174,10 +174,11 @@ - + @@ -339,7 +340,13 @@ export default { // 议题选中时储存数组 deleteTable: [], loading: false, - dialogTitle: '' + dialogTitle: '', + // 当前日期之前不可选择 + datePicker: { + disabledDate(date) { + return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 + } + } } }, mounted() { @@ -819,6 +826,20 @@ export default { @import '~@/assets/styles/style'; .standCalendar { + .content_form { + /deep/.el-input--suffix .el-input__inner { + border: 0; + color: #828387; + } + label-input-form { + .picker_style { + margin-bottom: 0; + min-height: 50px; + line-height: 50px; + border-bottom: 1px dashed #e5e5e5; + } + } + } .date-picker { .item { /deep/ .el-input { @@ -874,6 +895,7 @@ export default { margin-top: 50px; } + .card_info { height: 190px; margin-top: 10px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 31875535c..ce92499e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -82,6 +82,7 @@ @@ -453,7 +454,13 @@ export default { isSubmit: false, saveLoading: false, commentInfo: '', - bpnId: '' + bpnId: '', + // 设置当前日期之前不可选择 + datePicker: { + disabledDate(date) { + return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 + } + } } }, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index e77ff7e04..91ba66aff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -54,13 +54,26 @@ placeholder="请选择初稿完成时间"> - + + disabled + v-model="qbfsForm.rqbName" + placeholder="请输入企业标准" + :maxlength="500"/> + + + + + + @@ -116,6 +129,52 @@ > + + + + + + + + + + + + + + + + + + + + @@ -268,12 +327,13 @@ export default { return{ formRules: { cancelReason: [ - {required: true, message: '请输入延期原因', trigger:'blur'}, + {required: true, message: '请输入取消原因', trigger:'blur'}, ] }, ListModel: false, standinfoList: [], + BZList: [], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -311,6 +371,12 @@ export default { if(!this.qbfsForm.passFlag){ this.qbfsForm = {} } + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods: { validateForm () { @@ -372,6 +438,16 @@ export default { this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName + if(this.selectList[0].area){ + this.qbfsForm.area = this.selectList[0].area.split(',') + } + this.qbfsForm.rqbName = this.selectList[0].rqbName + this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName + this.qbfsForm.isRelate = this.selectList[0].isRelate + this.qbfsForm.useLevel = this.selectList[0].useLevel + this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations + this.qbfsForm.technologic = this.selectList[0].technologic + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 33119c5c4..63da88cbe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -54,6 +54,27 @@ placeholder="请选择初稿完成时间"> + + + + + + + + + - - - @@ -124,6 +137,45 @@ > + + + + + + + + + + + + + + + + + + + + + @@ -282,6 +342,7 @@ export default { props: ['message'], data(){ return{ + BZList: [], formRules: { yqDraftTime: [ { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' }, @@ -332,6 +393,12 @@ export default { if(!this.qbfsForm.passFlag){ this.qbfsForm = {} } + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods: { validateForm () { @@ -378,6 +445,7 @@ export default { }, //带入标准 OkDrawer(){ + console.log(this.selectList); if(this.selectList.length > 1){ this.$message.warning('您只能带入一条标准') }else if(this.selectList.length < 1){ @@ -393,6 +461,16 @@ export default { this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName + if(this.selectList[0].area){ + this.qbfsForm.area = this.selectList[0].area.split(',') + } + this.qbfsForm.rqbName = this.selectList[0].rqbName + this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName + this.qbfsForm.isRelate = this.selectList[0].isRelate + this.qbfsForm.useLevel = this.selectList[0].useLevel + this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations + this.qbfsForm.technologic = this.selectList[0].technologic + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 6bed46d34..a952cac68 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -1,5 +1,5 @@