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

src/api/system/ManuallyCreatingTasks.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 新增手动创建任务
+export function signrouteadd(data) {
+    return request({
+        url: '/manage/signroute/add',
+        method: 'post',
+        data
+    })
+}

src/views/manage/projectgroup/index.vue

@@ -117,7 +117,12 @@
         </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="groupSort" />
-      <el-table-column label="备注信息" align="center" prop="groupRemark"  :show-overflow-tooltip="true" />
+      <el-table-column
+        label="备注信息"
+        align="center"
+        prop="groupRemark"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -153,7 +158,12 @@
     />
 
     <!-- 添加或修改检测项目分组对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
       <el-form
         ref="form"
         :model="form"

src/views/manage/visitin/index.vue

@@ -269,7 +269,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="住院号" prop="inHospitalNumber">
-          <el-input v-model="form.inHospitalNumber" placeholder="请输入住院号" style="width:200px" />
+          <el-input v-model="form.inHospitalNumber" placeholder="请输入住院号" style="width:200px"
+            onKeyUp="value=value.replace(/[\W]/g,'')" />
         </el-form-item>
         <el-form-item label="责任护士" prop="responsibleNurse">
           <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />

src/views/manage/visitout/index.vue

@@ -269,10 +269,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="门诊号" prop="inHospitalNumber" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
-          <el-input v-model="form.inHospitalNumber" placeholder="请输入门诊号" style="width:200px" />
+          <el-input v-model="form.inHospitalNumber" placeholder="请输入门诊号" style="width:200px"
+            onKeyUp="value=value.replace(/[\W]/g,'')" />
         </el-form-item>
         <el-form-item label="住院号" prop="inHospitalNumber" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <el-input v-model="form.inHospitalNumber" placeholder="请输入住院号" style="width:200px" />
+          <el-input v-model="form.inHospitalNumber" placeholder="请输入住院号" style="width:200px"
+            onKeyUp="value=value.replace(/[\W]/g,'')" />
         </el-form-item>
         <el-form-item label="责任护士" prop="responsibleNurse" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />

src/views/system/ManuallyCreatingTasks/index.vue

@@ -6,9 +6,9 @@
             </div>
             <el-descriptions title="手动创建任务">
             </el-descriptions>
-            <el-form :inline="true" :model="updata" class="demo-form-inline">
+            <el-form :inline="true" :model="updata" class="demo-form-inline" ref="updata">
                 <el-form-item label="任务名称">
-                    <el-input v-model="updata.routeName" placeholder="审批人"></el-input>
+                    <el-input v-model="updata.routeName"></el-input>
                 </el-form-item>
                 <el-form-item label="适用范围">
                     <el-select v-model="updata.suitRange">
@@ -19,10 +19,30 @@
                     </el-select>
                 </el-form-item>
             </el-form>
-            <el-form :inline="true" :model="updata" class="demo-form-inline">
+            <div class="chufatitle">
-                <el-form-item label="任务名称">
+                <span>触发条件</span>
-                    <el-input v-model="updata.routeName" placeholder="审批人"></el-input>
+                <el-button type="primary" plain size="mini" @click="addtriggerCondition">添加触发条件</el-button>
-                </el-form-item>
+            </div>
+            <el-form ref="updata" :model="updata" label-width="80px">
+                <div class="node" v-for="(item, index) in updata.triggerConditionList" :key="index"
+                    :style="updata.triggerConditionList.length > 1 ? '' : 'margin:0'">
+                    <div style="display: inline-block;margin-right:20px;font-size:14px">触发条件{{ index + 1 }}</div>
+                    <el-select v-model="item.triggerConditionName" style="width:120px">
+                        <el-option label="诊断" value="DIAGNOSIS" />
+                        <el-option label="换药日期" value="DRESSING_CHANGE_DATE" />
+                        <el-option label="治疗方式" value="TREATMENT_METHOD" />
+                        <el-option label="手术名称" value="SURGICAL_NAME" />
+                        <el-option label="药品名称" value="DRUG_NAME" />
+                    </el-select>
+                    <el-select v-model="item.triggerConditionOperator" style="width: 100px;">
+                        <el-option label="包含" value="CONTAIN" />
+                        <el-option label="不包含" value="NOT_CONTAIN" />
+                        <el-option label="等于" value="EQUAL_TO" />
+                        <el-option label="不等于" value="NOT_EQUAL_TO" />
+                    </el-select>
+                    <el-input v-model="item.triggerConditionValue" style="width: 300px;"
+                        placeholder="请输入触发条件"></el-input>
+                </div>
             </el-form>
         </div>
         <div class="nodes">
@@ -128,6 +148,9 @@
 import propaganda from '../components/propaganda.vue'
 import scriptphone from '../components/script.vue'
 import question from '../components/question.vue'
+import {
+    signrouteadd
+} from '@/api/system/ManuallyCreatingTasks'
 export default {
     components: { scriptphone, question, propaganda },
     name: "ManuallyCreatingTasks",
@@ -135,7 +158,15 @@ export default {
         return {
             updata: {
                 routeName: '',
-                suitRange: ''
+                suitRange: '',
+                routeNodeList: [],
+                triggerConditionList: [{
+                    routeId: '',
+                    routeName: '',
+                    triggerConditionName: '',
+                    triggerConditionOperator: '',
+                    triggerConditionValue: '',
+                }],
             },
             formInline: {
                 routeNodeDay: '',
@@ -178,6 +209,15 @@ export default {
         this.formInline = this.list[0]
     },
     methods: {
+        addtriggerCondition() {
+            this.updata.triggerConditionList.push({
+                routeId: '',
+                routeName: '',
+                triggerConditionName: '',
+                triggerConditionOperator: '',
+                triggerConditionValue: '',
+            })
+        },
         //宣教传值
         propagandaontemplate(item) {
             this.formInline.propagandaInfoId = item.templateId
@@ -219,12 +259,31 @@ export default {
             this.list.splice(index, 1)
         },
         upload() {
-            console.log(this.list)
+            this.updata.routeNodeList = this.list
+            signrouteadd(this.updata).then(res => {
+
+            })
         },
     }
 };
 </script>
 <style lang="scss" scoped>
+.chufatitle {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+
+    span {
+        margin-right: 30px;
+        font-size: 16px;
+        font-weight: bold;
+    }
+}
+
+.node {
+    margin-bottom: 10px;
+}
+
 .PushMethod {
     height: 100px;
     padding: 20px;
@@ -245,7 +304,7 @@ export default {
     background-color: #F1F3F5;
     height: 700px;
     display: flex;
-    justify-content: space-evenly;
+    justify-content: space-between;
     padding-top: 20px;
 
     .nodenames {
@@ -272,7 +331,7 @@ export default {
 
     .nodetexts {
         border-radius: 10px;
-        width: 70%;
+        width: 73%;
         height: 700px;
     }
 }

src/views/system/agency/index.vue

@@ -379,6 +379,7 @@
             maxlength="20"
             v-model="form.agencyCode"
             style="width: 205px"
+            onKeyUp="value=value.replace(/[\W]/g,'')"
             placeholder="请输入机构代码"
           />
         </el-form-item>
@@ -765,6 +766,7 @@ export default {
     this.infolist();
   },
   methods: {
+
     // 节点类型
     info() {
       var dictType = "node_type";

src/views/system/department/index.vue

@@ -351,6 +351,7 @@
           <el-form-item label="科室代码" prop="departmentCode">
             <el-input
               maxlength="30"
+              onKeyUp="value=value.replace(/[\W]/g,'')"
               v-model="form.departmentCode"
               placeholder="请输入科室代码"
             />