合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!52

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", {
+                this.$http.get('lawss/activiti/questionsAndAnswers', {
-                  json: JSON.stringify(this.form),
+                  askId: asdId,
-                  taskId: this.$route.query.taskIds,
+                  answerer: this.$store.getters.userInfo.userId
-                  userId: this.$store.getters.userInfo.userId
+                }, {
-                }, {}, res => {
+                  _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 = []

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 => {

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 => {

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'){

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -151,7 +151,7 @@
                                 prop="wgLeaderName"
                                 width="120"
                                 align="center"
-                                label="工作组组长">
+                                label="技术委员会评审负责人">
                         </el-table-column>
                         <el-table-column
                                 prop="draftTime"
@@ -346,12 +346,17 @@
                                                     :maxlength="500"/>
                                             <el-input :disabled="DrawerType === 'see'" v-model="addForm.resPersonName" placeholder="请选择评审责任人" readonly="readonly"  @click.native="choiceZRRS('resPerson', '选择评审责任人', addForm.resPerson)"></el-input>
                                         </el-form-item>
-                                      <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                      <el-form-item prop="wgLeader" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <template v-slot:label>
+                                          <el-tooltip content="技术委员会评审负责人" placement="top">
+                                            <span>技术委员会评审负责人</span>
+                                          </el-tooltip>
+                                        </template>
                                         <el-input
                                             style="display: none;"
                                             v-model="addForm.wgLeader"
                                             :maxlength="500"/>
-                                        <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="workGroupUnfold('workLeader', '选择工作组组长', addForm.wgLeader)"></el-input>
+                                        <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择技术委员会评审负责人" readonly="readonly"  @click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', addForm.wgLeader)"></el-input>
                                       </el-form-item>
                                         <!--<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">-->
                                         <!--    <el-input-->
@@ -489,10 +494,10 @@
                     @checkedRole="checkedRole"
                     :nodeList="nodeList"
             ></Role-tree>
-            <!--工作组组长-->
+            <!--技术委员会评审负责人-->
             <Role-tree
                 check-box
-                is-title="选择工作组组长"
+                is-title="请选择技术委员会评审负责人"
                 :is-visible.sync="workLeaderVisible"
                 :node-list="workLeaderNodeList"
                 @checkedRole="workLeaderCheckedRole" />