Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/data/printTemplate.vue

@@ -167,8 +167,7 @@ export default {
       imgUrl_Two: require("@/assets/home/2.jpg"),
       imgUrl_Five: require("@/assets/home/5.jpg"),
 
-      url:
-        "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
+
       imgs_one: [
         // 'https://images.shengws.com/template_one.jpg'
         "https://images.shengws.com/fangji.jpg"
@@ -187,7 +186,7 @@ export default {
   methods: {
     change: function(val) {
       console.log("val是什么", val);
-      this.$confirm("是否切换模版", "提示", {
+      this.$confirm("切换模版后，透析记录的字段会根据打印单来显示与隐藏，是否确定切换模版", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "info"
@@ -201,8 +200,7 @@ export default {
               this.tempRadio = template_id.toString();
               // 同步
               this.loading = false;
-
-              // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -939,31 +939,31 @@
                             </div>
                           </td>
                           <td>
-                            <span
-                              v-if="
-                                setAdminUserES(
-                                  record.assessment_before_dislysis,
-                                  'creater'
-                                ) == ''
-                              "
-                              >{{
-                                getAdminUser(
-                                  record.assessment_before_dislysis,
-                                  "creater"
-                                )
-                              }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(
-                                  record.assessment_before_dislysis,
-                                  'creater'
-                                )
-                              "
-                              alt=""
-                              srcset=""
-                              v-else
+                            <!--<span-->
+                              <!--v-if="-->
+                                <!--setAdminUserES(-->
+                                  <!--record.assessment_before_dislysis,-->
+                                  <!--'creater'-->
+                                <!--) == ''-->
+                              <!--"-->
+                              <!--&gt;{{-->
+                                <!--getAdminUser(-->
+                                  <!--record.assessment_before_dislysis,-->
+                                  <!--"creater"-->
+                                <!--)-->
+                              <!--}}</span-->
+                            <!--&gt;-->
+                            <!--<img-->
+                              <!--class="es-img"-->
+                              <!--:src="-->
+                                <!--setAdminUserES(-->
+                                  <!--record.assessment_before_dislysis,-->
+                                  <!--'creater'-->
+                                <!--)-->
+                              <!--"-->
+                              <!--alt=""-->
+                              <!--srcset=""-->
+                              <!--v-else-->
                             />
                           </td>
                         </tr>
@@ -1513,7 +1513,7 @@
                           text="正常"
                           :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
-                              '震颤-存在'
+                              '正常'
                             ) > -1
                               ? true
                               : false
@@ -1523,7 +1523,7 @@
                           text="减弱"
                           :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
-                              '震颤-减弱'
+                              '减弱'
                             ) > -1
                               ? true
                               : false
@@ -1545,22 +1545,21 @@
                         <check-box
                           text="无"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'disequilibrium_syndrome',
-                              1
-                            )
-                          "
+                      record.assessment_after_dislysis.complication.indexOf('无') > -1
+                          ? true
+                          : false
+                      "
                         ></check-box>
                         <check-box
                           text="有"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'disequilibrium_syndrome',
-                              2
-                            )
-                          "
+                        record.assessment_after_dislysis.complication.indexOf('头晕') > -1 ||
+                         record.assessment_after_dislysis.complication.indexOf('头痛') > -1||
+                           record.assessment_after_dislysis.complication.indexOf('呕吐') > -1||
+                             record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false
+                      "
                         ></check-box>
                       </div>
                       <div class="inline_block">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -697,17 +697,17 @@
                         </div>
                       </td>
                       <td>
-                        <span
-                          v-if="setAdminUserES(predialysis.modifier) == ''"
-                          >{{ getAdminUser(predialysis.modifier) }}</span
-                        >
-                        <img
-                          class="es-img"
-                          :src="setAdminUserES(predialysis.modifier)"
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
+                        <!--<span-->
+                          <!--v-if="setAdminUserES(predialysis.modifier) == ''"-->
+                          <!--&gt;{{ getAdminUser(predialysis.modifier) }}</span-->
+                        <!--&gt;-->
+                        <!--<img-->
+                          <!--class="es-img"-->
+                          <!--:src="setAdminUserES(predialysis.modifier)"-->
+                          <!--alt=""-->
+                          <!--srcset=""-->
+                          <!--v-else-->
+                        <!--/>-->
                       </td>
                     </tr>
 
@@ -1138,7 +1138,7 @@
                     <check-box
                       text="正常"
                       :checked="
-                        afterdialysis.internal_fistula.indexOf('震颤-存在') > -1
+                        afterdialysis.internal_fistula.indexOf('正常') > -1
                           ? true
                           : false
                       "
@@ -1146,7 +1146,7 @@
                     <check-box
                       text="减弱"
                       :checked="
-                        afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1
+                        afterdialysis.internal_fistula.indexOf('减弱') > -1
                           ? true
                           : false
                       "
@@ -1165,7 +1165,7 @@
                     <check-box
                       text="无"
                       :checked="
-                        afterdialysis.disequilibrium_syndrome == 1
+                       afterdialysis.complication.indexOf('无') > -1
                           ? true
                           : false
                       "
@@ -1173,7 +1173,10 @@
                     <check-box
                       text="有"
                       :checked="
-                        afterdialysis.disequilibrium_syndrome == 2
+                        afterdialysis.complication.indexOf('头晕') > -1 ||
+                          afterdialysis.complication.indexOf('头痛') > -1||
+                            afterdialysis.complication.indexOf('呕吐') > -1||
+                              afterdialysis.complication.indexOf('低血压') > -1
                           ? true
                           : false
                       "
@@ -1183,7 +1186,7 @@
                     （
                     <label-box
                       :isChecked="
-                        afterdialysis.complications_index.indexOf('头晕') > -1
+                        afterdialysis.complication.indexOf('头晕') > -1
                           ? true
                           : false
                       "
@@ -1191,7 +1194,7 @@
                     ></label-box>
                     <label-box
                       :isChecked="
-                        afterdialysis.complications_index.indexOf('头痛') > -1
+                        afterdialysis.complication.indexOf('头痛') > -1
                           ? true
                           : false
                       "
@@ -1199,7 +1202,7 @@
                     ></label-box>
                     <label-box
                       :isChecked="
-                        afterdialysis.complications_index.indexOf('呕吐') > -1
+                        afterdialysis.complication.indexOf('呕吐') > -1
                           ? true
                           : false
                       "
@@ -1207,7 +1210,7 @@
                     ></label-box>
                     <label-box
                       :isChecked="
-                        afterdialysis.complications_index.indexOf('低血压') > -1
+                        afterdialysis.complication.indexOf('低血压') > -1
                           ? true
                           : false
                       "