diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index 0f2f85177..299f05416 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -315,6 +315,8 @@ tr.el-table__row{
padding: 13px 10px;
height: 49px;
border: none;
+ font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
+ font-weight: lighter;
}
}
.el-input-number{
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index a6abfb1d9..efd2df19f 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -1321,6 +1321,7 @@ export default {
answerList: [],
standList: [],
questionsList: [],
+ standMap: new Map()
}
},
mounted(){
@@ -1352,6 +1353,12 @@ export default {
}
},
methods:{
+ refreshStandMap(){
+ this.standMap = new Map()
+ this.standList.forEach(item=>{
+ this.standMap.set(item.standardId,item)
+ })
+ },
checkedRole(data){
if(data[0].id){
let asdId = sessionStorage.getItem('queId')
@@ -1666,15 +1673,16 @@ export default {
queBtn(){
this.fileList = []
// 清空提问
- this.standType = "INLAND"
+ const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+ this.standType = selectedStand.classification
this.questionForm = {
- pubQue : '',//公共问题
- classification: 'INLAND', //标准类型
+ pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
+ classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
- standardEncdoing: '', //标准编号
- standardName: '', //标准名称
- standardId:'', //标准id
+ standardEncdoing: selectedStand.standardEncdoing, //标准编号
+ standardName: selectedStand.standardName, //标准名称
+ standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1720,6 +1728,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
+ this.refreshStandMap()
})
},
//问题查询
@@ -1742,6 +1751,7 @@ export default {
_this: this,
}, res => {
this.standList = res.data
+ this.refreshStandMap()
this.questionClick()
})
},
@@ -1754,6 +1764,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
+ this.refreshStandMap()
this.questionClick()
}, e =>{
@@ -1765,6 +1776,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
+ this.refreshStandMap()
this.questionClick()
}, e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f9bf983b4..b7dbeeff7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -413,7 +413,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b9b90b73d..dff140a52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -122,6 +122,8 @@
@@ -132,6 +134,8 @@
@@ -3540,7 +3544,7 @@ export default {
}
.prc-content-border {
- /deep/ .el-input__inner {
+ /deep/ .el-textarea__inner,.el-input__inner {
padding-left: 30px;
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 23ef0725e..c987f87f1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -115,6 +115,8 @@
@@ -134,6 +138,8 @@
@@ -1288,21 +1294,21 @@ export default {
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
- let qcdwName = []
- if(this.form.qcdw && this.form.qcdw.length > 0){
- this.form.qcdw.map(item => {
- this.qcdwOptions.forEach(items => {
- if(item === items.value){
- qcdwName.push(items.label)
- }
- })
- })
- }
+ // let qcdwName = []
+ // if(this.form.qcdw && this.form.qcdw.length > 0){
+ // this.form.qcdw.map(item => {
+ // this.qcdwOptions.forEach(items => {
+ // if(item === items.value){
+ // qcdwName.push(items.label)
+ // }
+ // })
+ // })
+ // }
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
- this.form.qcdw = qcdwName
- this.form.qcdw = qcdwName.splice(',')
+ // this.form.qcdw = qcdwName
+ // this.form.qcdw = qcdwName.splice(',')
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index f63a72d6a..71a74f6c0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -126,6 +126,8 @@
v-else
disabled
v-model="form.standName"
+ type="textarea"
+ autosize
placeholder="请输入标准中文名称"
clearable
>
@@ -136,6 +138,8 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 6320d00ae..e2ab398b5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -127,6 +127,8 @@
@@ -137,6 +139,8 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 23abc4899..6585114e2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -115,6 +115,8 @@
@@ -134,6 +138,8 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index cdc5a06fb..2a6d7edcf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -38,6 +38,16 @@
clearable
>
+
+
+
+
@@ -635,6 +645,11 @@ export default {
},
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7;
+ },
+ },
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 2a5b97e61..eaf8cca6e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -38,6 +38,16 @@
clearable
>
+
+
+
+
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7;
+ },
+ },
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 4d91dab2f..f8f41520f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -38,6 +38,16 @@
clearable
>
+
+
+
+
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7;
+ },
+ },
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index ef94c6db9..72de88509 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -38,6 +38,16 @@
clearable
>
+
+
+
+
@@ -650,6 +660,11 @@ export default {
},
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7;
+ },
+ },
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 3800f6098..30aff555b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -39,9 +39,9 @@
项目经理: {{ localProEO.uname }}
- 项目计划开始时间: 项目计划开始日期: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}
- 项目计划完成时间: 项目计划完成日期: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 23df9e6a4..573318d95 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -777,6 +777,7 @@ export default {
standList: [],
standIdList: [],
questionsList: [],
+ standMap: new Map()
}
},
mounted(){
@@ -819,6 +820,12 @@ export default {
});
},
methods:{
+ refreshStandMap(){
+ this.standMap = new Map()
+ this.standList.forEach(item=>{
+ this.standMap.set(item.standardId,item)
+ })
+ },
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
@@ -1040,15 +1047,16 @@ export default {
//提问按钮
queBtn(){
this.fileList = []
- this.standType = "INLAND"
+ const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+ this.standType = selectedStand.classification
this.questionForm = {
- pubQue : '',//公共问题
- classification: 'INLAND', //标准类型
+ pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
+ classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
- standardEncdoing: '', //标准编号
- standardName: '', //标准名称
- standardId:'', //标准id
+ standardEncdoing: selectedStand.standardEncdoing, //标准编号
+ standardName: selectedStand.standardName, //标准名称
+ standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1076,6 +1084,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
+ this.refreshStandMap()
})
},
//问题查询
@@ -1107,6 +1116,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
+ this.refreshStandMap()
if(this.$route.query.queId){
this.activestand = this.standList[0].standardId
this.queSearch()
@@ -1129,6 +1139,7 @@ export default {
})
if(queNumber === 0){
this.standList = res.data
+ this.refreshStandMap()
}
}, e => {
@@ -1235,6 +1246,7 @@ export default {
this.standSearch2()
break
}
+ this.queSearch()
}, e => {
})