diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
index c1254be4d..d00603046 100644
--- a/src/pages/personal/pages/my-questions/components/answerItem.vue
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -144,12 +144,26 @@ export default {
this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
_this: this
}, res => {
- this.$http.post("lawss/activiti/completeTask", {
- json: JSON.stringify(this.form),
- taskId: this.$route.query.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- });
+ this.$http.get('lawss/activiti/questionsAndAnswers', {
+ askId: asdId,
+ answerer: this.$store.getters.userInfo.userId
+ }, {
+ _this: this,
+ }, res => {
+ if(res && res.data){
+ const taskId = res.data.taskId
+ const json = res.data.mesg
+ this.$http.post("lawss/activiti/completeTask", {
+ // json: JSON.stringify(this.form),
+ // taskId: this.$route.query.taskIds,
+ json,
+ taskId,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ });
+ }
+ }, e => {})
+
if(res.respCode === '200'){
this.form.reply = ''
this.fileList = []
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 8596c8bb1..d29d3070a 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -1928,6 +1928,14 @@ export default {
// })
// this.questionForm.fileInfo = list
},
+ submitGetData(){
+ this.activeName = 'myQue'
+ this.handleClick()
+ this.activeType = this.standType
+ this.sourceClick();
+ this.activestand = this.handleSelectTableList[0].id
+ this.standClick();
+ },
//提交问题
queSubmit(){
if(this.standType === 'OTHER'){
@@ -1980,6 +1988,7 @@ export default {
{
_this: this
}, res => {
+ this.submitGetData();
}, e => {
})
}, e => {
diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue
index 017d9ddb9..f747c56f0 100644
--- a/src/pages/personal/pages/my-questions/index3.vue
+++ b/src/pages/personal/pages/my-questions/index3.vue
@@ -1963,6 +1963,14 @@ export default {
// })
// this.questionForm.fileInfo = list
},
+ submitGetData(){
+ this.activeName = 'myQue'
+ this.handleClick()
+ this.activeType = this.standType
+ this.sourceClick();
+ this.activestand = this.handleSelectTableList[0].id
+ this.standClick();
+ },
//提交问题
queSubmit(){
if(this.standType === 'OTHER'){
@@ -2015,6 +2023,7 @@ export default {
{
_this: this
}, res => {
+ this.submitGetData();
}, e => {
})
}, e => {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4994efac5..336365e53 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4139,11 +4139,11 @@ export default {
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(nowstandinfo.standSort)){
- nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
+ nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
}else if(nowstandinfo.standSort === 'Q/QCBFC'){
- nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
+ nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
}else {
- nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
+ nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
}
// if (nowstandinfo.standSort === 'Q/QCBFC'){
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 4239a2d88..609a6ba01 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -151,7 +151,7 @@
prop="wgLeaderName"
width="120"
align="center"
- label="工作组组长">
+ label="技术委员会评审负责人">
-
+
+
+
+ 技术委员会评审负责人
+
+
-
+
@@ -489,10 +494,10 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
-
+