cc12458 1 рік тому
батько
коміт
ba0d5b3bdf

+ 1 - 1
src/components/ChineseMedicine.vue

@@ -1841,7 +1841,7 @@ export default {
       }
 
       let obj = {
-        color: "#000",
+        color: item.kc == 0 ? "red" : "#000",
         id: scope.row.id,
         name: item.ypmc,
         spec: item.gg, // 规格

+ 5 - 0
src/views/business/components/PriviewEdit.vue

@@ -277,6 +277,11 @@ export default {
       deep: true,
       handler: function() {
         this.editList = JSON.parse(JSON.stringify(this.editListF));
+        this.editList.forEach(item => {
+          if (item.level == 1 && item.id == 4) {
+            item.inputDefaultValue = "";
+          }
+        });
       }
     },
     editList: {

+ 27 - 5
src/views/diagnosis/Emr.vue

@@ -376,7 +376,9 @@ export default {
         const resultList = [];
         for (let i = 0; i < childrenList.length; i++) {
           const item = childrenList[i];
+
           resultList.push(item);
+
           if (item.children) {
             resultList.push(...joinChildren(item.children));
           }
@@ -405,7 +407,9 @@ export default {
     backUploadData() {
       let sourceData = JSON.parse(JSON.stringify(this.$refs.edit.editList));
       let list = this.flat(sourceData);
+
       let joinArr = this.joinList(list);
+
       const paramsData = {
         chiefcomplaint: "", // 主诉
         fourmedicine: "", // 中医四诊
@@ -484,20 +488,26 @@ export default {
 
       return paramsData;
     },
-    // 获取与目标数组中不同的部
+    // 获取与目标数组中不同的部
     findDifferences(arr1, arr2) {
       return arr2.filter(value => !arr1.includes(value));
     },
-    // 获取与目标数组中相同的部
+    // 获取与目标数组中相同的部
     findSame(arr1, arr2) {
       return arr2.filter(value => arr1.includes(value));
     },
+    // 去重
+    removeRepate(arr) {
+      let arr1 = new Set(arr);
+      return Array.from(arr1);
+    },
     // 回显的值 赋值给模板
     showMsgToTem(data) {
       let _this = this;
       const paramsData = {
         chiefcomplaint: data.chiefcomplaint, // 主诉
-        fourmedicine: data.fourmedicine, // 中医四诊
+        // fourmedicine: data.fourmedicine, // 中医四诊
+        fourmedicine: "",
         historypresent: data.historypresent, // 现病史
         pasthistory: data.pasthistory, // 既往史
         physicalexamination: data.physicalexamination, // 体格检查
@@ -505,6 +515,7 @@ export default {
         echoData: JSON.parse(data.echoData)
       };
       let tem = this.$refs.edit.editList;
+
       tem.forEach(item => {
         if (
           item.id == 1 &&
@@ -576,7 +587,12 @@ export default {
               let diffValues = _this.findDifferences(radioLabels, echoItem);
 
               otherStr = diffValues.join(";");
-              item.fillValues = _this.findSame(radioLabels, echoItem);
+              item.fillValues = [
+                ...item.fillValues,
+                ..._this.findSame(radioLabels, echoItem)
+              ];
+
+              item.fillValues = _this.removeRepate(item.fillValues);
 
               item.radioList.forEach(item1 => {
                 if (echoItem.includes(item1.label)) {
@@ -783,7 +799,13 @@ export default {
                   this.temItem.templateContent = JSON.parse(
                     res.Data[0].templateContent
                   );
-                  this.showMsgToTem(res.Data[0]);
+
+                  //
+                  let tem = this.$refs.edit.editList;
+                  setTimeout(() => {
+                    this.showMsgToTem(res.Data[0]);
+                  }, 1000);
+
                   throw Error();
                 }
               });

+ 2 - 2
vue.config.js

@@ -13,8 +13,8 @@ module.exports = {
 
                 // target: `http://192.168.1.10:8080/`, //王志飞本地
                 // target: `http://cloudclinicapi.9czn.cn/`, // 测试地址
-                target: `http://115.236.184.102:8081/`, // 萧山物理机
-                // target: 'http://192.168.204.124:8081/', // 客户正式服务器"
+                // target: `http://115.236.184.102:8081/`, // 萧山物理机
+                target: 'http://192.168.204.124:8081/', // 客户正式服务器"
 
                 // target: `http://www.hzxunmai.com/`, // 正式域名
                 // target: `http://10.250.11.48:8080/`, // 正式域名