Merge branch 'newVersion' of http://223.93.170.82:10080/zhouna/preliminary into newVersion

src/common/ComTextArea.vue

@@ -5,7 +5,7 @@
             v-model="txt"
             placeholder="请输入"
             @input="changeVal"></textarea>
-    <div :class="sure?'realSure sure':'sure'" @click="makeSuer">
+    <div :class="txt?'realSure sure':'sure'" @click="makeSuer">
       确定
     </div>
   </div>
@@ -50,7 +50,7 @@ export default {
       }
     },
     makeSuer(){
-      if(!this.sure){return}
+      if(!this.txt){return}
       let n = this.num;
       this.$emit("updata",'',{val:this.txt||'无',valp:this.txt||'无'},++n);
     }

src/common/MultSelect.vue

@@ -183,7 +183,7 @@ export default {
     border:1px #DFE0E4 solid;
     border-radius: 0.36rem;
     font-size: #font[select];
-    margin: 0 0.15rem;
+    margin: 0.15rem 0.15rem 0;
     float: left;
     color: #666;
   }

src/common/OptionInp.vue

@@ -1,7 +1,7 @@
 <!-- 带输入框选项 -->
 <template>
-  <div :class="['inpbox',{'iptCheck':item.select}]">
-    <span class="prefix" v-if="msg.prefix">{{msg.prefix}}</span>
+  <div :class="['inpbox',{'iptCheck':item.select||item.value}]">
+    <span class="prefix" v-if="msg.prefix" @click="stopPop">{{msg.prefix}}</span>
     <input :type="msg.type=='number'?'number':'text'"
             :placeholder="msg.placeholder"
             :style="{'width':!msg.prefix&&!msg.suffix?'90%':'33%'}"
@@ -10,7 +10,7 @@
            @click="handleCli"
            @input="changeVal"
     >
-    <span class="suffix" v-if="msg.suffix">{{msg.suffix}}</span>
+    <span class="suffix" v-if="msg.suffix" @click="stopPop">{{msg.suffix}}</span>
   </div>
 </template>
 <script type="text/javascript">
@@ -33,6 +33,9 @@ import $ from 'jquery';
       this.select = this.item.select;
     },
     methods:{
+      stopPop(e){
+        e.stopPropagation();
+      },
       changeVal(e){
         /*const val = e.target.value;
         if(!val.match(/\S/g)){      //只有空白符不算输入

src/components/MainPage.vue

@@ -281,17 +281,18 @@ export default {
       });
       this.canceledQa=this.num;     //记录被修改过的题目，只可修改一次
     },
-    formatQaArr(obj,n){
+    formatQaArr(obj){
       let arr = [],nobj=JSON.parse(JSON.stringify(obj));
       for(let i in nobj){
-        arr.push(Object.assign({selectedNum:n},nobj[i]));
+        arr.push(Object.assign({},nobj[i]));
       }
       return arr;
     },
     addExtQa(obj,i,selectedN){
       const mName=this.moduleMap[this.activeTab];
       let moduleName = mName+'QasList';
-      const dataArr = this.formatQaArr(obj,selectedN);
+      const dataArr = this.formatQaArr(obj);
+      this[moduleName][i].selectedNum=selectedN;    //选中项关联子问题的个数
       this[moduleName].splice(i+1,0,...dataArr);
       this.$store.commit("setModuleDatas",{data:this[moduleName],mName});
     },