批量打印

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -394,7 +394,7 @@
                 v-model="nameForm.advice_name"
                 :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
-                @select="handleSelect"
+              
                 @input="changeDrugName"
               ></el-autocomplete>
             </el-form-item>
@@ -431,7 +431,7 @@
                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @select="handleSelect1"
+                 
                   @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>

src/xt_pages/dialysis/details/index.vue

@@ -969,6 +969,7 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+        
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
@@ -1118,6 +1119,7 @@ export default {
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
+          
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
 

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -70,7 +70,8 @@
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
         :cell-class-name="adviceNameShow"
-        :modal-append-to-body="false">
+        :modal-append-to-body="false"
+        v-show="show">
         <el-table-column type="selection" width="55" align="center"></el-table-column>
         <el-table-column prop="date" label="姓名" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -184,24 +185,127 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        
+      </el-table>
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="showOne">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
 
-        
-        
-        <!-- <el-table-column
-          v-if="template_id != 6"
-          prop="checker"
-          min-width="30px"
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
           align="center"
-          label="核对人员"
+          min-width="30px"
+          label="执行时间"
+          sortable
         >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.checker)}}
             </span>
             <span v-else></span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -254,7 +358,9 @@ export default {
       selecting_schs: [],
       partitionArr: [],
 
-      scheduleMap:[]
+      scheduleMap:[],
+      show:true,
+      showOne:false,
     };
   },
   created() {
@@ -338,14 +444,19 @@ export default {
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
             var schedules = resp.data.scheduals
-            // console.log("schedules",schedules)
+            console.log("schedules",schedules)
+           if(schedules.length > 0){
+            this.show = true
+            this.showOne = false
             let arr = []
             let newArr = []
             let newSchedules = []
             schedules.map(item => {
-                item.doctor_advice.map(it =>{
-                    it.name = item.patient.name
-                    it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id
                     it.dialysis_no = item.patient.dialysis_no
@@ -389,7 +500,68 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-        }
+           }
+           if(resp.data.hisAdvices.length > 0){
+             this.show = false
+             this.showOne  = true
+            var schedules =  resp.data.hisAdvices
+          
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+           }
+         
+  
+         }
         })
     },
     getValue: function(val) {

src/xt_pages/stock/detail/print.vue

@@ -23,30 +23,38 @@
             <tbody>
             <tr>
               <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">耗材类型</td>
-               <td style="line-height: 50px" width="250">耗材名称</td>
+              <td style="line-height: 50px" width="250">耗材名称</td>
               <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <!-- <td style="line-height: 50px" width="250">耗材类型</td> -->
+            
+              
               <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
+             <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
               <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
 
-
             <tr v-for="(stock,index) in stockDatas" :key="stock.id">
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
-              <td style="line-height: 50px">
-                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
+               <td style="line-height: 50px">
+                <span>{{stock.good_name}}</span>
               </td>
-              <td style="line-height: 50px">
-                <span v-if="stock">{{stock.good_name}}</span>
+               <td style="line-height: 50px">
+                <span v-if="stock">{{stock.specification_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span v-if="stock">{{stock.specification_name}}</span>
+                <span>{{getUnit(stock.good_unit)}}</span>
               </td>
-
+              <!-- <td style="line-height: 50px">
+                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
+              </td> -->
               <td style="line-height: 50px">{{calCount(stock)}}</td>
+              <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
+              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
               <td style="line-height: 50px" v-if="type == 1 || type == 3">{{calTotal(stock)}}</td>
               <td style="line-height: 50px"></td>
             </tr>
@@ -268,6 +276,15 @@
         r1 = Number(price.toString().replace('.', ''))
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+           if(this.goodUnit[i].id == id){
+              name = this.goodUnit[i].name
+           }
+        }
+        return name
       }
     },
     created() {

src/xt_pages/stock/stockInOrder.vue

@@ -586,14 +586,16 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-  
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
     this.start_time =
       nowYear +
       "-" +
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-   
+     
+     
 
       // this.warehousing_time =
       //   nowYear +

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -327,7 +327,7 @@ export default {
             tempForm['count'] = ''
             tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
             tempForm['remark'] = ''
-            tempForm['good_unit'] = ''
+            tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }

src/xt_pages/stock/stockQuery.vue

@@ -46,7 +46,7 @@
             style="width: 200px;margin-left:10px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="商品编码/商品名称/规格名称"
+            placeholder="耗材名称/商品编码/商品名称/规格名称"
           />
           <el-button
             size="small"
@@ -226,7 +226,7 @@ export default {
         end_time:this.end_time,
         type_name:this.type_name,
       };
-      console.log("params-----",Params)
+     
       this.WarehouseInfo.loading = true;
       this.WarehouseInfo.warehouseInfoDate = [];
       getAllStockQueryList(Params).then(response => {