Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/crowdInfo/index.vue

@@ -163,7 +163,7 @@
             style="width: 206px" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" style="width:206px" maxlength="100" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="100" />
         </el-form-item>
 
       </el-form>
@@ -428,6 +428,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-textarea__inner{
+  width: 533px !important;
+  height: 100px;
+}
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/manage/message/index.vue

@@ -94,41 +94,19 @@
       </el-col>
     </el-row>
     <!-- 添加或修改短信模板信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="730px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline=true>
         <el-form-item label="短信模板名称" prop="textMessageName">
           <el-input v-model="form.textMessageName" placeholder="请输入短信模板名称" />
         </el-form-item>
-        <el-form-item label="短信ID" prop="textMessageId" v-if="title == '修改短信模板信息'">
+             
-          <el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')"
-            disabled />
-        </el-form-item>
-        <el-form-item label="短信排序" prop="textMessageSort">
-          <el-input-number v-model="form.textMessageSort" controls-position="right" :min="0" placeholder="请输入短信排序"
-            style="width: 350px" />
-        </el-form-item>
-        <el-form-item label="短信内容" prop="textMessageContent">
-          <el-input v-model="form.textMessageContent" placeholder="请输入短信内容" type="textarea" maxlength="300"
-            :rows="10" />
-        </el-form-item>
-        <el-form-item label="适用任务类型" prop="suitTaskTypeIds">
-          <el-select v-model="form.suitTaskTypeIds" placeholder="请选择适用任务类型" style="width: 350px" multiple>
-            <el-option v-for="item in type" :key="item.id" :label="item.dictLabel" :value="item.dictCode">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="短信通道" prop="textMessageChannel">
-          <el-select v-model="form.textMessageChannel" placeholder="请选择短信通道" style="width: 350px">
+          <el-select v-model="form.textMessageChannel" placeholder="请选择短信通道" style="width:206px">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="短信状态" prop="textMessageStatus">
+
-          <el-select v-model="form.textMessageStatus" placeholder="请选择短信状态" style="width: 350px">
-            <el-option v-for="item in optionstext" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="科室名称" prop="departmentId">
           <el-button type="" @click="clickinnerVisible()"
             :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''" style="
@@ -147,6 +125,31 @@
               overflow: hidden;
             ">{{ form.diseaseTypeName }}</el-button>
         </el-form-item>
+        <el-form-item label="短信ID" prop="textMessageId" v-if="title == '修改短信模板信息'">
+          <el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')"
+            disabled />
+        </el-form-item>
+
+        <el-form-item label="短信状态" prop="textMessageStatus">
+          <el-select v-model="form.textMessageStatus" placeholder="请选择短信状态" style="width:206px">
+            <el-option v-for="item in optionstext" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="短信排序" prop="textMessageSort">
+          <el-input-number v-model="form.textMessageSort" controls-position="right" :min="0" placeholder="请输入短信排序"
+             />
+        </el-form-item>
+        <el-form-item label="适用任务类型" prop="suitTaskTypeIds">
+          <el-select v-model="form.suitTaskTypeIds" placeholder="请选择适用任务类型"  multiple style="width:206px">
+            <el-option v-for="item in type" :key="item.id" :label="item.dictLabel" :value="item.dictCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="短信内容" prop="textMessageContent">
+          <el-input v-model="form.textMessageContent" placeholder="请输入短信内容" type="textarea" maxlength="300"
+            :rows="10" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -667,6 +670,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-textarea__inner{
+  width: 533px !important;
+  height: 100px;
+}
 ::v-deep .el-dialog__body {
   padding-bottom: 60px !important;
 }

src/views/manage/propaganda/index.vue

@@ -1025,7 +1025,7 @@ export default {
       var obj = {
         departmentId: this.queryParams.departmentId,
         departmentName: this.departmentName,
-        type: 'MESSAGE',
+        type: 'PROPAGANDA',
         sourceTemplateIds: this.exportlist,
       }
       copyBaselnfo(obj).then(response => {

src/views/manage/template/index.vue

@@ -81,39 +81,22 @@
       </el-col>
     </el-row>
     <!-- 添加或修改微信模板信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="730px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline=true>
         <el-form-item label="微信模板名称" prop="wechatTemplateName">
           <el-input v-model="form.wechatTemplateName" placeholder="请输入微信模板名称" />
         </el-form-item>
-        <el-form-item label="模板ID" prop="templateId" v-if="title == '修改微信模板'">
-          <el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')"
-            disabled />
-        </el-form-item>
-        <el-form-item label="微信排序" prop="templateSort">
-          <el-input-number v-model="form.templateSort" controls-position="right" :min="0" placeholder="请输入微信排序"
-            style="width: 350px" />
-        </el-form-item>
-        <el-form-item label="模板内容" prop="templateContent">
-          <el-input v-model="form.templateContent" placeholder="请输入模板内容" type="textarea" maxlength="300" :rows="10" />
-          <!-- <editor v-model="form.templateContent" :min-height="192"/> -->
-        </el-form-item>
         <el-form-item label="模板来源" prop="templateSource">
-          <el-select v-model="form.templateSource" placeholder="请选择" style="width: 350px">
+          <el-select v-model="form.templateSource" placeholder="请选择" style="width:206px">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="适用数据类型" prop="suitTaskTypeId">
+      
-          <el-select v-model="form.suitTaskTypeIds" placeholder="请选择" style="width: 350px" multiple>
-            <el-option v-for="item in type" :key="item.dictCode" :label="item.dictLabel" :value="item.dictCode">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="科室名称" prop="departmentId">
           <el-button type="" @click="clickinnerVisible()"
             :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''" style="
-              width: 350px;
+              width: 206px;
               text-align: left;
               height: 36px;
               overflow: hidden;
@@ -122,12 +105,32 @@
         <el-form-item label="病种名称" prop="diseaseTypeName">
           <el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''"
             style="
-              width:350px;
+              width:206px;
               text-align: left;
               height: 36px;
               overflow: hidden;
             ">{{ form.diseaseTypeName }}</el-button>
         </el-form-item>
+        <el-form-item label="模板ID" prop="templateId" v-if="title == '修改微信模板'">
+          <el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')"
+            disabled />
+        </el-form-item>
+        <el-form-item label="微信排序" prop="templateSort">
+          <el-input-number v-model="form.templateSort" controls-position="right" :min="0" placeholder="请输入微信排序" style="width:206px"
+         />
+        </el-form-item>
+        <el-form-item label="适用数据类型" prop="suitTaskTypeId">
+          <el-select v-model="form.suitTaskTypeIds" placeholder="请选择" multiple style="width:206px">
+            <el-option v-for="item in type" :key="item.dictCode" :label="item.dictLabel" :value="item.dictCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+    
+        <el-form-item label="模板内容" prop="templateContent">
+          <el-input v-model="form.templateContent" placeholder="请输入模板内容" type="textarea" maxlength="300" :rows="10" />
+          <!-- <editor v-model="form.templateContent" :min-height="192"/> -->
+        </el-form-item>
+      
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -684,6 +687,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-textarea__inner{
+  width: 533px !important;
+  height: 100px;
+}
 ::v-deep.el-table td.el-table__cell div {
   display: -webkit-box;
   text-overflow: ellipsis;