518合并代码

src/xt_pages/data/components/doubleCheck.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="">
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      :data="double_check_date"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;min-height:500px;"
+    >
+      <el-table-column align="center" label="字段名">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name_cn }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="字段">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否显示">
+        <template slot-scope="scope">
+          <span v-if="scope.row.is_show == 1">是</span>
+          <span v-if="scope.row.is_show == 2">否</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="不展示"
+            placement="top"
+            v-if="scope.row.is_show == 1"
+          >
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHide(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="展示"
+            placement="top"
+            v-if="scope.row.is_show == 2"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { updateFieldIsShow } from "@/api/data";
+import store from "@/store";
+
+export default {
+  name: "dialysisAfter",
+
+  props: {
+    double_check_date: {
+      type: Array
+    }
+  },
+  methods: {
+    handleHide: function(index, row) {
+      this.$confirm("是否将该字段设为不可见?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          updateFieldIsShow(row.id, 2).then(response => {
+            if (response.data.state == 1) {
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleShow: function(index, row) {
+      this.$confirm("是否将该字段设为可见?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      }).then(() => {
+          updateFieldIsShow(row.id, 1).then(response => {
+            if (response.data.state == 1) {
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    }
+  },
+ 
+};
+</script>
+
+<style scoped></style>
+<style>
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/data/showConfig.vue

@@ -24,6 +24,12 @@
               @change="changeBeforeData"
             ></dialysis-before>
           </el-tab-pane>
+          <el-tab-pane label="双人核对">
+            <double-check
+              :double_check_date="double_check_date"
+              @change="changeDoubleCheckData"
+            ></double-check>
+          </el-tab-pane>
           <el-tab-pane label="透析上机">
             <dialysis-computer
               :dialysis_computer_data="dialysis_computer_data"
@@ -63,6 +69,7 @@ import DialysisBefore from "./components/dialysisBefore";
 import DialysisMonitor from "./components/dialysisMonitor";
 import ReceiveTreatmentAsses from "./components/receiveTreatmentAsses";
 import DialysisSummary from "./components/dialysisSummary";
+import doubleCheck from "./components/doubleCheck.vue"
 import { getFiledConfigList } from "@/utils/data_config"; // getConfigList from sessionStorage
 import store from "@/store";
 import DialysisComputer from './components/dialysisComputer'
@@ -77,7 +84,8 @@ export default {
     DialysisPrescription,
     DialysisAfter,
     BreadCrumb,
-    DialysisSummary
+    DialysisSummary,
+    doubleCheck
   },
   data() {
     return {
@@ -93,6 +101,7 @@ export default {
       dialysis_after_data: [],
       dialysis_summary_data: [],
       dialysis_computer_data:[],
+      double_check_date:[],
     };
   },
   methods: {
@@ -100,6 +109,7 @@ export default {
       console.log(tab, event, this.activeName);
     },
     changePrescriptionData: function(object) {
+   
       for (let i = 0; i < this.dialysis_prescription_data.length; i++) {
         if (this.dialysis_prescription_data[i].id == object.id) {
           this.dialysis_prescription_data[i].is_show = object.is_show;
@@ -146,11 +156,21 @@ export default {
           this.dialysis_summary_data[i].is_show = object.is_show;
         }
       }
+    },
+    changeDoubleCheckData:function(object){
+     
+     for (let i = 0; i < this.double_check_date.length; i++) {
+        if (this.double_check_date[i].id == object.id) {
+          this.double_check_date[i].is_show = object.is_show;
+        }
+      }
     }
+
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-    
+   
+  
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {
         case 1:
@@ -174,9 +194,12 @@ export default {
         case 7:
           this.dialysis_computer_data.push(filedList[i]);
           break;
-
+        case 8:
+          this.double_check_date.push(filedList[i]);
+          break;
       }
     }
+   
   }
 };
 </script>

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -128,6 +128,10 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="第二核对人员工号:" v-if="isShowFiled('第二核对人员工号')" label-width="140px">
+        <el-input style="width:200px" v-model="doubleReview.employee_number"></el-input>
+      </el-form-item>
+
     </el-form>
 
 
@@ -151,6 +155,7 @@
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
   import { getDataConfig } from '@/utils/data'
+  import store from "@/store";
   export default {
     name: 'doubleCheckDialog',
     data() {
@@ -177,7 +182,8 @@
           created_time: 0,
           updated_time: 0,
           check_time: 0,
-          first_check_time: 0
+          first_check_time: 0,
+          employee_number:"",
         },
         dialysate_formulation_options:[],
         record_date: '',
@@ -204,8 +210,18 @@
         blood_access_part_opera_id:"通路类型:",
         displace_liqui_value:"置换液总量:",
       }
-    }, methods: {
-      
+    }, 
+    methods: {
+      isShowFiled(name) {
+        var filedList = store.getters.xt_user.fileds
+       
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 8 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
+        }
+        return false
+      },
       show() {
         
         this.isVisibility = true
@@ -1244,7 +1260,8 @@
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
 
         }
-      }
+      },
+     
 
     },
     created() {

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -758,10 +758,10 @@
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
               response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
               response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
-              if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
-                 response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
-                 response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
-              }
+              // if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
+              //    response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
+              //    response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
+              // }
              if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
                   response.data.data.list[i].number = ""
               }else{

src/xt_pages/workforce/remind_print_setting.vue

@@ -19,7 +19,7 @@
         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217">
+              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340">
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
@@ -36,8 +36,8 @@
                    <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
                   </span>
                 </div>
-               <div v-if="org_id == 10188 || org_id == 10217">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
+               <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
@@ -74,9 +74,9 @@
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
-                <div v-if="org_id == 10188 || org_id == 10217">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
@@ -184,12 +184,12 @@
        getScheduleList(params).then(response=>{
          if(response.data.state ==1){
            var list = response.data.data.list
-           console.log("本周信息",list)
+          
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-            console.log("Arr222222",arr)
+           
            this.scheduleData = arr
 
              let a = response.data.data.day
@@ -294,7 +294,7 @@
       printAction: function() {
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
         const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
-        if(this.org_id == 10188 || this.org_id == 10217){
+        if(this.org_id == 10188 || this.org_id == 10217 || this.org_id == 10340){
           printJS({
             printable: 'print_content',
             type: 'html',