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

src/views/manage/message/index.vue

@@ -237,7 +237,7 @@
           />
         </el-form-item>
         <el-form-item label="短信ID" prop="textMessageId">
-          <el-input v-model="form.textMessageId" placeholder="请输入短信ID" />
+          <el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')"/>
         </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"/>

src/views/manage/propaganda/index.vue

@@ -305,7 +305,7 @@
           />
         </el-form-item>
         <el-form-item label="宣教ID" prop="propagandaCode">
-          <el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" />
+          <el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" onKeyUp="value=value.replace(/[\W]/g,'')"/>
         </el-form-item>
         <el-form-item label="宣教类型" prop="propagandaType">
           <el-select
@@ -1457,9 +1457,9 @@ export default {
               this.getList();
             });
           } else {
-            if (this.diseaseTypeName = '请选择病种') {
+            if (this.diseaseTypeName == '请选择病种') {
               this.form.diseaseTypeName = null
-            } else {
+            } else if(this.diseaseTypeName){
               this.form.diseaseTypeName = this.diseaseTypeName
             }
             addPropaganda(this.form).then(response => {

src/views/manage/script/index.vue

@@ -259,6 +259,7 @@
         </el-form-item>
         <el-form-item label="话术ID" prop="scriptId">
           <el-input
+            onKeyUp="value=value.replace(/[\W]/g,'')"
             v-model="form.scriptId"
             placeholder="请输入话术ID"
             maxlength="100"
@@ -266,6 +267,7 @@
         </el-form-item>
         <el-form-item label="平台ID" prop="platformId">
           <el-input
+            onKeyUp="value=value.replace(/[\W]/g,'')"
             v-model="form.platformId"
             placeholder="请输入平台ID"
             maxlength="100"

src/views/manage/servicepackage/index.vue

@@ -205,7 +205,7 @@
             prop="diseaseTypeName"
           />
           <el-table-column
-          width="180"
+            width="180"
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
@@ -666,16 +666,25 @@
           }}</span>
         </el-form-item>
         <el-form-item label="服务包名称:" prop="packageVersion">
-          <span
+          <div class="container">
-            style="
+            <el-tooltip class="item" effect="dark" :content="formdetail.packageName" placement="top-start">
-              display: inline-block;
+            <span >{{ formdetail.packageName }}</span>
-              width: 80px;
+      
-              white-space: nowrap;
+    </el-tooltip>
-              overflow: hidden;
+
-              text-overflow: ellipsis;
+          </div>
-            "
+
-            >{{ formdetail.packageName }}</span
+          <!-- <span class="container" v-tooltip="formdetail.packageName">{{ formdetail.packageName }}</span> -->
-          >
+          <!-- <span class="container">
+                <el-tooltip>
+                     
+                          <template slot="title">
+                                {{ formdetail.packageName ? formdetail.packageName : '-' }}
+                          </template>
+             
+                      {{ formdetail.packageName ? formdetail.packageName : '-' }}
+                        </el-tooltip>
+         </span> -->
         </el-form-item>
         <!-- <el-form-item label="服务包名称:" prop="packageVersion">
           <span
@@ -1494,6 +1503,24 @@ export default {
 ::v-deep .el-input-group {
   width: 204px !important;
 }
+.container {
+  display: inline-block;
+  width: 80px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  // text-overflow:ellipsis
+  //       white-space: nowrap;
+  //       overflow: hidden;
+
+}
+// .container:hover {
+//   text-overflow:inherit; 
+//     overflow: visible; 
+//     white-space: pre-line; 
+
+// }
 .leftserv {
   height: 857px;
   overflow: auto;

src/views/manage/template/index.vue

@@ -23,6 +23,7 @@
 
       <el-form-item label="模板ID" prop="templateId">
         <el-input
+ 
           v-model="queryParams.templateId"
           placeholder="请输入模板ID"
           clearable
@@ -187,7 +188,7 @@
           />
         </el-form-item>
         <el-form-item label="模板ID" prop="templateId">
-          <el-input v-model="form.templateId" placeholder="请输入模板ID" />
+          <el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')" />
         </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"/>