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

# Conflicts:
#	src/views/manage/project/index.vue

src/views/manage/message/index.vue

@@ -249,6 +249,7 @@
             v-model="form.textMessageContent"
             placeholder="请输入短信内容"
             type="textarea"
+            maxlength="300"
           />
         </el-form-item>
         <el-form-item label="适用任务类型" prop="suitTaskTypeIds">

src/views/manage/project/index.vue

@@ -199,7 +199,7 @@
             style="width: 205px"
             v-model="form.parentId"
             :show-all-levels="false"
-           
+
             clearable
             ref="cascader"
             :key="isResouceShow"

src/views/manage/projectdevice/index.vue

@@ -455,6 +455,16 @@ export default {
               /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
           },
         ],
+        deviceIp: [
+          {
+            required: false,
+            message: "请输入正确的ip地址",
+            trigger: "blur",
+            pattern:
+              /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
+          },
+        ],
+
         deviceCode: [
           { required: true, message: "设备编码不能为空", trigger: "blur" },
         ],

src/views/manage/propaganda/index.vue

@@ -39,20 +39,30 @@
           >
           </el-option>
         </el-select>
-        <!-- <el-input
-          v-model="queryParams.departmentName"
-          placeholder="请输入所属科室名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
       </el-form-item>
       <el-form-item label="宣教来源" prop="hospitalAgencyId">
-        <el-input
+        <el-select
+          v-model="queryParams.hospitalAgencyId"
+          filterable
+          placeholder="请选择医院"
+          style="width: 200px"
+          clearable
+          @change="changehospitalAgency"
+        >
+          <el-option
+            v-for="item in hospitalAgencylist"
+            :key="item.id"
+            :label="item.agencyName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <!-- <el-input
           v-model="queryParams.hospitalAgencyId"
           placeholder="请输入宣教来源"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        /> -->
       </el-form-item>
       <el-form-item label="宣教状态" prop="propagandaStatus">
         <el-select v-model="queryParams.propagandaStatus" placeholder="请选择">
@@ -214,7 +224,7 @@
           <el-table-column
             label="宣教来源"
             align="center"
-            prop="hospitalAgencyId"
+            prop="hospitalAgencyName"
           />
           <el-table-column label="创建时间" align="center" prop="createTime" />
           <el-table-column label="更新时间" align="center" prop="updateTime" />
@@ -305,7 +315,11 @@
           />
         </el-form-item>
         <el-form-item label="宣教ID" prop="propagandaCode">
-          <el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" onKeyUp="value=value.replace(/[\W]/g,'')"/>
+          <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
@@ -329,7 +343,6 @@
             placeholder="请选择医院"
             style="width: 200px"
             clearable
-            @change="changehospitalAgency"
           >
             <el-option
               v-for="item in hospitalAgencylist"
@@ -428,17 +441,18 @@
             placeholder="请输入语音播报"
           />
         </el-form-item>
-        <el-form-item label="宣教正文内容" prop="propagandaContent">
+        <el-form-item label="文章摘要" prop="articleSummary">
           <el-input
-            v-model="form.propagandaContent"
+            v-model="form.articleSummary"
             type="textarea"
             style="width: 206px"
-            placeholder="请输入宣教正文内容"
+            placeholder="请输入文章摘要"
+            maxlength="300"
           />
         </el-form-item>
         <el-form-item label="添加封面" prop="propagandaCoverPath">
           <stationAcatar
-          v-if="open"
+            v-if="open"
             @imgUrl="imgUrl"
             :img="form.propagandaCoverPath"
             :type="'propagandaCoverUrl'"
@@ -466,8 +480,13 @@
             controls
           ></video>
         </el-form-item>
-        <el-form-item label="文章摘要" prop="articleSummary">
-          <editor v-model="form.articleSummary" :min-height="192" style="width:800px"/>
+        <el-form-item label="正文内容" prop="propagandaContent">
+          <editor
+            v-model="form.propagandaContent"
+            :min-height="192"
+            style="width: 800px"
+            @input="checkContentLength"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -734,7 +753,17 @@
             </div>
             <!-- <div class="dataliat">素材来源：</div> -->
             <!-- <div class="dataliat">标签：暂无</div> -->
-            <div class="dataliat bq" v-if="item.indications || item.drugName || item.applicableDiseases || item.surgicalName ||  item.inspectionItems || item.checkItems ">
+            <div
+              class="dataliat bq"
+              v-if="
+                item.indications ||
+                item.drugName ||
+                item.applicableDiseases ||
+                item.surgicalName ||
+                item.inspectionItems ||
+                item.checkItems
+              "
+            >
               标签：
 
               <span v-if="item.indications">{{ item.indications }}，</span>
@@ -748,10 +777,7 @@
               >
               <span v-if="item.checkItems">{{ item.checkItems }}，</span>
             </div>
-            <div class="dataliat bq" v-else>
-            标签：暂无
-
-          </div>
+            <div class="dataliat bq" v-else>标签：暂无</div>
           </div>
 
           <div class="label" @click.stop="labelchange(item)">加到文章</div>
@@ -818,16 +844,17 @@ export default {
   name: "Propaganda",
   components: { stationAcatar },
   data() {
-        //验证身份证
-        var isimgPath = (rule, value, callback) => {
+    //验证身份证
+    var isimgPath = (rule, value, callback) => {
       console.log(value)
       if (!this.form.imgPath) {
         callback(new Error("素材选择不能为空"));
       } else {
-          callback();
+        callback();
       }
     };
     return {
+      maxLength: 20000,
       itemname: null,
       departmentName: null,
       diseaseTypeName: null,
@@ -988,7 +1015,7 @@ export default {
           { required: true, message: "封面不能为空", trigger: "blur" }
         ],
         imgPath: [
-          { required: true, message: "",validator: isimgPath,  trigger: "blur" }
+          { required: true, message: "", validator: isimgPath, trigger: "blur" }
         ],
       },
     };
@@ -1027,6 +1054,15 @@ export default {
     }
   },
   methods: {
+    checkContentLength() {
+      // console.log(this.form.propagandaContent.length, 'this.form.propagandaContent.length')
+      if (this.form.propagandaContent.length - 7 > this.maxLength) {
+        this.$message({
+          type: "error",
+          message: "已达到最大输入长度"
+        });
+      }
+    },
     //获取医院list
     selectAgencyinfo() {
       let query = {
@@ -1446,6 +1482,12 @@ export default {
     submitForm() {
       // return
       console.log(this.form)
+      if (this.form.propagandaContent.length - 7 > this.maxLength) {
+        this.$message({
+          type: "error",
+          message: "已达到最大输入长度"
+        });
+      }else{
 
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -1460,7 +1502,7 @@ export default {
           } else {
             if (this.diseaseTypeName == '请选择病种') {
               this.form.diseaseTypeName = null
-            } else if(this.diseaseTypeName){
+            } else if (this.diseaseTypeName) {
               this.form.diseaseTypeName = this.diseaseTypeName
             }
             addPropaganda(this.form).then(response => {
@@ -1473,6 +1515,7 @@ export default {
           }
         }
       });
+    }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -1498,7 +1541,6 @@ export default {
 // ::v-deep .el-form-item--medium .el-form-item__content{
 //   width: 800px;
 
-
 // }
 .propagandaselect {
   width: 100px;

src/views/manage/script/index.vue

@@ -756,11 +756,19 @@ export default {
     },
     // 预览点击
     handlesee(row) {
-      const id = row.id
+
+      if(row.scriptFilePath){
+        const id = row.id
       getScript(id).then(response => {
         this.form = response.data;
         this.dialogsee = true;
       });
+
+      }else{
+        this.$modal.msgError("暂无预览信息");
+
+      }
+
     },
 
     // 预览关闭

src/views/manage/template/index.vue

@@ -199,6 +199,7 @@
             v-model="form.templateContent"
             placeholder="请输入模板内容"
             type="textarea"
+            maxlength="300"
           />
 
           <!-- <editor v-model="form.templateContent" :min-height="192"/> -->

src/views/operationInfo/operationInfo/index.vue

@@ -7,6 +7,8 @@
       :inline="true"
       v-show="showSearch"
       label-width="68px"
+      @submit.native.prevent
+
     >
       <el-form-item label="手术名称" prop="operationName">
         <el-input

src/views/system/agency/index.vue

@@ -502,6 +502,7 @@
             v-model="form.agencySort"
             controls-position="right"
             :min="0"
+            :max="99999"
             placeholder="请输入机构排序"
             style="width: 208px"
           />

src/views/system/agencyCategory/index.vue

@@ -228,6 +228,7 @@
             v-model="form.categorySort"
             controls-position="right"
             :min="0"
+            :max="99999"
             placeholder="请输入类别排序"
             style="width: 250px"
           />

src/views/system/record/record.vue

@@ -388,7 +388,7 @@
                 <el-input
                   disabled
                   type="textarea"
-                  style="width: 500px;"
+                  style="width: 500px"
                   v-model="formlists.textRemindContent"
                   placeholder="请输入提醒内容"
                 />
@@ -430,22 +430,17 @@ export default {
       formlist: {},
       materialsFilePath: "",
       materialsType: "",
-      // rules: {
-      //   routeHandleRemark: [
-      //     { required: true, message: "请输入任务处理信息", trigger: "change" },
-      //   ],
-      // },
     };
   },
   created() {
     console.log(this.$route.query);
     this.info();
+    // 文字提醒
     if (this.$route.query.textRemindContent) {
       this.formlists.textRemindContent = this.$route.query.textRemindContent;
     }
-    if(  this.$route.query.routeHandleRemark){
-      this.formlist.routeHandleRemark =
-            this.$route.query.routeHandleRemark;
+    if (this.$route.query.routeHandleRemark) {
+      this.formlist.routeHandleRemark = this.$route.query.routeHandleRemark;
     }
     // 文章末班
     if (this.$route.query.taskType == "PROPAGANDA_ARTICLE") {
@@ -484,8 +479,6 @@ export default {
         if (this.$route.query.routeHandleRemark) {
           this.questiondata.routeHandleRemark =
             this.$route.query.routeHandleRemark;
-          
-            
         }
 
         this.questiondata.subjectResultList.forEach((e) => {
@@ -569,7 +562,7 @@ export default {
 };
 </script>
   <style lang="scss" scoped>
-  .tk {
+.tk {
   ::v-deep .el-textarea__inner {
     margin: 20px 0 10px 30px;
   }