Merge branch 'external/1206' into develop

src/utils/minix/prescribing.js

@@ -141,7 +141,7 @@ export default {
 
             let isShowDj = e.displayAgency == 0 ? true : false // 是否展示代煎 0 展示 1不展示
             let isShowPs = e.displayDelivery == 0 ? true : false // 是否展示配送 0 展示 1不展示
-            // this.isDaiJian = e.defaultAgency == 0 ? 1 : ''
+            this.isDaiJian = e.defaultAgency == 0 ? 1 : 2
             this.isShowDj = isShowDj
             this.isShowPs = isShowPs
 

src/views/business/Recipe.vue

@@ -129,7 +129,7 @@
           <el-table-column prop="state" label="状态" width="70">
             <template
               slot-scope="scope"
-            >{{scope.row.paystate==0?'未支付':scope.row.paystate==1?'已支付':scope.row.paystate==2?'已作废':''}}</template>
+            >{{scope.row.paystate==0?'未支付':scope.row.paystate==1?'已支付':scope.row.paystate==2?'已作废':'已作废'}}</template>
           </el-table-column>
           <el-table-column prop="revierwstate" label="审核状态" width="80">
             <template

src/views/diagnosis/Emr.vue

@@ -572,56 +572,58 @@ export default {
           item.inputDefaultValue = paramsData.supplementaryexamination;
         }
       });
-      // console.log(paramsData.echoData);
-      // console.log(tem);
-
-      for (let i in paramsData.echoData) {
-        let labelKey = i.split("-")[1];
-        let flabelKey = i.split("-")[0];
-        let echoItem = paramsData.echoData[i];
-        let otherStr = ""; // 其他选项
-        let isFind = false; // 是否查找到了
-        tem.forEach(item => {
-          // if (labelKey == item.inputValue && item.selectValue == "fill") {
-
-          if (i == flabelKey + "-" + item.inputValue) {
-            if (item.selectValue == "fill") {
-              isFind = true;
-              let radioLabels = item.radioList.map(item1 => item1.label);
-              let diffValues = _this.findDifferences(radioLabels, echoItem);
-
-              otherStr = diffValues.join(";");
-              item.fillValues = [
-                ...item.fillValues,
-                ..._this.findSame(radioLabels, echoItem)
-              ];
-
-              item.fillValues = _this.removeRepate(item.fillValues);
-
-              item.radioList.forEach(item1 => {
-                if (echoItem.includes(item1.label)) {
-                  item1.radioDefault = true;
-                }
-              });
-            }
-          } else {
-            if (!isFind) {
-              otherStr = echoItem.join(";");
+      console.log(paramsData.echoData);
+      //console.log(tem);
+      if (!data.updateTime) {
+        for (let i in paramsData.echoData) {
+          let labelKey = i.split("-")[1];
+          let flabelKey = i.split("-")[0];
+          let echoItem = paramsData.echoData[i];
+          let otherStr = ""; // 其他选项
+          let isFind = false; // 是否查找到了
+          tem.forEach(item => {
+            // if (labelKey == item.inputValue && item.selectValue == "fill") {
+
+            if (i == flabelKey + "-" + item.inputValue) {
+              if (item.selectValue == "fill") {
+                isFind = true;
+                let radioLabels = item.radioList.map(item1 => item1.label);
+                let diffValues = _this.findDifferences(radioLabels, echoItem);
+
+                otherStr = diffValues.join(";");
+                item.fillValues = [
+                  ...item.fillValues,
+                  ..._this.findSame(radioLabels, echoItem)
+                ];
+
+                item.fillValues = _this.removeRepate(item.fillValues);
+
+                item.radioList.forEach(item1 => {
+                  if (echoItem.includes(item1.label)) {
+                    item1.radioDefault = true;
+                  }
+                });
+              }
+            } else {
+              if (!isFind) {
+                otherStr = echoItem.join(";");
+              }
             }
-          }
 
-          if (item.inputValue == flabelKey + "—其他") {
-            if (otherStr) {
-              if (item.inputDefaultValue) {
-                item.inputDefaultValue =
-                  item.inputDefaultValue + ";" + otherStr;
-              } else {
-                item.inputDefaultValue = otherStr;
+            if (item.inputValue == flabelKey + "—其他") {
+              if (otherStr) {
+                if (item.inputDefaultValue) {
+                  item.inputDefaultValue =
+                    item.inputDefaultValue + ";" + otherStr;
+                } else {
+                  item.inputDefaultValue = otherStr;
+                }
               }
             }
-          }
-        });
+          });
+        }
       }
+
       this.temItem.templateContent = [];
       this.temItem.templateContent = tem;
     },
@@ -724,6 +726,14 @@ export default {
         });
         this.isEdit = false;
         if (next) {
+          if (next == "none") {
+            let msg = {
+              origin: "EMR",
+              msg: "刷新数据"
+            };
+            window.parent.postMessage(JSON.stringify(msg), "*");
+            return;
+          }
           next();
         } else {
           setTimeout(() => {
@@ -774,7 +784,11 @@ export default {
           showClose: true
         });
         // this.isEdit = false;
-        this.editEMR("none");
+        if (this.pid) {
+          this.editEMR("none");
+          return;
+        }
+        this.addEMR("none");
 
         // console.log("消息发送成功");
       }

src/views/diagnosis/components/medAddressNew.vue

@@ -223,7 +223,11 @@ export default {
       if (data === null) {
         this.form.isDaiJian = this.form.isDaiJian == 1 ? 0 : 1;
       } else {
-        this.form.isDaiJian = data;
+        if (this.form.isDaiJian == data) {
+          this.form.isDaiJian = 2;
+        } else {
+          this.form.isDaiJian = data;
+        }
       }
 
       this.$emit("djChange", this.form.isDaiJian);

src/views/diagnosis/components/submitRecipe.vue

@@ -670,6 +670,11 @@ export default {
         loading.close();
       });
       if (res.ResultCode == 0) {
+        let msg = {
+          origin: "Recipe",
+          msg: "刷新数据"
+        };
+        window.parent.postMessage(JSON.stringify(msg), "*");
         this.$message.success("修改成功");
         setTimeout(() => {
           loading.close();