Merge remote-tracking branch 'origin/develop' into develop

src/pages/personal/pages/my-questions/components/answerItem.vue

@@ -4,12 +4,12 @@
     <el-divider style="margin: 10px 0;"></el-divider>
     <div id="message-content">
       <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item prop="textarea">
+        <el-form-item prop="reply">
           <el-input
             type="textarea"
             :rows="2"
             placeholder="请输入回答内容"
-            v-model="form.textarea">
+            v-model="form.reply">
           </el-input>
         </el-form-item>
         <div>
@@ -88,12 +88,11 @@ export default {
      importModalshowflagtemp: false,
      fileList: [],
      form:{
-       textarea: '',
+       reply: '',
-       invitationId: '',
+       answerer: this.$store.getters.userInfo.userId,
-       invitationName: '',
      },
      rules: {
-       textarea: [
+       reply: [
          { required: true, message: '请输入回复内容', trigger: 'blur' },
          { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
        ]
@@ -103,8 +102,16 @@ export default {
   methods:{
     //提交
     handleSubmit(){
+      let asdId = sessionStorage.getItem('queId')
       this.form.fileList = this.fileList
-      console.log(this.form);
+      this.form.askId = asdId
+      this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
+        _this: this
+      }, res => {
+
+      }, e => {
+
+      })
     },
     //上传文件
     openUploadFileDialog(){
@@ -173,7 +180,20 @@ export default {
     },
     //问题归档
     queArchive(){
+      let list = []
+      let mergeList = JSON.parse(sessionStorage.getItem('mergeList'))
+      for (let i = 0; i < mergeList.length; i++) {
+        list.push(mergeList[i])
+      }
+      let listId = list.join(',')
+      this.$http.post('lawss/Reply/updateReply', {
+         id: listId,
+      },{
+        _this: this
+      }, res => {
+      }, e => {
 
+      })
     },
     //邀请
     invitation(){

src/pages/personal/pages/my-questions/components/questionItemInfo.vue

@@ -11,8 +11,8 @@
       </div>
       <div class="row">
         <div class="item">
-          <div>附件：
+          <div style="cursor: pointer;">附件：
-            <span style="color: #409EFF">{{answer.annex}}</span>
+            <span style="color: #409EFF">{{answer.appendixName}}</span>
           </div>
         </div>
       </div>
@@ -23,9 +23,9 @@
           </div>
         </div>
       </div>
-<!--      <div>-->
+      <div>
-<!--        <el-checkbox v-model="checked">归档</el-checkbox>-->
+        <el-checkbox @change="answerChang" v-model="answer.checked">归档</el-checkbox>
-<!--      </div>-->
+      </div>
     </div>
 <!--    <div class="footer-box">-->
 
@@ -39,9 +39,13 @@ export default {
   props:['answer'],
   data(){
     return{
-      checked: true,
+      checked: '',
     }
   },
+  methods:{
+    answerChang(val){
+    },
+  },
   watch:{
     answer: {
       immediate: true,

src/pages/personal/pages/my-questions/index.vue

@@ -770,7 +770,7 @@
   <el-dialog
     title="提交问题"
     :visible.sync="dialogVisible"
-    width="600px"
+    width="650px"
     :before-close="handleClose">
     <div>
       <el-form ref="queForm" :rules="queRules" class="label-input-form" label-width="80px" :model="questionForm">
@@ -781,7 +781,17 @@
             <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
             <el-radio  label="OTHER">公共</el-radio>
           </el-radio-group>
-          <el-button size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+          <div style="display: inline-block; margin-left: 20px"  v-if="standType === 'OTHER'">
+            <el-select v-model="questionForm.pubQue" placeholder="请选择公共问题">
+              <el-option
+                v-for="item in pubOptions"
+                :key="item.label"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
+          </div>
+          <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
         </el-form-item>
         <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
           <el-input v-model="questionForm.problemDescription"></el-input>
@@ -1202,6 +1212,7 @@ export default {
   },
   data(){
     return{
+      mergeList: [],
       handleSelectForm: {
         standName: '', //标准名称
         numberName: '', //政策名称
@@ -1234,9 +1245,11 @@ export default {
       activeType: 'INLAND',
       activestand: '',
       activeQue: '',
+      pubOptions: [], //公共问题
       standType: 'INLAND',
       dialogVisible: false,
       questionForm:{
+        pubQue: '', //公共问题
         classification: 'INLAND', //标准类型
         problemDescription: '', //问题
         questioner: this.$store.getters.userInfo.userId, //提问人
@@ -1271,9 +1284,25 @@ export default {
     }, res => {
       this.setMap(res.data.WBZTCLASS);// 文本状态
       this.textState = res.data.WBZTCLASS // 文本状态
+      this.pubOptions = res.data.DYGGWT  //问答公共问题
     }, e => {
     });
   },
+  watch:{
+    answerList: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.mergeList = []
+        val.forEach(item =>{
+          if(item.checked){
+            this.mergeList.push(item.id)
+          }
+        })
+        sessionStorage.setItem('mergeList', JSON.stringify(this.mergeList))
+      }
+    }
+  },
   methods:{
     // 点击查看
     handlePreview(item) {
@@ -1488,7 +1517,7 @@ export default {
        })
     },
     standClick3(){
-      this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+      this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
         answerer: this.$store.getters.userInfo.userId,
       },{
@@ -1633,9 +1662,13 @@ export default {
     },
     //提交问题
     queSubmit(){
+      if(this.standType === 'OTHER'){
+        this.questionForm.standardId = this.questionForm.pubQue
+        this.questionForm.standardName = this.questionForm.pubQue
+        this.questionForm.standardEncdoing = this.questionForm.pubQue
+      }
       if(this.questionForm.standardId){
         this.questionForm.fileList = this.fileList
-        console.log(this.questionForm);
         this.$refs['queForm'].validate((valid) => {
           if(valid){
             this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },