模板慢病

src/components/icss/AddPromptInfo.vue

@@ -16,6 +16,7 @@
                                :data="f"
                                :index="i"
                                :len="len"
+                               :key="i"
                                :isEdit = "isEdit"
                                @add="addParagraph"
                                @del="delParagraph" ref="subForm"></InfoParagraph>

src/components/icss/CommonTemplate.vue

@@ -279,6 +279,10 @@ export default {
       let tmpLis = this.rightTagsList;
       let tmpObj = tmpLis[selectTagFlg[0]],m = 0;
       if(tmpSelectRightTagsList && tmpSelectRightTagsList.length>0 && (tmpSelectRightTagsList[0].type == 'input' || tmpSelectRightTagsList[0].type == 'sub')){
+        this.$message({
+            message:'关联子模板或者输入框不能加标记',
+            type:'warning'
+        })
         return;
       }
       for(let i = 0;i < tmpLis.length;i++){//循环右侧所有标签,点击的这个有标记，去掉标记，点击的没有标记，去掉其他标记，标记当前项
@@ -287,13 +291,6 @@ export default {
           console.log(idx,787878)
           tmpLi.flag = null
           idx == 1?(this.flagLisFst = -1):(idx == 4?this.flagLisSec = -1:null)
-          // if(idx == 1){//点的是1
-          //   if(this.flagLisFst == -1){//第一个未被选中
-          //     this.flagLisFst = 1
-          //   }else{
-
-          //   }
-          // }
         }else{//没有标记，判断是否有选中，选中就加上标记，没有不做处理
           ++m
           if((m == tmpLis.length)&& tmpSelectRightTagsList && tmpSelectRightTagsList.length>0){

src/components/icss/PubTemplateGroup.vue

@@ -8,34 +8,44 @@
       label-width="150px"
     >
       <el-form-item
-        label="选择归属："
-        prop="region1"
+        label="模板名称："
+        prop="region2"
       >
-        <span class="changeTips">改变归属后，模板内容将会恢复到默认状态</span>
+        <el-input
+          v-model="form.region2"
+          :disabled="!!editData.id"
+          maxLength="120"
+          placeholder="请输入模板名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="模板类型："
+        prop="region3"
+      >
+        <span class="changeTips">改变模板类型后，模板内容将会恢复到默认状态</span>
         <el-select
           :disabled="!!editData.id"
-          v-model="form.region1"
-          placeholder="请选择模板归属"
+          v-model="form.region3"
+          placeholder="模板类型"
           @change="sendData"
         >
           <el-option
-            v-for="item in Adscriptions"
+            v-for="item in sonLis"
             :label="item.name"
             :value="item.key+''"
             :key="item.key"
           ></el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item
-        label="选择子模板归属："
-        prop="region3"
-        v-if="form.region1 == 5"
+      <el-form-item
+        label="所属科室："
+        prop="region4"
       >
-        <span class="changeTips">改变子模板归属后，模板内容将会恢复到默认状态</span>
+        <span class="changeTips">改变所属科室后，模板内容将会恢复到默认状态</span>
         <el-select
           :disabled="!!editData.id"
-          v-model="form.region3"
-          placeholder="请选择子模板"
+          v-model="form.region4"
+          placeholder="所属科室"
           @change="sendData"
         >
           <el-option
@@ -45,17 +55,25 @@
             :key="item.key"
           ></el-option>
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item
-        label="模板名称："
-        prop="region2"
+        label="模板归属："
+        prop="region1"
       >
-        <el-input
-          v-model="form.region2"
+        <span class="changeTips">改变模板归属后，模板内容将会恢复到默认状态</span>
+        <el-select
           :disabled="!!editData.id"
-          maxLength="120"
-          placeholder="请输入模板名称"
-        ></el-input>
+          v-model="form.region1"
+          placeholder="模板归属"
+          @change="sendData"
+        >
+          <el-option
+            v-for="item in Adscriptions"
+            :label="item.name"
+            :value="item.key+''"
+            :key="item.key"
+          ></el-option>
+        </el-select>
       </el-form-item>
     </el-form>
   </div>
@@ -93,6 +111,7 @@ export default {
         region1: '',    //归属
         region2: '',     //模板名称
         region3: '-1',     //子模板
+        region4: '',     //所属科室
         tagPool:[],      //标签池
       },
       rules: {
@@ -101,11 +120,12 @@ export default {
         ],
         region2: [
           { required: true, message: '请输入模板名称', trigger: 'change' },
-          // { validator: validatePass2, trigger: 'blur' },
         ],
         region3: [
-          { required: true, message: '请选择子模板归属', trigger: 'change' },
-          // { validator: validatePass2, trigger: 'blur' },
+          { required: true, message: '请选择模板类型', trigger: 'change' },
+        ],
+        region4: [
+          { required: true, message: '请选择所属科室', trigger: 'change' },
         ],
       },
     }

src/components/icss/TemplateMaintenance.vue

@@ -2,6 +2,16 @@
     <div>
         <crumbs title="模板维护" style="min-width: 980px">
             <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="模板类型：">
+                    <el-select size="mini" v-model="filter.templateType" placeholder="模板类型" clearable>
+                        <el-option v-for="item in Adscriptions" :label="item.name" :value="item.key" :key="item.key" ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="属于科室：">
+                    <el-select size="mini" v-model="filter.ownTo" placeholder="属于科室" clearable>
+                        <el-option v-for="item in Adscriptions" :label="item.name" :value="item.key" :key="item.key" ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="模板归属：">
                     <el-select size="mini" v-model="filter.tagAdscription" placeholder="模板归属" clearable>
                         <el-option v-for="item in Adscriptions" :label="item.name" :value="item.key" :key="item.key" ></el-option>
@@ -85,6 +95,8 @@
         tagTypesList: [],
         filter: {
           tagType: [], //标签类型
+          templateType: '', //模板类型
+          ownTo: '', //属于科室
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
         },