소스 검색

Merge remote-tracking branch 'origin/dragTerm1025-zsw' into test

zhouna 3 년 전
부모
커밋
0eaafc488b

+ 1 - 1
.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+/.history
 
 # local env files
 .env.local
@@ -19,4 +20,3 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
-*.history

+ 1 - 1
src/api/utils.js

@@ -40,7 +40,7 @@ let width = '',//屏幕宽度
   addPart = null;//展开区域,这个展开的宽度应当是固定宽度了
 /**
  * 
- * @param {事件对象} event 
+ * @param {事件对象} event
  * @param {被拖动的元素} dragModalWrap
  * @param {可拖动的区域} dragModalTitle 
  */

+ 124 - 47
src/components/callRecord/CallRecordManager.vue

@@ -1,52 +1,46 @@
 <template>
   <div>
-    <crumbs title="调用记录" style="min-width: 1200px" class="knowledgeTitle">
-      <el-form :inline="true" :rules="rulesForm" class="demo-form-inline">
+    <crumbs title="调用记录" style="min-width: 980px;" class="knowledgeTitle">
+      <el-form :inline="true"  class="demo-form-inline">
         <el-form-item label="患者标识:" prop="patientId">
           <el-input
             size="mini"
             v-model="filter.patientId"
-            placeholder="输入规则名称"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="服务名称:" prop="sceneName">
-          <el-input
-            size="mini"
-            v-model="filter.sceneName"
-            placeholder="输入规则名称"
+            placeholder="请输入患者标识"
             clearable
+            maxlength="50"
           ></el-input>
         </el-form-item>
+        
         <el-form-item label="接收时间: ">
           &nbsp;&nbsp;
           <el-date-picker
-            v-model="recepDate"
+            v-model="filter.recepDate"
             type="datetimerange"
             align="right"
             size="small"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             style="width: 240px"
-            :default-time="['12:00:00', '08:00:00']"
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="响应时间: "
           >&nbsp;&nbsp;
           <el-date-picker
-            v-model="resDate"
+            v-model="filter.resDate"
             type="datetimerange"
             align="right"
             size="small"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             style="width: 240px"
-            :default-time="['12:00:00', '08:00:00']"
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
           >
           </el-date-picker>
         </el-form-item>
@@ -77,7 +71,16 @@
           <el-button size="mini" @click="filterDatas">确认</el-button>
         </el-form-item> -->
       </el-form>
-      <el-form class="secLine" :rules="rulesForm" :inline="true">
+      <el-form class="secLine" :inline="true">
+        <el-form-item label="服务名:" prop="sceneName">
+          <el-input
+            size="mini"
+            v-model="filter.sceneName"
+            placeholder="请输入服务名"
+            clearable
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="状态:">
           <el-select
             v-model="filter.successFlag"
@@ -93,12 +96,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区:">
+        <el-form-item label="院区:" prop="subHospitalName">
           <el-input
             size="mini"
             v-model="filter.subHospitalName"
-            placeholder="输入规则名称"
+            placeholder="请输入子院区"
             clearable
+            maxlength="50"
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -188,17 +192,36 @@
           align="center"
           width="100"
         ></el-table-column>
-        <el-table-column label="状态" width="100" fixed="right" align="center">
+        <el-table-column label="状态" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="editData(scope.row.parId)"
-              align="center"
-              :style="scope.row.successFlag === 1? 'color: #48c5d7;' : 'color:#ff0000'"
-            >
-              {{ scope.row.successFlag === 1 ? "成功" : "失败" }}
-            </el-button>
+            <span>
+                {{ scope.row.successFlag === 1 ? "成功" : "失败" }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="subHospitalName"
+          label="子院区"
+          align="center"
+          width="120"
+          show-overflow-tooltip
+        >
+        <template slot-scope="scope">
+            <span>
+              {{ scope.row.subHospitalName === null? '-' : scope.row.patientId }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="subHospitalCode"
+          label="子院区编码"
+          align="center"
+          width="100"
+        >
+        <template slot-scope="scope">
+            <span>
+              {{ scope.row.subHospitalCode === null? '-' : scope.row.patientId }}
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -216,20 +239,21 @@
       <el-dialog
         title="请求日志信息"
         :visible.sync="reqVisible"
-        width="450px"
-        height="280px"
+        width="660px"
         >
-        <div>{{params}}</div>
+        <div class="request-item">
+          {{params}}
+        </div>
+        
       </el-dialog>
 
       <!-- 响应内容弹出框 -->
       <el-dialog
         title="响应日志信息"
         :visible.sync="respVisible"
-        width="450px"
-        height="280px"
+        width="660px"
         >
-        <div>{{result}}</div>
+        <div class="request-item">{{result}}</div>
       </el-dialog>
     </div>
   </div>
@@ -257,7 +281,9 @@ export default {
         successFlag: "",
         patientId: "",
         sceneName: "",
-        subHospitalName: '' // 院区
+        subHospitalName: '', // 子院区
+        recepDate: '', // 接收日期
+        resDate: '', // 响应日期
       },
       cacheData: {},
       currentPage: 1,
@@ -266,8 +292,7 @@ export default {
       pageLayout: config.pageLayout,
       total: 0,
       titleWidth: "970px", //头部最小宽度
-      recepDate: '', // 接收日期
-      resDate: '', // 响应日期
+      
       reqVisible: false,
       respVisible: false,
       params: '',
@@ -375,16 +400,43 @@ export default {
       if (isTurnPage && !this.searched) {
         this.clearFilter();
       }
+      console.log(this.filter.recepDate);
+      let startGmtReq,endGmtReq,startGmtResp,endGmtResp
+      if(this.filter.recepDate){
+        console.log(this.filter.recepDate[0].split(' '));
+        if(this.filter.recepDate[0].split(0,9) === this.filter.recepDate[1].split(0,9)){
+          if(this.filter.recepDate[0]){
+             startGmtReq =  this.filter.recepDate[0]+':00'
+             endGmtReq =  this.filter.recepDate[1]+':59'
+          }
+        }else{
+           startGmtReq =  this.filter.recepDate[0]+':00'
+           endGmtReq =  this.filter.recepDate[1]+':00'
+        }
+      }
+
+      if(this.filter.resDate){
+        if(this.filter.resDate[0].split(0,9) === this.filter.resDate[1].split(0,9)){
+          if(this.filter.resDate[0]){
+             startGmtResp =  this.filter.resDate[0]+':00'
+             endGmtResp =  this.filter.resDate[1]+':59'
+          }
+        }else{
+           startGmtResp =  this.filter.resDate[0]+':00'
+           endGmtResp =  this.filter.resDate[1]+':00'
+        }
+      }
+
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
         patientId: this.filter.patientId, // 患者标识
         sceneName: this.filter.sceneName, // 服务名
         successFlag: this.filter.successFlag,
-        startGmtReq: this.recepDate ? this.recepDate[0] : null,
-        endGmtReq: this.recepDate ? this.recepDate[1] : null,
-        startGmtResp: this.resDate ? this.resDate[0] : null,
-        endGmtResp: this.resDate ? this.resDate[1] : null,
+        startGmtReq: startGmtReq,
+        endGmtReq: endGmtReq,
+        startGmtResp: startGmtResp,
+        endGmtResp: endGmtResp,
         subHospitalName: this.filter.subHospitalName.trim()
       };
       return param;
@@ -465,8 +517,8 @@ export default {
         patientId: "",
         sceneName: "",
         subHospitalName: "",
-        recepDate: "",
-        resDate: ""
+        recepDate: '', // 接收日期
+        resDate: '', // 响应日期
       };
     },
     update() {
@@ -550,4 +602,29 @@ export default {
   color: #ff0000;
 }
 
+.code-name {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+   white-space: nowrap;
+   text-overflow: ellipsis;
+  -o-text-overflow:ellipsis;
+}
+
+/deep/.el-dialog {
+  width: 700px !important;
+}
+
+/deep/.el-dialog__body {
+  overflow-y: auto;
+  height: 505px;
+  width: 700px;
+  padding: 20px 0 30px;
+}
+
+.request-item {
+  padding: 0 20px;
+}
+
 </style>

+ 2 - 1
src/components/icss/AddMedicinePrompt.vue

@@ -206,7 +206,7 @@ export default {
   },
   created: function() {
     const { isEdit, data, isCopy } = this.$route.params;   
-    console.log(data)
+    console.log('静态数据???',data)
     if (isEdit || isCopy) {
       this.showType = data.type; // 编辑页确认显示类型
       this.isEdit = isEdit;
@@ -401,6 +401,7 @@ export default {
         this.form.prags.splice(i, 2, temp, it);
       }
     },
+    // 添加段落
     addParagraph(i) {
       this.form.prags.splice(i + 1, 0, {
         title: '',

+ 4 - 0
src/components/icss/MedicineInfoPg.vue

@@ -182,9 +182,13 @@ export default {
     reOrder(i) {
       this.$emit('reOrder', i, this.index);
     },
+    
+    // 添加段落
     addEmit() {
       this.$emit('add');
     },
+
+    // 删除段落
     delEmit() {
       this.$emit('del', this.index);
     },

+ 5 - 0
src/components/icss/MedicinePrompt.vue

@@ -426,4 +426,9 @@ body {
     max-width: 400px;
   }
 }
+
+.el-dialog__body {
+  overflow-y: auto;
+  height: 600px;
+}
 </style>

+ 9 - 0
src/components/icss/sonhospital/SonHospital.vue

@@ -156,6 +156,8 @@ export default {
         }
       });
     },
+
+    // 确定保存
     onSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
@@ -168,6 +170,7 @@ export default {
             item.errorCurrent = false;
           });
           api.saveHospitalRelation(params).then(res => {
+            console.log('添加的数据??', res);
             if (res.data.code === '0') {
               this.$message({
                 showClose: true,
@@ -229,6 +232,7 @@ export default {
       });
     },
 
+    // 添加
     add() {
       this.form.hospitalRelationVOList.push({
         name: '',
@@ -237,6 +241,8 @@ export default {
         errorCurrent: false
       });
     },
+
+    // 新增
     addIndex(i) {
       this.form.hospitalRelationVOList.splice(i + 1, 0, {
         name: '',
@@ -244,10 +250,13 @@ export default {
         errorOther: false,
         errorCurrent: false
       });
+      // 延迟执行
       this.$nextTick(() => {
         this.$refs.tableList.bodyWrapper.scrollTop += 55;
       });
     },
+    
+    // 删除
     delIndex(i) {
       this.form.hospitalRelationVOList.splice(i, 1);
     }

+ 132 - 107
src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -87,7 +87,7 @@
   .custom_table_header {
     vertical-align: middle;
     &::before {
-      content: '*';
+      content: "*";
       color: red;
       font-size: 12px;
       margin-right: 4px;
@@ -141,7 +141,11 @@
         <template slot-scope="scope">
           <div class="btn_box">
             <div class="btn_div">
-              <img @click="addGroup(scope)" src="../../images/add-new-rule-sub.png" alt />
+              <img
+                @click="addGroup(scope)"
+                src="../../images/add-new-rule-sub.png"
+                alt
+              />
             </div>
             <div class="btn_div" v-if="!isLastDate(scope.row.groupId)">
               <img
@@ -158,33 +162,44 @@
         label="附加信息"
         v-if="showMsg || showMsg2"
       >
-      
-        <template slot="header" slot-scope="scope">
-          <div :class="showMsg?'custom_table_header':''">附加信息</div>
+        <template slot="header">
+          <div :class="showMsg ? 'custom_table_header' : ''">附加信息</div>
         </template>
         <template slot-scope="scope">
           <el-form-item
             :prop="`klRuleByIdSub[${scope.$index}].subMsg`"
-            :rules="showMsg?rules.subMsg:showMsg2?rules.subMsgs:[]"
-            :class="scope.row.subMsg?'form-texarea':''"
+            :rules="showMsg ? rules.subMsg : showMsg2 ? rules.subMsgs : []"
+            :class="scope.row.subMsg ? 'form-texarea' : ''"
             class="texarea-form"
           >
             <el-input
               type="textarea"
-              :autosize="{minRows: 1,maxRows: 2}"
+              :autosize="{ minRows: 1, maxRows: 2 }"
               placeholder="请输入附加信息"
               v-model.trim="scope.row.subMsg"
             ></el-input>
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column width="80px" v-if="maxNum && maxNum > 1" label="基础规则" prop="groupType">
+      <el-table-column
+        width="80px"
+        v-if="maxNum && maxNum > 1"
+        label="基础规则"
+        prop="groupType"
+      >
         <template slot-scope="scope">
           <div class="btn_box">
             <div class="btn_div" v-if="!isMax(scope.row.groupId)">
-              <img @click="addChildGroup(scope)" src="../../images/add-new-rule-sub.png" alt />
+              <img
+                @click="addChildGroup(scope)"
+                src="../../images/add-new-rule-sub.png"
+                alt
+              />
             </div>
-            <div class="btn_div" v-if="klRuleByIdSub.length > 1 && !scope.row.disabled">
+            <div
+              class="btn_div"
+              v-if="klRuleByIdSub.length > 1 && !scope.row.disabled"
+            >
               <img
                 @click="$emit('delGroupChild', scope.row.groupChildId)"
                 src="../../images/add-new-rule-del.png"
@@ -344,8 +359,8 @@
                         validator: (rule, value, callback) => {
                           subMaxOperator(scope, rule, value, callback);
                         },
-                        trigger: ['change']
-                      }
+                        trigger: ['change'],
+                      },
                     ]"
                   >
                     <el-select
@@ -378,8 +393,8 @@
                         validator: (rule, value, callback) => {
                           subMaxValue(scope, rule, value, callback);
                         },
-                        trigger: ['change']
-                      }
+                        trigger: ['change'],
+                      },
                     ]"
                   >
                     <el-input
@@ -392,7 +407,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item :prop="`klRuleByIdSub[${scope.$index}].subMaxUnit`">
+                  <el-form-item
+                    :prop="`klRuleByIdSub[${scope.$index}].subMaxUnit`"
+                  >
                     <el-input
                       type="text"
                       @focus="setScrollRight"
@@ -419,8 +436,8 @@
                         validator: (rule, value, callback) => {
                           subMinOperatorRule(scope, rule, value, callback);
                         },
-                        trigger: ['change']
-                      }
+                        trigger: ['change'],
+                      },
                     ]"
                   >
                     <el-select
@@ -453,8 +470,8 @@
                         validator: (rule, value, callback) => {
                           subMinValueRule(scope, rule, value, callback);
                         },
-                        trigger: ['change']
-                      }
+                        trigger: ['change'],
+                      },
                     ]"
                   >
                     <el-input
@@ -467,7 +484,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item :prop="`klRuleByIdSub[${scope.$index}].subMinUnit`">
+                  <el-form-item
+                    :prop="`klRuleByIdSub[${scope.$index}].subMinUnit`"
+                  >
                     <el-input
                       type="text"
                       @focus="setScrollRight"
@@ -479,7 +498,10 @@
               </el-row>
             </el-form-item>
             <!-- v-if="klRuleByIdSub[scope.$index].subType !== 6 && klRuleByIdSub[scope.$index].dataType === '2'" -->
-            <div style="flex: 2" v-if="scope.row.subType != 6 && scope.row.dataType == '2'">
+            <div
+              style="flex: 2"
+              v-if="scope.row.subType != 6 && scope.row.dataType == '2'"
+            >
               <el-form-item
                 class="type_content_item"
                 style="width: 100%"
@@ -490,14 +512,14 @@
                   {
                     required: true,
                     message: '请输入' + textName(scope.$index),
-                    trigger: 'blur'
+                    trigger: 'blur',
                   },
                   {
                     validator: (rule, value, callback) => {
                       subEqValue(scope, rule, value, callback);
                     },
-                    trigger: 'blur'
-                  }
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input
@@ -522,14 +544,14 @@
                   {
                     required: true,
                     message: '请输入' + textName(scope.$index),
-                    trigger: 'blur'
+                    trigger: 'blur',
                   },
                   {
                     validator: (rule, value, callback) => {
                       subEqValue(scope, rule, value, callback);
                     },
-                    trigger: 'blur'
-                  }
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input
@@ -549,82 +571,83 @@
 </template>
 
 <script>
-import api from '@api/knowledgeLib.js';
-import { tableRules } from './rules';
+import api from "@api/knowledgeLib.js";
+import { tableRules } from "./rules";
 export default {
-  name: 'AddNewRuleTable',
+  name: "AddNewRuleTable",
   data() {
     return {
-      numTypes: '',
-      subConceptIdIndex: '',
+      numTypes: "",
+      subConceptIdIndex: "",
       operMaxList: [
-        { name: '<=', key: '<=' },
-        { name: '<', key: '<' }
+        { name: "<=", key: "<=" },
+        { name: "<", key: "<" },
       ],
       operMinList: [
-        { name: '>', key: '>' },
-        { name: '>=', key: '>=' }
+        { name: ">", key: ">" },
+        { name: ">=", key: ">=" },
       ],
       rules: tableRules,
-      theRef: null
+      theRef: null,
     };
   },
   methods: {
     setScrollRight() {
       this.$nextTick(() => {
-        this.$refs.table.bodyWrapper.scrollLeft = this.$refs.table.bodyWrapper.scrollWidth;
+        this.$refs.table.bodyWrapper.scrollLeft =
+          this.$refs.table.bodyWrapper.scrollWidth;
       });
     },
     maxChange(e, val, type) {
       if (
-        type === 'i' &&
+        type === "i" &&
         this.klRuleByIdSub[val].subMaxOperator &&
-        this.klRuleByIdSub[val].subMaxOperator != ''
+        this.klRuleByIdSub[val].subMaxOperator != ""
       ) {
-        this.$emit('clearValidate', [
+        this.$emit("clearValidate", [
           `klRuleByIdSub[${val}].subMinValue`,
-          `klRuleByIdSub[${val}].subMinOperator`
+          `klRuleByIdSub[${val}].subMinOperator`,
         ]);
       } else if (
-        type === 's' &&
+        type === "s" &&
         this.klRuleByIdSub[val].subMaxValue &&
-        this.klRuleByIdSub[val].subMaxValue != ''
+        this.klRuleByIdSub[val].subMaxValue != ""
       ) {
-        this.$emit('clearValidate', [
+        this.$emit("clearValidate", [
           `klRuleByIdSub[${val}].subMinValue`,
-          `klRuleByIdSub[${val}].subMinOperator`
+          `klRuleByIdSub[${val}].subMinOperator`,
         ]);
       }
       this.setScrollRight();
     },
     minChange(e, val, type) {
       if (
-        type === 'i' &&
+        type === "i" &&
         this.klRuleByIdSub[val].subMinOperator &&
-        this.klRuleByIdSub[val].subMinOperator != ''
+        this.klRuleByIdSub[val].subMinOperator != ""
       ) {
-        this.$emit('clearValidate', [
+        this.$emit("clearValidate", [
           `klRuleByIdSub[${val}].subMaxOperator`,
-          `klRuleByIdSub[${val}].subMaxValue`
+          `klRuleByIdSub[${val}].subMaxValue`,
         ]);
       } else if (
-        type === 's' &&
+        type === "s" &&
         this.klRuleByIdSub[val].subMinValue &&
-        this.klRuleByIdSub[val].subMinValue != ''
+        this.klRuleByIdSub[val].subMinValue != ""
       ) {
-        this.$emit('clearValidate', [
+        this.$emit("clearValidate", [
           `klRuleByIdSub[${val}].subMaxOperator`,
-          `klRuleByIdSub[${val}].subMaxValue`
+          `klRuleByIdSub[${val}].subMaxValue`,
         ]);
       }
       this.setScrollRight();
     },
     addGroup(scope) {
-      this.$emit('addGroup', null, { groupId: scope.row.groupId });
+      this.$emit("addGroup", null, { groupId: scope.row.groupId });
       this.$refs.table.bodyWrapper.scrollLeft = 0;
     },
     addChildGroup(scope) {
-      this.$emit('addGroup', scope.row.groupId, { index: scope.$index });
+      this.$emit("addGroup", scope.row.groupId, { index: scope.$index });
       this.$refs.table.bodyWrapper.scrollLeft = 0;
     },
     scrollFun() {
@@ -641,16 +664,16 @@ export default {
     // },
     // cellStyle
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.label == '组' || column.label == '基础规则') return {};
-      if (column.label == '附加信息') return { 'padding-top': '14px' };
-      return { 'vertical-align': 'top', 'padding-top': '14px' };
+      if (column.label == "组" || column.label == "基础规则") return {};
+      if (column.label == "附加信息") return { "padding-top": "14px" };
+      return { "vertical-align": "top", "padding-top": "14px" };
     },
     // 最大值 选择rule
     subMaxOperator(scope, rule, value, callback) {
       const { subMaxValue, subMinOperator, subMinValue } = scope.row;
       const val = value + subMinOperator + subMinValue + subMaxValue;
-      if (!val || (!value && subMaxValue !== '')) {
-        callback(new Error('最大值和最小值至少完整填写一个,单位不必填'));
+      if (!val || (!value && subMaxValue !== "")) {
+        callback(new Error("最大值和最小值至少完整填写一个,单位不必填"));
       } else {
         callback();
       }
@@ -660,10 +683,10 @@ export default {
       const { subMaxOperator, subMinOperator, subMinValue } = scope.row;
       const val = value + subMaxOperator + subMinValue + subMinOperator;
       const isNum = /^(\-|\+)?\d+(\.\d+)?$/.test(value);
-      if (!val || (value == '' && subMaxOperator)) {
-        callback(new Error('最大值和最小值至少完整填写一个,单位不必填'));
-      } else if (value !== '' && !isNum) {
-        callback(new Error('只能输入数字'));
+      if (!val || (value == "" && subMaxOperator)) {
+        callback(new Error("最大值和最小值至少完整填写一个,单位不必填"));
+      } else if (value !== "" && !isNum) {
+        callback(new Error("只能输入数字"));
       } else {
         callback();
       }
@@ -672,8 +695,8 @@ export default {
     subMinOperatorRule(scope, rule, value, callback) {
       const { subMaxValue, subMaxOperator, subMinValue } = scope.row;
       const val = value + subMaxOperator + subMinValue + subMaxValue;
-      if (!val || (!value && subMinValue !== '')) {
-        callback(new Error('最大值和最小值至少完整填写一个,单位不必填'));
+      if (!val || (!value && subMinValue !== "")) {
+        callback(new Error("最大值和最小值至少完整填写一个,单位不必填"));
       } else {
         callback();
       }
@@ -683,39 +706,41 @@ export default {
       const { subMaxValue, subMinOperator, subMaxOperator } = scope.row;
       const val = value + subMaxOperator + subMaxValue + subMinOperator;
       const isNum = /^(\-|\+)?\d+(\.\d+)?$/.test(value);
-      if (!val || (value == '' && subMinOperator)) {
-        callback(new Error('最大值和最小值至少完整填写一个,单位不必填'));
-      } else if (value !== '' && !isNum) {
-        callback(new Error('只能输入数字'));
+      if (!val || (value == "" && subMinOperator)) {
+        callback(new Error("最大值和最小值至少完整填写一个,单位不必填"));
+      } else if (value !== "" && !isNum) {
+        callback(new Error("只能输入数字"));
       } else {
         callback();
       }
     },
     // 医学内容rule
     subEqValue(scope, rule, value, callback) {
-      if (value === '') {
-        callback(new Error('请输入' + this.textName(scope.$index)));
+      if (value === "") {
+        callback(new Error("请输入" + this.textName(scope.$index)));
       } else if (value.length > 200) {
-        callback(new Error(this.textName(scope.$index) + '不能超过200字'));
+        callback(new Error(this.textName(scope.$index) + "不能超过200字"));
       } else {
         callback();
       }
     },
     // 判断是否为最后一条规则
     isLastDate(id) {
-      const tableLength = this.klRuleByIdSub.filter(item => item.groupId !== id)
-        .length;
+      const tableLength = this.klRuleByIdSub.filter(
+        (item) => item.groupId !== id
+      ).length;
       return tableLength === 0;
     },
     // 是否超出最大规则数
     isMax(id) {
-      const typeNum = this.klRuleByIdSub.filter(item => item.groupId === id)
-        .length;
+      const typeNum = this.klRuleByIdSub.filter(
+        (item) => item.groupId === id
+      ).length;
       return typeNum >= this.maxNum;
     },
     // 基础规则类型选择
     subTypeChange(e, index) {
-      this.$emit('subTypeChange', e, index);
+      this.$emit("subTypeChange", e, index);
     },
     //
     setTheRef(e, val) {
@@ -724,17 +749,17 @@ export default {
     // 规则术语类型
     subCodeChange(val, index) {
       //基础规则术语类型修改
-      this.$emit('childSubCodeChange', val, index, this.numTypes);
+      this.$emit("childSubCodeChange", val, index, this.numTypes);
     },
     clearConcept(index) {
-      this.$emit('childClearConcept', index);
+      this.$emit("childClearConcept", index);
     },
     clearNumText(index) {
-      this.$emit('childClearNumText', index);
+      this.$emit("childClearNumText", index);
     },
     //医学标准术语change
     subConceptIdfocus(index) {
-      this.subConceptIdIndex = '';
+      this.subConceptIdIndex = "";
       this.subConceptIdIndex = index;
       this.setTheRef(1, `klRuleByIdSub[${index}].subConceptId`);
     },
@@ -742,25 +767,25 @@ export default {
     searchConcept(val) {
       const param = {
         excludedConceptIds: [
-          this.klRuleByIdSub[this.subConceptIdIndex].subType
+          this.klRuleByIdSub[this.subConceptIdIndex].subType,
         ],
         libType: this.klRuleByIdSub[this.subConceptIdIndex].subLenCode,
         name: val,
       };
       api
         .searchConcept(param)
-        .then(res => {
-          if (res.data.code == '0') {
+        .then((res) => {
+          if (res.data.code == "0") {
             const data = res.data.data;
-            this.$emit('setFormData', this.subConceptIdIndex, data);
+            this.$emit("setFormData", this.subConceptIdIndex, data);
           }
         })
-        .catch(error => {
+        .catch((error) => {
           console.log(error);
         });
     },
     dataTypeChange(val, index) {
-      this.$emit('ChildDataTypeChange', val, index);
+      this.$emit("ChildDataTypeChange", val, index);
     },
     // 处理要合并相同行的列
     getSpanArr(data) {
@@ -793,13 +818,13 @@ export default {
     },
     // 合并单元格
     ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (this.ruleTermCodeStr == '3-108-1') {
+      if (this.ruleTermCodeStr == "3-108-1") {
         if (columnIndex == 0) {
           const _row = this.spanArr[rowIndex];
           const _col = _row > 0 ? 1 : 0;
           return {
             rowspan: _row,
-            colspan: _col
+            colspan: _col,
           };
         }
       } else {
@@ -808,23 +833,23 @@ export default {
           const _col = _row > 0 ? 1 : 0;
           return {
             rowspan: _row,
-            colspan: _col
+            colspan: _col,
           };
         }
       }
     },
     showDataType(index) {
       return (
-        (this.numTypes + ',').indexOf(
-          this.klRuleByIdSub[index].subLenCode + ','
+        (this.numTypes + ",").indexOf(
+          this.klRuleByIdSub[index].subLenCode + ","
         ) === -1
       );
     },
     textName(index) {
       return this.klRuleByIdSub[index].subType !== 6 &&
-        this.klRuleByIdSub[index].dataType == '2'
-        ? '医学内容'
-        : '正则表达式';
+        this.klRuleByIdSub[index].dataType == "2"
+        ? "医学内容"
+        : "正则表达式";
     },
     blurRef() {
       if (this.theRef) {
@@ -833,7 +858,7 @@ export default {
         // document.getElementById(this.theRef).focus()
         // document.getElementById(this.theRef).value = 123
       }
-    }
+    },
   },
   components: {},
   mounted() {
@@ -847,7 +872,7 @@ export default {
     // );
   },
   created() {
-    this.numTypes = localStorage.getItem('zskNumDict');
+    this.numTypes = localStorage.getItem("zskNumDict");
     this.getSpanArr(this.klRuleByIdSub);
   },
   beforeUpdate() {
@@ -875,21 +900,21 @@ export default {
   props: {
     klRuleByIdSub: {
       type: Array,
-      required: true
+      required: true,
     },
     maxNum: {
-      default: null
+      default: null,
     },
     showMsg: {
-      default: null
+      default: null,
     },
-    showMsg2:{
-      default: null
+    showMsg2: {
+      default: null,
     },
     ruleTermCodeStr: {
-      default: null
+      default: null,
     },
-  }
+  },
 };
 </script>
 

+ 4 - 4
src/components/knowledgeExtra/RuleManager.vue

@@ -42,7 +42,7 @@
     <div class="contents knowledgeContents">
       <el-table :data="list" border style="width: 100%">
         <el-table-column type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
-        <el-table-column prop="parDescription" label="规则名称" width="160">
+        <el-table-column prop="parDescription" label="规则名称" width="180">
           <template slot-scope="scope">
             <!--<el-tooltip
               v-if="scope.row.parDescription.length>8"
@@ -59,7 +59,7 @@
         <el-table-column prop="parRuleType" label="规则类型" width="150">
           <template slot-scope="scope">{{statusTrans(scope.row.parRuleType)}}</template>
         </el-table-column>
-        <el-table-column prop="parConceptName" label="医学标准术语" width="160">
+        <el-table-column prop="parConceptName" label="医学标准术语" width="180">
           <template slot-scope="scope">
             <!--<el-tooltip
               v-if="scope.row.parConceptName.length>8"
@@ -73,11 +73,11 @@
             <span>{{scope.row.parConceptName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parLibTypeName" label="术语类型" width="150"></el-table-column>
+        <el-table-column prop="parLibTypeName" label="术语类型" width="180"></el-table-column>
         <el-table-column prop="parHasSub" label="有无子条件" width="100">
           <template slot-scope="scope">{{scope.row.parHasSub == '0'?'无':'有'}}</template>
         </el-table-column>
-        <el-table-column label="状态">
+        <el-table-column label="状态" width="150">
           <template slot-scope="scope">
             <span>{{scope.row.parStatus === 0?'禁用':'启用'}}</span>
           </template>

+ 1 - 0
vue.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 // const proxy_path = 'http://192.168.2.241:80';
 // const proxy_path = 'http://192.168.2.236:88';
 const proxy_path = 'http://192.168.2.236:6060';
+//const proxy_path = 'http://192.168.2.241:6060';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.113:5050'; //王峰