bug修改

src/api/data.js

@@ -17,6 +17,7 @@ export function createChildConfig(params) {
 }
 
 export function updateChildConfig(params) {
+  console.log('params', params)
   return request({
     url: '/api/updatechildconfig',
     method: 'post',
@@ -40,29 +41,23 @@ export function updateTemplate(params) {
   })
 }
 
-
-export function updateFieldIsShow(id,is_show) {
+export function updateFieldIsShow(id, is_show) {
   return request({
-    url: '/api/filed/show?id='+id+'&is_show='+is_show,
-    method: 'post',
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
+    method: 'post'
   })
 }
 
-
-
-
-
 export function postPrintTemplate(params) {
   return request({
-    url: '/api/print/template/commit?template_id='+params,
-    method: 'post',
+    url: '/api/print/template/commit?template_id=' + params,
+    method: 'post'
   })
 }
 
 export function getPrintTemplate() {
   return request({
     url: '/api/print/template/get',
-    method: 'get',
+    method: 'get'
   })
 }
-

src/views/layout/components/Navbar.vue

@@ -99,7 +99,9 @@
             <el-dropdown-item command="modifyUserInfoAction"
               >个人信息</el-dropdown-item
             >
-            <el-dropdown-item command="modifyOrgInfoAction"
+            <el-dropdown-item
+              command="modifyOrgInfoAction"
+              v-if="is_super_admin === 1"
               >机构信息</el-dropdown-item
             >
             <el-dropdown-item divided command="logout">{{
@@ -143,8 +145,8 @@ export default {
     return {
       orgs: [],
       org_id: this.$store.getters.xt_user.org.id,
-      org_name: this.$store.getters.xt_user.org.org_name
-
+      org_name: this.$store.getters.xt_user.org.org_name,
+      is_super_admin: 0
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
     };
   },
@@ -282,6 +284,9 @@ export default {
         console.log("org", this.orgs);
         var creator = response.data.data.creator;
         console.log("creator", creator);
+        var admin = response.data.data.admin;
+        console.log("admin", admin);
+        this.is_super_admin = admin.is_super_admin;
         for (let i = 0; i < this.orgs.length; i++) {
           if (this.orgs[i].id == this.org_id) {
             this.org_name = this.orgs[i].org_name;

src/xt_pages/data/components/table.vue

@@ -192,7 +192,6 @@ export default {
   },
   created() {
     this.getList();
-    console.log("list是-----------", this.list);
   },
   methods: {
     fieldChange: function(newValue) {

src/xt_pages/data/components/tableson.vue

@@ -78,7 +78,7 @@
             <el-form-item label="排序" prop="order">
               <el-input
                 type="age"
-                v-model.number="temp.order"
+                v-model.number="temp.orders"
                 placeholder="请输入排序值，数值越大，排序越靠前"
               ></el-input>
             </el-form-item>
@@ -202,7 +202,8 @@ export default {
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: 0
       },
       dialogFormVisible: false,
       dialogStatus: "",
@@ -269,7 +270,8 @@ export default {
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: ""
       };
     });
   },
@@ -348,7 +350,8 @@ export default {
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: 0
       };
     },
     handleCreate() {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -705,12 +705,46 @@
                           class="under_line"
                           style="width: 150px;text-align: center"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.anticoagulant_name
-                              ? record.prescription.anticoagulant_name
-                              : "/"
-                          }}
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 0"
+                            >&nbsp;/</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 1"
+                            >&nbsp;无肝素</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 2"
+                            >&nbsp;普通肝素</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 3"
+                            >&nbsp;低分子肝素</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 4"
+                            >&nbsp;阿加曲班</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 5"
+                            >&nbsp;枸橼酸钠</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 6"
+                            >&nbsp;低分子肝素钙</span
+                          >
+                          <span
+                            class="under-line"
+                            v-if="record.prescription.anticoagulant == 7"
+                            >&nbsp;低分子肝素钠</span
+                          >
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
@@ -719,48 +753,96 @@
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          {{
-                            record.prescription &&
+                          <span class="under-line">{{
                             record.prescription.anticoagulant_shouji
                               ? record.prescription.anticoagulant_shouji
                               : "/"
-                          }}
+                          }}</span>
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '枸橼酸钠'
+                            "
+                            >mg</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '阿加曲班'
+                            "
+                            >mg</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '低分子肝素'
+                            "
+                            >iu</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '普通肝素'
+                            "
+                            >iu</span
+                          >
+                          <span
+                            v-if="record.prescription.anticoagulant == '无肝素'"
+                            >mg</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 6"
+                            >iu</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 7"
+                            >iu</span
+                          >
+                          &nbsp;
                         </div>
-                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         维持：
                         <div
-                          v-if="
-                            record.prescription &&
-                              record.prescription.anticoagulant == 1
-                          "
-                          class="under_line"
-                          style="width: 50px;text-align: center;"
-                        >
-                          {{
-                            record.prescription &&
-                            record.prescription.anticoagulant_weichi
-                              ? record.prescription.anticoagulant_weichi
-                              : "/"
-                          }}
-                        </div>
-                        <div
-                          v-if="
-                            record.prescription &&
-                              record.prescription.anticoagulant != 1
-                          "
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.anticoagulant_weichi
-                              ? record.prescription.anticoagulant_weichi
-                              : 0
-                          }}
+                          <span class="under-line"
+                            >&nbsp;{{
+                              record.prescription.anticoagulant_weichi
+                                ? record.prescription.anticoagulant_weichi
+                                : "/"
+                            }}</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '枸橼酸钠'
+                            "
+                            >ml/h</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '阿加曲班'
+                            "
+                            >mg/h</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '低分子肝素'
+                            "
+                            >iu/h</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '普通肝素'
+                            "
+                            >iu/h</span
+                          >
+                          <span
+                            v-if="record.prescription.anticoagulant == '无肝素'"
+                            >mg/h</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 6"
+                            >iu/h</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 7"
+                            >iu/h</span
+                          >
                         </div>
-                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         总量：
@@ -768,14 +850,48 @@
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.anticoagulant_zongliang
-                              ? record.prescription.anticoagulant_zongliang
-                              : "/"
-                          }}
+                          <span class="under-line"
+                            >&nbsp;{{
+                              record.prescription.anticoagulant_zongliang
+                                ? record.prescription.anticoagulant_zongliang
+                                : "0"
+                            }}</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '枸橼酸钠'
+                            "
+                            >mg</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '阿加曲班'
+                            "
+                            >mg</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '低分子肝素'
+                            "
+                            >iu</span
+                          >
+                          <span
+                            v-if="
+                              record.prescription.anticoagulant == '普通肝素'
+                            "
+                            >iu</span
+                          >
+                          <span
+                            v-if="record.prescription.anticoagulant == '无肝素'"
+                            >mg</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 6"
+                            >iu</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 7"
+                            >iu</span
+                          >
                         </div>
-                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         透析机号：
@@ -1500,7 +1616,7 @@
                         穿刺护士：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: center"
+                          style="width: 60px;text-align: center"
                         >
                           <span
                             v-if="
@@ -1540,7 +1656,7 @@
                         治疗护士：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: center"
+                          style="width: 60px;text-align: center"
                         >
                           <span
                             v-if="
@@ -1575,15 +1691,10 @@
                       </div>
                       <div class="inline_block" style="flex:1;">
                         核对人员：
-                        <div
-                          class="under_line"
-                          style="width: 80px;text-align: left"
-                          v-if="record.dialysis_order == null"
-                        ></div>
                         <div v-if="record.check">
                           <div
                             class="under_line"
-                            style="width: 80px;text-align: left"
+                            style="width: 60px;text-align: left"
                             v-if="
                               record.dialysis_order != null &&
                                 record.dialysis_order.start_nurse ==
@@ -1609,55 +1720,8 @@
                               style="height: 40px;"
                             />
                           </div>
-                          <div
-                            class="under_line"
-                            style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse ==
-                                  record.check.modifier
-                            "
-                          >
-                            <span
-                              v-if="
-                                setAdminUserES(record.check, 'creater') == ''
-                              "
-                              >{{ getAdminUser(record.check, "creater") }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="setAdminUserES(record.check, 'creater')"
-                              alt=""
-                              srcset=""
-                              v-else
-                            />
-                          </div>
-                          <div
-                            class="under_line"
-                            style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.modifier &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.creater
-                            "
-                          >
-                            <span
-                              v-if="
-                                setAdminUserES(record.check, 'creater') == ''
-                              "
-                              >{{ getAdminUser(record.check, "creater") }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="setAdminUserES(record.check, 'creater')"
-                              alt=""
-                              srcset=""
-                              v-else
-                            />
-                          </div>
                         </div>
+
                         <div
                           class="under_line"
                           style="width: 80px;text-align: left"
@@ -1668,7 +1732,7 @@
                         下机护士：
                         <div
                           class="under_line"
-                          style="width: 80px;text-align: center"
+                          style="width: 60px;text-align: center"
                         >
                           <span
                             v-if="

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -566,6 +566,10 @@ export default {
       this.getSchedualPatientList();
     },
     batchPrintAction: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       // 模板ID为6
       var sch_ids = [];
 
@@ -594,11 +598,14 @@ export default {
       }
     },
     batchPrintActionOne: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       var sch_ids = [];
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id);
       }
-      console.log("第二个", sch_ids);
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
       if (this.template_id == 2 || this.template_id == 0) {
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
@@ -609,6 +616,10 @@ export default {
       }
     },
     batchPrintActionTwo: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       var sch_ids = [];
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id);