zhouna преди 6 години
родител
ревизия
0321a75eab
променени са 2 файла, в които са добавени 37 реда и са изтрити 27 реда
  1. 5 2
      src/components/icss/AddIndeptLabel.vue
  2. 32 25
      src/components/icss/PubIndeptTag.vue

+ 5 - 2
src/components/icss/AddIndeptLabel.vue

@@ -12,7 +12,7 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title"> <i>*</i> 标签明细:</p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2||dataPub.region2==99"> <i>*</i> 标签明细:</p>
             <SingleSelect v-if="dataPub.region2==1" :type="dataPub.region2" @pushValues="pushValues"></SingleSelect>
             <div class="btn">
                 <el-button
@@ -37,6 +37,7 @@
     data() {
       return {
         dataPub: {},      //公用组件传的值都在这
+        itemsTypes:[1,2,99],            //有明细的类型
         form: {
           currentOrder: '0',     //标签成文顺序
         },
@@ -80,7 +81,7 @@
       },
       validatePass() {      //验证成功回调,调取接口
         //仍需验证标签明细是否选择
-        if ([0,1,2].includes(+this.dataPub.region2)&&this.options.length==0) {
+        if (this.itemsTypes.includes(+this.dataPub.region2)&&this.options.length==0) {
           this.$message({
             message: '至少填一个选项',
             type: 'warning'
@@ -105,6 +106,8 @@
             "copyType": this.dataPub.region2 == 6 ? this.dataPub.region10 : (this.dataPub.region2 == 3 ? this.dataPub.region11 : ''),                               //是否复制
             "showAdd": 0,                                //是否显示加号血压
             "showInfo": 0,
+            "prefix":this.dataPub.prefix,                                 //前缀
+            "suffix":this.dataPub.suffix,                                 //后缀
             "questionDetails": this.options,
             "questionMappings": []       //映射关系,
           }

+ 32 - 25
src/components/icss/PubIndeptTag.vue

@@ -65,6 +65,27 @@
                         @change="sendData"
                 ></el-input>
             </el-form-item>
+            <el-form-item
+                    label="标签前后缀:"
+                    class="fix-inp"
+                    prop="region12"
+                    v-if="form.region2==6"
+            >
+                <el-col :span="10">
+                <el-input v-model="form.prefix"
+                        maxLength="30"
+                        placeholder="前缀"
+                        @change="sendData"
+                ></el-input></el-col>
+                <el-col :span="4">标签</el-col>
+                <el-col :span="10">
+                <el-input
+                    v-model="form.suffix"
+                    maxLength="30"
+                    placeholder="后缀"
+                    @change="sendData"
+                ></el-input></el-col>
+            </el-form-item>
             <el-form-item
                     label="选择项之间链接:"
                     prop="region5"
@@ -133,18 +154,6 @@
                         @input="sendData"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="选择子项时是否复制主项标签:" prop="region10" v-if="form.region2 == 6">
-                <el-select v-model="form.region10">
-                    <el-option label="不可以" value="1"></el-option>
-                    <el-option label="可以" value="0"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="是否复制当前模块(是否显示加号):" prop="region11" v-if="form.region2 == 3">
-                <el-select v-model="form.region11">
-                    <el-option label="不可以" value="1"></el-option>
-                    <el-option label="可以" value="0"></el-option>
-                </el-select>
-            </el-form-item>
         </el-form>
     </div>
 </template>
@@ -176,9 +185,9 @@
           region7: '3',       //性别
           region8: '0',          //最小年龄
           region9: '200',         //最大年龄
-          region10: '0',        //是否复制主标签
-          region11: '1',       //是否复制当前模块
-          tagPool:[],          //标签池数据
+          region12:'',
+          prefix:'',            //前缀
+          suffix:'',            //后缀
           order:[],            //排序方式
           tipLis:[],           //提示列表
         },
@@ -207,13 +216,7 @@
           ],
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
-          ],
-          region10: [
-            { required: true, message: '选择子项时是否复制主项标签', trigger: 'change' }
-          ],
-          region11: [
-            { required: true, message: '是否复制当前模块', trigger: 'change' }
-          ],
+          ]
         },
         tmpSex: '通用',
         tmpOwn: '',
@@ -274,7 +277,7 @@
           }
         })
       },
-      sendData() {
+      sendData() {console.log(this.form.region2)
         this.$emit('changeVal', this.form, false)
       },
       changeType(type){
@@ -310,8 +313,12 @@
   }
 </script>
 <style lang="less">
-    .PubTagGroupWrapper {
-
+    .fix-inp .el-col .el-input__inner{
+        width: 100%;
+        display: inline-block;
+    }
+    .fix-inp .el-col-4{
+        text-align: center;
     }
     .groups {
         background-color: #fff;