单、多选输入框必填（前后缀点击）

src/common/Radio.vue

@@ -104,11 +104,11 @@ export default {
               });
             }
             if(result[i].name.indexOf("${")!==-1){
-              tmpResult=msg.prefix+(result[i].value||"")+msg.suffix;
-              tmpResultp=msgp.prefix+(result[i].value||"")+msgp.suffix;
+              tmpResult=result[i].value?msg.prefix+(result[i].value||"")+msg.suffix:'';
+              tmpResultp=result[i].value?msgp.prefix+(result[i].value||"")+msgp.suffix:'';
             }else{
-              tmpResult=text||"无";
-              tmpResultp=textp||"无";
+              tmpResult=text;
+              tmpResultp=textp;
             }
           }
         }
@@ -120,11 +120,15 @@ export default {
         }
         if(+this.symptomResult.flag===2){   //为诱因控件
           const orgChoose = this.$store.state.symptom.choose;
-          orgChoose[0].reason = tmpResult||"无";
-          orgChoose[0].reasonP = tmpResultp||"无";
+          orgChoose[0].reason = tmpResult;
+          orgChoose[0].reasonP = tmpResultp;
           this.$store.commit('setChoose', { choose: orgChoose, type: 1 });
         }
         //this.contentResult = tmpResult;
+      if(!tmpResult){
+        this.$emit("warning","选中项输入框必填");
+        return;
+      }
       this.$emit("updataResultSingle", this.symptomResult, {val:tmpResult||"无",valp:tmpResultp||"无",flag:this.symptomResult.flag},++number);
     },
     selectResult(item,idx) {

src/common/Select.vue

@@ -101,6 +101,10 @@ export default {
           const msg = getExpStr(text);
           const msgp = getExpStr(textp);
           if(result[i].select){
+            if(!result[i].value){
+              this.$emit("warning","选中项输入框必填");
+              return;
+            }
             subQas = subQas+","+result[i].subQuestion;
             if(result[i].name.indexOf("${")!==-1){
               tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
@@ -126,8 +130,8 @@ export default {
       // }
       if(+this.symptomResult.flag===2){   //为诱因控件
         const orgChoose = this.$store.state.symptom.choose;
-        orgChoose[0].reason = tmpResult||"无";
-        orgChoose[0].reasonP = tmpResultp||"无";
+        orgChoose[0].reason = tmpResult;
+        orgChoose[0].reasonP = tmpResultp;
         this.$store.commit('setChoose', { choose: orgChoose, type: 1 });
       }
       let number = this.num;

src/components/MainPage.vue

@@ -52,8 +52,8 @@
       </div>
     </div>
     <MultSelect @updataResult="updataResultSingle" :num="num" :symptomResult="symptomResult" v-if="type==3"></MultSelect>
-    <Select @updataResult="updataResultSingle" :num="num" @getExtQa="addExtQa" :symptomResult="symptomResult" v-if="type == 2"></Select>
-    <Radio @updataResultSingle="updataResultSingle" @getExtQa="addExtQa" :num="num" :symptomResult="symptomResult" v-if="type == 1"></Radio>
+    <Select @updataResult="updataResultSingle" :num="num" @warning="showWarn" @getExtQa="addExtQa" :symptomResult="symptomResult" v-if="type == 2"></Select>
+    <Radio @updataResultSingle="updataResultSingle" @warning="showWarn" @getExtQa="addExtQa" :num="num" :symptomResult="symptomResult" v-if="type == 1"></Radio>
     <!--普通单列拨盘-->
     <Picker v-if="type==10" @confirm="updataResultSingle" :columns="getColumns()" :num="num" :defaultIndex = "defaultIndex"></Picker>
     <!--时间拨盘，拨盘内容写死-->