Merge branch 'master' into referMaster

config/index.js

@@ -24,6 +24,7 @@ module.exports = {
 
     // Various Dev Server settings
     port: 8083, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    host: '192.168.3.106',
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: true,

src/common/Dialog.vue

@@ -27,6 +27,9 @@ export default {
   data() {
     return {};
   },
+  created(){
+    console.log(this.item)
+  },
   computed:{
     hideAreaVal(){      //文本域修改时不要显示已填的值
       const {item,cancelNum,idx,num,extNum}=this;

src/common/MultSelect.vue

@@ -34,7 +34,7 @@ export default {
   },
   mounted() {
     //this.numPlus = this.num
-    console.log(this.symptomResult.questionDetailList)
+    // console.log(this.symptomResult.questionDetailList)
     this.result = this.symptomResult.questionDetailList;
   },
   watch:{

src/common/OptionInp.vue

@@ -35,7 +35,7 @@ import { getExpStr,isIos} from '@utils/tools';
 import $ from 'jquery';
   export default {
     name:'OptionInp',
-    props:['item','inx'],
+    props:['item','inx','sure'],
     data(){
       return{
         msg:{},

src/components/MainPage.vue

@@ -40,7 +40,7 @@
         <div v-for="(item,idx) in symptomQasList" :key="'0'+idx+item.id" v-if="activeTab">
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :cancelNum="cancelNum" :extNum ="[]"/>
         </div>
-        <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
+        <!-- <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length]" :cancelNum="cancelNum"/>
         </div>
         <div v-for="(item,idx) in othersQasList" :key="'2'+idx+item.id" v-if="activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
@@ -48,6 +48,15 @@
         </div>
         <div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id" v-if="activeTab==moduleKeys[3]">
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
+        </div> -->
+        <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==51">
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length]" :cancelNum="cancelNum"/>
+        </div>
+        <div v-for="(item,idx) in othersQasList" :key="'2'+idx+item.id" v-if="activeTab==3">
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length]" :cancelNum="cancelNum"/>
+        </div>
+        <div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id" v-if="activeTab==52">
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
         </div>
       </div>
     </div>
@@ -364,6 +373,7 @@ export default {
         let tmpArrDetail1 = JSON.parse(JSON.stringify(this[moduleName][0]));
         this[moduleName][0] = tmpArrDetail1;
         let timer = setTimeout(() => {
+          // this.activeTab=this.moduleKeys[+tabIndx+1];   //进入下一个阶段问题
           this.num = 0;
           const tmpNowItem = this[moduleName][this.num];
           this.type = tmpNowItem.controlType;

src/store.js

@@ -550,8 +550,8 @@ function formatSymptomData(data){
   let newArr = JSON.parse(JSON.stringify(data));
     newArr.push({
       id: 999998,
-      name: "您还有其他不舒服吗？(可多选)",
-      tagName: "您还有其他不舒服吗？",
+      name: "还有其他不舒服吗？(可多选)",
+      tagName: "还有其他不舒服吗？",
       type: 1,
       controlType: 99,
       itemType: 0,