Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

package-lock.json

@@ -2769,7 +2769,7 @@
     },
     "crypto-js": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
       "dev": true
     },

src/xt_pages/data/components/consumables.vue

@@ -810,7 +810,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-
+        
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -958,11 +958,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
-
+           
             for(let i=0;i<response.data.data.goodType.length;i++){
               this.goodTypeList.push(response.data.data.goodType[i])
             }
-
+ 
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1498,7 +1498,7 @@
        getInitializtion().then(response=>{
          if(response.data.state == 1){
            var goodKindList = response.data.data.goodKindList;
-
+           
            this.goodKindList = goodKindList
            var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
            console.log("医保等级",medicalInsuranceLevelList)
@@ -1508,8 +1508,8 @@
       },
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
-         console.log("this.table",this.goodInfo.goodInfoData)
-
+         console.log("this.table",this.goodInfo.goodInfoDialog.formValue.goodType)
+         
          for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
            for(let j=0;j<this.goodKindList.length;j++){
               if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
@@ -1517,7 +1517,8 @@
               }
            }
            for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
-              if(this.goodInfo.goodInfoDialog.formValue.goodType[z].id == this.goodInfo.goodInfoData[i].good_type_id){
+              if(this.goodInfo.goodInfoData[i].good_type_id == this.goodInfo.goodInfoDialog.formValue.goodType[z].id){
+                
                  this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue.goodType[z].type_name
               }
            }
@@ -1533,26 +1534,27 @@
                 this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
              }
            }
-
+          
           for(let a=0;a<this.dealers.length;a++){
              if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
-                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name
-             }
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
+             } 
           }
          }
-
+         console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
+       
          const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code']
-
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
+         
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
-
+     
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '耗材信息'
          })
           this.downloadLoading = false
-
+    
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/data/components/drugs.vue

@@ -28,10 +28,10 @@
         </el-select>
 
 
-        <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
-        <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
+        <span style="color: #909399;font-size:14px;">是否停用 : &nbsp;</span>
+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
           <el-option
-            v-for="item in options"
+            v-for="item in optionsOne"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -91,23 +91,18 @@
       </el-table-column>
       <el-table-column prop="date" label="单位&规格" align="center">
         <template slot-scope="scope">
-          <!-- <div>{{scope.row.drug_spec}}</div> -->
           <div>
             <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
           </div>
         </template>
       </el-table-column>
-
+  
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="零售价" width="100" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.retail_price}}</div>
-        </template>
-      </el-table-column> -->
+     
       <el-table-column label="拆零零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_price}}</div>
@@ -138,12 +133,12 @@
           <div>{{getDealer(scope.row.dealer)}}</div>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="date" label="备案日期" align="center" width="100">
+       <el-table-column prop="date" label="备案日期" align="center" width="100">
         <template slot-scope="scope">
           <span>{{getTime(scope.row.record_date)}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="药品备注" align="center" width="100">
+     <!-- <el-table-column prop="date" label="药品备注" align="center" width="100">
         <template slot-scope="scope">
           <div>{{scope.row.drug_remark}}</div>
         </template>
@@ -404,6 +399,17 @@
             value: '2',
             label: '未备案'
           }],
+         optionsOne: [
+          {
+            value: '0',
+            label: '全部'
+          }, {
+            value: '1',
+            label: '是'
+          }, {
+            value: '2',
+            label: '否'
+          }],
         value: '',
 
         dealer:[],
@@ -699,7 +705,7 @@
                  this.formValue.drug_classify = ""
               }
 
-
+              
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -964,7 +970,7 @@
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
-
+        
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -973,14 +979,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-
+         
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
           var isHasPackingPrice= header.includes('*包装零售价');
           console.log("isHasLastPrice",isHasPackingPrice)
           var isHasLastPrice = header.includes('*进货价');
           console.log("进货价",isHasLastPrice)
-
+          
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -991,7 +997,7 @@
          console.log("isDrugDoseUnit",isDrugDoseUnit)
           if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
           isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-
+           
             this.dialogVisible = true;
             return
           }
@@ -1031,7 +1037,7 @@
            }
 
 
-
+  
           if (results[i]['*拆零'] === undefined) {
                 obj['min_number'] = ''
               } else {
@@ -1409,7 +1415,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-
+        
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1479,15 +1485,15 @@
 
       exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-
-
+         
+        
          console.log("this.table",this.list)
 
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
                  this.list[i].drug_category_name = this.drugCategoryList[j].name
-              }
+              }  
           }
            for(let z=0;z<this.drugDosageFormList.length;z++){
               if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
@@ -1519,17 +1525,17 @@
          }
 
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code']
-
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
+         
          const data = this.formatJson(filterVal,this.list)
-
+     
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '药品信息'
          })
           this.downloadLoading = false
-
+    
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

@@ -147,7 +147,7 @@ export default {
                         if(it.type == 2){
                             if(it.project.cost_classify == 3){
                                 projectPrint.push(it)
-                                total += it.project.price
+                                total += (it.project.price*parseInt(it.project.count))
                             }
                         }
                   })

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -142,12 +142,13 @@ export default {
             let projectPrint = []
             let total = 0
             this.advicePrint.map(item => {
+              console.log("imte233232323232323223",item.project)
               if(item.project.length > 0){
                   item.project.map(it => {
                         if(it.type == 2){
                             if(it.project.cost_classify == 3){
                                 projectPrint.push(it)
-                                total += it.project.price
+                                total += (it.project.price*parseInt(it.count))
                             }
                         }
                   })

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -261,7 +261,7 @@ export default {
         var normdata = response.data.data.normdata
         newArr = normdata
         var bloodpressure = response.data.data.bloodPressure
-        // console.log("血压",bloodpressure)
+        
         for (let i = 0; i < bloodpressure.length; i++) {
           if (bloodpressure[i].inspection_major == 0 && bloodpressure[i].inspection_minor == -1 && bloodpressure[i].is_status == 0) {
             bloodpressure[i].item_name = '收缩压'
@@ -281,7 +281,6 @@ export default {
         var newarr = newArr.sort((a, b) => {
           return a.sort - b.sort
         })
-        //  console.log("newarr",newarr)
         for (let i = 0; i < newarr.length; i++) {
           this.mode_type = normdata[0].inspection_minor
         }
@@ -824,7 +823,7 @@ export default {
       }
       this.isLoading = true
 
-      // console.log("params",params)
+      console.log("params",params)
       getBloodPressureList(params).then(response => {
         if (response.data.state == 1) {
           this.isLoading = false

src/xt_pages/stock/cancelStockOrder.vue

@@ -479,7 +479,8 @@ export default {
       const params = {
         ids: idStr
       };
-
+      console.log("params233223232323232323",params)
+     
       this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -28,7 +28,7 @@
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
              max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
 
-          <el-table-column align="center" width="320">
+          <el-table-column align="center" width="200">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -42,11 +42,11 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:280px;"
+                    style="width:160px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    <div  style="widht:400px">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
                   </template>
                  </el-autocomplete>
             </template>
@@ -514,7 +514,7 @@
               }
               array[i].price = array[i].price.toString()
             }
-            console.log("hh2332322323",this.recordInfo.recordData)
+           
             for(let i=0;i<this.recordInfo.recordData.length;i++){
                if(this.recordInfo.recordData[i].good_id == 0){
                   this.$message.error("耗材规格不能为空")
@@ -536,7 +536,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            console.log("parasm23232",params)
+            
            
             editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -73,46 +73,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"
@@ -151,12 +111,7 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column label="单据类型" align="center">
-          <template slot-scope="scope">
-            {{ getTypeName(scope.row) }}
-          </template>
-        </el-table-column> -->
-
+    
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.Warehousing.warehousing_time) }}
@@ -475,14 +430,14 @@ export default {
       this.multipleSelection = val;
     },
     handleSizeChange(val) {
+      console.log("val2332323223",val)
       this.limit = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
     },
     handleCurrentChange(val) {
+      console.log("888888",val)
       this.page = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
     },
     startTimeChange(val) {
 

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -549,7 +549,7 @@ export default {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
-          console.log("列表23323232323232",array)
+         
           let total = 0;
           for (let i = 0; i < array.length; i++) {
 

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -18,8 +18,8 @@
               <td style="line-height: 50px" width="100">药品类型</td>
               <td style="line-height: 50px" width="150">药品名称</td>
               <td style="line-height: 50px" width="150">规格型号&单位</td>
-              <td style="line-height: 50px" width="50">进货单价</td>
-              <td  style="line-height: 50px" width="50">厂家</td>
+              <td style="line-height: 50px" width="100">进货单价</td>
+              <td  style="line-height: 50px" width="200">厂家</td>
               <td style="line-height: 50px" width="80">入库数量</td>
               <td style="line-height: 50px" width="80">出库数量</td>
               <td style="line-height:50px" width="80">剩余库存量</td>    
@@ -46,12 +46,9 @@
                 <span> {{getManufacturerList(item.manufacturer)}}</span>
               </td>
               <td>
-                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span >
+                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfoOne(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}</span >
               </td>
               <td>
-                <!-- <span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">
-                  {{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}
-                </span> -->
                   {{getOutFlush(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number,item.drug_cancel_stock_info)}}
               </td>
               <td>
@@ -260,7 +257,11 @@
              console.log("list99999",list)
              for(let i=0;i<list.length;i++){
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
-                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+                 if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
+                    list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+                    list[i].drug_warehouse_info[j].warehousing_count = list[i].min_number * list[i].drug_warehouse_info[j].warehousing_count
+                 } 
+                
                }
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
@@ -441,6 +442,33 @@
        
         return total
       },
+      getWarehoseInfoOne(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var max_str=  ""
+         var min_str = ""
+        if (arr.length > 0) {
+          for(let i=0;i<arr.length;i++){
+            total += parseInt(arr[i].warehousing_count)
+          }
+        }
+        if (total < min_number){
+          min_str = total + min_unit
+        }
+        if (total == 0) {
+          min_str = ""
+          max_str = ""
+        }
+        if (total >=min_number) {
+           if(parseInt(total/min_number)!=0){
+              max_str = parseInt(total/min_number) + max_unit
+           }
+           if(total%min_number!=0){
+              min_str = total%min_number + min_unit
+           }
+
+        }
+        return max_str + min_str
+      },
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
        
          var max_str=  ""
@@ -507,7 +535,7 @@
         var over_count = 0
         var cancel_count = 0
         for(let i=0;i<info.length;i++){
-           total += (info[i].warehousing_count * min_number)
+           total += info[i].warehousing_count 
         }
         
         for(let j=0;j<info.length;j++){

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -197,7 +197,12 @@
         </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{scope.row.warehousing_count}}{{scope.row.drug.max_unit}}
+            {{scope.row.warehousing_count}}{{scope.row.max_unit}}
+          </template>
+        </el-table-column>
+        <el-table-column label="包装零售价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.retail_price}}
           </template>
         </el-table-column>
         <el-table-column label="进货价" align="center">

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -28,7 +28,6 @@
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
          <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
-         <!-- <div class="titleOne">当前进货价合计:</div> -->
       </div>
      
      
@@ -113,7 +112,7 @@
               </template>
          </el-table-column>
 
-         <el-table-column align="center" width="120">
+         <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
@@ -129,14 +128,43 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
-                  style="width:80px"
+                  style="width:120px"
                 ></el-input>
-                 {{scope.row.max_unit}}
+                 <!-- {{scope.row.max_unit}} -->
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
               </div>
               </el-form-item>
              
             </template>
           </el-table-column>
+
+          <el-table-column align="center" width="140">
+            <template slot="header" slot-scope="scope">
+              <span>包装零售价(元)<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.retail_price'"
+                :rules="tableRules.retail_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  style="width:100px"
+                  placeholder="请输入包装零售价"
+                  type="number"
+                  v-model="scope.row.retail_price"
+                ></el-input>
+               
+              </el-form-item>
+            </template>
+          </el-table-column>
        
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
@@ -358,6 +386,9 @@
           expiry_date:[
            {required:true,message:'有效日期不能为空',trigger:'blur'}
           ],
+          retail_price:[
+            {required:true,message:'请输入包装零售价',trigger:'blur'}
+          ]
         },
         type: this.$route.query.type,
         total: '',
@@ -419,6 +450,7 @@
         showTwo:false,
         drugTypeList:[],
         totalPrice:0,
+        unitList:[],
       }
     },
     methods: {
@@ -691,7 +723,8 @@
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
-               this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+              this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
@@ -711,7 +744,7 @@
               'stockIn': this.recordInfo.recordData
             }
             console.log("params2222222",params)
-            
+           
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -813,6 +846,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         console.log("val233232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -820,6 +854,7 @@
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
              this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].retail_price = val.retail_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
@@ -875,8 +910,7 @@
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       
-     
-    
+     this.unitList =  getDataConfig('hemodialysis','units')
     }
 
   }

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -37,7 +37,7 @@
 
       <div class="cell clearfix" style="margin-top: 10px">
         <el-button size="small" icon="el-icon-edit" @click="editRecord"
-          >编辑222</el-button
+          >编辑</el-button
         >
         <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
           >删除</el-button

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -25,13 +25,7 @@
     </div>
 
     <div class="app-container">
-      <!--<stock-in-dialog-->
-        <!--ref="dialog"-->
-        <!--:propForm="propForm"-->
-        <!--:visibility="isVisibility"-->
-        <!--v-on:dialog-comfirm="comfirm"-->
-        <!--v-on:dialog-cancle="cancle"-->
-      <!--&gt;</stock-in-dialog>-->
+    
       <drugs-stock-dialog
         ref="dialog"
         :propForm="propForm"
@@ -58,45 +52,7 @@
         </el-date-picker>
       </div>
 
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.dealer"
-          clearable
-          placeholder="请选择经销商"
-        >
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div>
-
-      <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-
-        <el-select
-          size="small"
-          v-model="form.manufacturer"
-          clearable
-          placeholder="请选择厂商"
-        >
-          <el-option
-            v-for="(option, index) in manufacturer"
-            :key="index"
-            :label="option.manufacturer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
-
-
+      
    <!-- 编辑入库单详情 -->
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -109,13 +65,14 @@
           v-loading="listLoading"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+
+          <el-table-column align="center" width="200px">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
+              <el-form-item style="padding-top: 15px">
                  <el-autocomplete
                     class="checkSearch"
                     popper-class="my-autocomplete"
@@ -126,15 +83,17 @@
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
+                    :disabled="drug_show"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose +  item.dose_unit +"*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
+       
          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>药品类型</span>
@@ -177,21 +136,9 @@
                 </el-form-item>
               </template>
          </el-table-column>
-          <!-- <el-table-column align="center" width="140">
-            <template slot="header" slot-scope="scope" >
-              <span>批号</span>
-              </template>
-                <template slot-scope="scope">
-                  <el-form-item style="padding-top: 20px">
-                    <el-input
-                      placeholder="请输入批号"
-                      v-model="scope.row.batch_number"
-                    ></el-input>
-                  </el-form-item>
-                </template>
-          </el-table-column> -->
+       
                    
-         <el-table-column align="center" width="120">
+         <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
@@ -209,11 +156,38 @@
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
                   ></el-input>
-                  {{scope.row.max_unit}}
+                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
                 </div>
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="140">
+            <template slot="header" slot-scope="scope">
+              <span>包装零售价(元)<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.retail_price'"
+                :rules="tableRules.retail_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  style="width:100px"
+                  placeholder="请输入包装零售价"
+                  type="number"
+                  v-model="scope.row.retail_price"
+                ></el-input>
+               
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column width="120">
             <template slot="header" slot-scope="scope">
                 <span>进货单价(元)<span style="color: red">*</span></span>
@@ -374,8 +348,6 @@ import {
   GetAllConfig,
   GetAllDrugInfoByID,
   getDrugWarehouseInfoList,
-  modifyDrugWarehouseInfo,
-  deleteDrugWarehouseInfo,
   DeleteDrugWarehouseInfoItem,
   EditDrugWarehouse
 } from "@/api/drug/drug_stock";
@@ -429,6 +401,9 @@ export default {
         batch_number:[
           {required:true,message:'批号不能为空',trigger:'blur'}
         ],
+        retail_price:[
+         {required:true,message:'请输入包装零售价',trigger:'blur'}
+        ]
       },
 
       total: "",
@@ -460,6 +435,8 @@ export default {
       dealerList:[],
       org_id:0,
       listLoading:false,
+      unitList:[],
+      drug_show:false,
     };
   },
   methods: {
@@ -689,7 +666,9 @@ export default {
 
              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].last_price.toString()
-            
+
+             this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
+          
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -707,7 +686,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,
@@ -742,11 +721,11 @@ export default {
         } else {
        
           var manufacturerList = response.data.data.manufacturerList
-          console.log("000000000000",response.data.data.info)
           this.manufacturerList = manufacturerList
           var dealerList  = response.data.data.dealerList
-          console.log("供应商232322332322332232323",this.dealerList)
+        
           this.dealerList = dealerList
+          console.log("详情32332323232323232232323323232323232",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -770,8 +749,10 @@ export default {
 
             response.data.data.info[i].last_price = response.data.data.info[i].price
 
-            response.data.data.info[i].max_unit = response.data.data.info[i].drug.max_unit
-            
+            response.data.data.info[i].max_unit = response.data.data.info[i].max_unit
+
+            response.data.data.info[i].min_unit  = response.data.data.info[i].min_unit
+
             response.data.data.info[i].drug_type = response.data.data.info[i].drug.drug_type
 
            if(response.data.data.info[i].manufacturer == 0){
@@ -807,8 +788,6 @@ export default {
             this.warehouse.warehousing_time,
             "{y}-{m}-{d}"
           );
-
-        
         }
       });
     },
@@ -872,6 +851,11 @@ export default {
              }else{
                this.recordInfo.recordData[i].last_price = val.last_price
              }
+             if(val.retail_price == 0){
+               this.recordInfo.recordData[i].retail_price = ""
+             }else{
+               this.recordInfo.recordData[i].retail_price = val.retail_price
+             }
            
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number = val.number
@@ -896,6 +880,7 @@ export default {
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);
+    this.unitList =  getDataConfig('hemodialysis','units')
   }
 };
 </script>
@@ -931,4 +916,5 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+
 </style>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -775,7 +775,7 @@ export default {
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     this.unitList =  getDataConfig('hemodialysis','units')
-    console.log("单位",this.unitList)
+ 
   }
 };
 </script>

src/xt_pages/stock/drugs/inventory.vue

@@ -230,10 +230,10 @@ export default {
             if (keyword != undefined) {
                 key = keyword
             }
-            console.log("keyword23323232323223",keyword)
              var params = {
                 keyword:key,
              }
+            
             postSearchDrugWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
@@ -282,7 +282,6 @@ export default {
            getDrugWarehouseInfoList(params).then(response=>{
              if(response.data.state == 1){
                 var list =  response.data.data.list
-               console.log("表哥323322332232323",this.tableData)
                 for(let i=0;i<list.length;i++){
                    list[i].drug_name = list[i].XtBaseDrug.drug_name
                    list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
@@ -330,7 +329,7 @@ export default {
                       }
                    }
                  }
-                console.log("newlist23233223323222323232332",newList)
+               
                 this.tableData = newList
                 this.showSearch = false
                 this.showTable = true
@@ -575,7 +574,6 @@ export default {
             arr.push(val[i].id)
         }
         var str = arr.join(",") 
-        console.log("str",str)
         this.ids = str
         },
       toCheck(){
@@ -592,7 +590,6 @@ export default {
             check_time:this.getTime(this.check_time),
             checker:this.checker,
          }
-       console.log("params",params)
        SaveDrugCheckedInventory(params).then(response=>{
          if(response.data.state == 1){
            this.$message.success("保存成功")
@@ -611,7 +608,7 @@ export default {
        getDrugInventoryDetail(id).then(response=>{
          if(response.data.state == 1){
             var detail = response.data.data.detail
-            console.log("detial2323223",detail)
+            
             this.id = detail.id
             this.form.drug_id = detail.drug_id
             this.form.drug_name = detail.drug_name
@@ -659,7 +656,7 @@ export default {
           min_count:parseInt(this.form.min_count),
           min_unit:this.form.min_unit,
        }
-       console.log("params2222",params)
+    
       
       modifyInventory(params).then(response=>{
          if(response.data.state == 1){
@@ -692,7 +689,7 @@ export default {
         });   
      },
     toMove(item,index){
-      console.log("index",item)
+      
        this.$confirm('此操作将移除药品整个批次, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -701,13 +698,13 @@ export default {
           this.tableData.splice(index,1)
           this.WarehouseList = []
           this.activeNames = [0,1,2,3,4,5,6,7,8,9,10]
-          console.log("hhhh233232",this.tableData)
+         
         }).catch(() => {
           this.loading = false
         });   
     },
     toDelete(index,drug_id){
-      console.log("oo2o323323223",this.tableData)
+      
       for(let i=0;i<this.tableData.length;i++){
          if(drug_id == this.tableData[i].drug_id){
            this.tableData[i].child.splice(index,1)
@@ -745,7 +742,6 @@ export default {
           getDrugBatchNumber(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
-              console.log("list2222",list)
               this.numberList = list
             }
           })
@@ -754,7 +750,6 @@ export default {
          getDrugInventoryDetail(id).then(response=>{
           if(response.data.state == 1){
             var detail = response.data.data.detail
-            console.log("detail22222222",detail)
             this.id = detail.id
             this.form.drug_id = detail.drug_id
             this.form.drug_name = detail.drug_name
@@ -783,11 +778,11 @@ export default {
              remark:this.remark,
              proof_count:parseInt(this.form.proof_count),
            }
-          console.log("params",params)
+         
          SaveDrugProofInventory(params).then(response=>{
             if(response.data.state == 1){
               var inventory = response.data.data.inventory
-              console.log("inventory",inventory)
+             
               this.profdialogVisible = false
               this.getlist()
             }
@@ -808,7 +803,6 @@ export default {
       getDrugWarehouseInfoTotal(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list",list)
           
           var max_total = 0
           var min_total = 0
@@ -859,7 +853,9 @@ export default {
         if(response.data.state == 1){
            var inventory = response.data.data.inventory
            this.$message.success("保存成功")
+           this.WarehouseList = []
            this.tableData = []
+          
         }
       })
     }

src/xt_pages/stock/drugs/query.vue

@@ -107,7 +107,9 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.min_unit}}</span>
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
+              {{getWarehoseInfoOne(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+            </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
@@ -191,7 +193,7 @@ import { min } from 'moment'
     created() {
       var start_time =  window.sessionStorage.getItem('start_time')
       var end_time =  window.sessionStorage.getItem('end_time')
-      console.log("start_time",start_time,end_time)
+     
       if(start_time !=null){
         this.start_time = start_time
       }
@@ -278,7 +280,7 @@ import { min } from 'moment'
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list99999",list)
+           
              for(let i=0;i<list.length;i++){
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
                  if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
@@ -468,7 +470,7 @@ import { min } from 'moment'
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
-          this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
+          this.tableList[i].inCount =  this.getWarehoseInfoOne(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           if(this.end_time == 0){
             this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
             this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
@@ -720,6 +722,35 @@ import { min } from 'moment'
 
         return total
       },
+
+      getWarehoseInfoOne(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var max_str=  ""
+         var min_str = ""
+        if (arr.length > 0) {
+          for(let i=0;i<arr.length;i++){
+            total += parseInt(arr[i].warehousing_count)
+          }
+        }
+        if (total < min_number){
+          min_str = total + min_unit
+        }
+        if (total == 0) {
+          min_str = ""
+          max_str = ""
+        }
+        if (total >=min_number) {
+           if(parseInt(total/min_number)!=0){
+              max_str = parseInt(total/min_number) + max_unit
+           }
+           if(total%min_number!=0){
+              min_str = total%min_number + min_unit
+           }
+
+        }
+        return max_str + min_str
+      },
+      
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
 
          var max_str=  ""

src/xt_pages/stock/stockInOrderEdit.vue

@@ -49,46 +49,6 @@
         >
         </el-date-picker>
       </div>
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.dealer"
-          clearable
-          placeholder="请选择经销商"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-
-        <el-select
-          size="small"
-          v-model="form.manufacturer"
-          clearable
-          placeholder="请选择厂商"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in manufacturer"
-            :key="index"
-            :label="option.manufacturer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           id="oictable"
@@ -99,7 +59,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         > 
-         <el-table-column align="center" width="300">
+         <el-table-column align="center" width="200">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -113,11 +73,11 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:250px;"
+                    style="width:150px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
+                    <div style="width:400px">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
             </template>

src/xt_pages/user/courseOfDisease.vue

@@ -269,6 +269,7 @@
           if (resp.state == 1) {
             this.current_select_record = null
             this.records = resp.data.records
+            console.log("records232322332323232323223",this.records)
             this.doctors = resp.data.doctors
 
           } else {

src/xt_pages/user/coursePrint.vue

@@ -23,26 +23,26 @@
               <div  style="width: 120px;text-align: left;display:inline-block;">{{"血透中心"}}</div>
             </div>
 
-           <div style="flex:1;text-align: center;" v-if="org_id == 9671 || org_id == 10215" >
+            <div style="flex:1;text-align: center;" v-if="org_id == 9671 || org_id == 10215" >
               病案号：
-                <div  style="width: 120px;text-align: left;display:inline-block;">
-                  {{patient.dialysis_no?patient.dialysis_no:"/"}}
-                </div>
+              <div  style="width: 120px;text-align: left;display:inline-block;">
+                {{patient.dialysis_no?patient.dialysis_no:"/"}}
+              </div>
             </div>
 
 
             <div style="flex:1;text-align: center;" v-if="org_id!=10215 && org_id!=9671" >
               透析号：
-                <div  style="width: 120px;text-align: left;display:inline-block;">
-                  {{patient.dialysis_no?patient.dialysis_no:"/"}}
-                </div>
+              <div  style="width: 120px;text-align: left;display:inline-block;">
+                {{patient.dialysis_no?patient.dialysis_no:"/"}}
+              </div>
             </div>
 
             <div  style="flex:1;text-align: center;" v-if="org_id!=10215 && org_id!=9671">
               住院号：
               <div style="width: 100px;text-align: left;display:inline-block;">
-                 {{patient.admission_number?patient.admission_number:"/"}}
-            </div>
+                {{patient.admission_number?patient.admission_number:"/"}}
+              </div>
 
             </div>
 
@@ -55,17 +55,12 @@
               <div>{{item.title}}</div>
             </div>
 
-             <div class="inline_block" style="width:100%;>
-              <div v-html="item.content" class="printP">{{item.content}}</div>
-            </div>
-          </div>
-
-          <!-- <div class="row" style="padding: 2px 0;line-height:24px;">
             <div class="inline_block" style="width:100%;">
-              <div v-html="item.content" class="printP">{{item.content}}</div>
+              <div v-html="item.content" class="printP">
+                 
+              </div>
             </div>
-          </div> -->
-
+          </div>
         </div>
       </div>
     </div>
@@ -110,19 +105,19 @@
       var ids = this.$route.query.ids
       var patient_id = parseInt(this.$route.query.patient_id)
       var params = {
-          ids:ids,
-          patient_id:patient_id,
+        ids:ids,
+        patient_id:patient_id,
       }
-      console.log("para2333223233223",params)
+   
       GetCoursePrintData(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.record = resp.data.record
-          console.log("h2232323223",this.record)
+         
           // for(let i=0;i<this.record.length;i++){
           //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
           // }
-          console.log("h2232323223",this.record)
+  
           this.patient = resp.data.patient
 
           this.loading = false
@@ -319,9 +314,6 @@
   .printP{
     line-height: 20px;
     font-weight: bold;
-    font-size:16px;
-    color: black;
-    font-family: 宋体;
   }
 </style>
 

src/xt_pages/workforce/remind_print.vue

@@ -64,17 +64,17 @@
 
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <!-- <span v-if="org_id!=9987">
-                     <span >
-                       <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-
+                     <span > 
+                       <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                     
                        <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                       </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> 
                   </span>
                     {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span> -->
-
+                  
                   <span v-if="main_collection.prescription.dialysis_dialyszers == ''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="main_collection.prescription.dialysis_dialyszers != ''">{{main_collection.prescription.dialysis_dialyszers}}</span>
 
@@ -90,6 +90,7 @@
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
                   </span>
                 </td>
+              
                 <td :width="td_1_width" v-if="printObj.anticoagulant_zongliang == 1">
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -98,7 +99,7 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -174,9 +175,9 @@
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-
+            
              this.scheduleData = arr
-
+            
              let a = response.data.data.day
               console.log("a",a)
               var myDate = new Date(a);
@@ -211,8 +212,8 @@
           this.currentDate = str
           }
        })
-
-
+       
+      
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -292,7 +293,7 @@
 
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
 
-
+        
         }
           return name
 
@@ -300,7 +301,7 @@
         }
 
       },
-
+     
       printAction: function() {
         const style = '@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; } }'
 
@@ -405,9 +406,9 @@
         var name = ''
         for (let i = 0; i < solution.length; i++) {
           if (mode_id == solution[i].mode_id) {
-
+         
             name = solution[i].dialyzer_perfusion_apparatus
-
+            
           }
         }
         console.log('name', name)

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -45,130 +45,150 @@
                         <div>{{ item.Mon_M.patient }} </div>
                         <div v-if="item.Mon_M.mode_name != 'HD'">
                             {{ item.Mon_M.mode_name }}
-                     </div>
+                       </div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_M.patient_id,item.Mon_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_A.patient_id">
                         <div>{{ item.Mon_A.patient }} </div>
                         <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_A.patient_id,item.Mon_A.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_N.patient_id">
                         <div>{{ item.Mon_N.patient }}</div>
                         <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_N.patient_id,item.Mon_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Tue_M.patient_id">
                         <div>{{ item.Tue_M.patient }}</div>
                         <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
+                         <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_M.patient_id,item.Tue_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Tue_A.patient_id">
                         <div>{{ item.Tue_A.patient }}</div>
                         <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_A.patient_id,item.Tue_A.mode_name)}}</div>
+
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Tue_N.patient_id">
                         <div>{{ item.Tue_N.patient }}</div>
                         <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_N.patient_id,item.Tue_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Wed_M.patient_id">
                         <div>{{ item.Wed_M.patient }}</div>
                         <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_M.patient_id,item.Wed_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Wed_A.patient_id">
                         <div>{{ item.Wed_A.patient }}</div>
                         <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_A.patient_id,item.Wed_A.mode_name)}}</div>
                     </span>
                 </td>
-                <td style="min-width:50px;"> 
+                <td style="min-width:50px;">
                     <span v-if="item.Wed_N.patient_id">
                         <div>{{ item.Wed_N.patient }}</div>
                         <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_N.patient_id,item.Wed_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_M.patient_id">
                         <div>{{ item.Thurs_M.patient }}</div>
                         <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_M.patient_id,item.Thurs_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_A.patient_id">
                         <div>{{ item.Thurs_A.patient }}</div>
                         <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_A.patient_id,item.Thurs_A.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_N.patient_id">
                         <div>{{ item.Thurs_N.patient }}</div>
                         <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_N.patient_id,item.Thurs_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_M.patient_id">
                         <div>{{ item.Fri_M.patient }}</div>
                         <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_M.patient_id,item.Fri_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_A.patient_id">
                         <div>{{ item.Fri_A.patient }}</div>
                         <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_A.patient_id,item.Fri_A.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_N.patient_id">
                         <div>{{ item.Fri_N.patient }}</div>
-                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                        <div v-if="item.Fri_N.mode_name != 'HD'">{{ item.Fri_N.mode_name }}</div>
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_N.patient_id,item.Fri_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_M.patient_id">
                         <div>{{ item.Sat_M.patient }}</div>
                         <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_M.patient_id,item.Sat_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_A.patient_id">
                         <div>{{ item.Sat_A.patient }}</div>
                         <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_A.patient_id,item.Sat_A.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_N.patient_id">
                         <div>{{ item.Sat_N.patient }}</div>
                         <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_N.patient_id,item.Sat_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sun_M.patient_id">
                         <div>{{ item.Sun_M.patient }}</div>
                         <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} </div>
-                        <div>{{getDialyzer(item.Sun_M.patient_id,item.Sun_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_M.patient_id,item.Sun_M.mode_name)}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sun_A.patient_id">
                         <div>{{ item.Sun_A.patient }}</div>
                         <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} </div>
-                        <div>{{getDialyzer(item.Sun_A.patient_id, item.Sun_A.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_A.patient_id, item.Sun_A.mode_name)}}</div>
+
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sun_N.patient_id">
                         <div>{{ item.Sun_N.patient }}</div>
                         <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} </div>
-                        <div>{{getDialyzer(item.Sun_N.patient_id,item.Sun_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_N.patient_id,item.Sun_N.mode_name)}}</div>
                     </span>
                 </td>
                 <td>{{item.total}}</td>
@@ -215,7 +235,7 @@ export default {
     created(){
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
-        this.partition_id = this.$route.query.partition_id   
+        this.partition_id = this.$route.query.partition_id
         this.getSolutionSchedule()
     },
     methods:{
@@ -228,7 +248,7 @@ export default {
                 }
                 this.zones.push(...zones)
                 var strArr =  this.zoneIdList.join(",")
-                
+
                 this.strArr = strArr
                 this.getWeekPanels()
                 //统计患者排班数量
@@ -277,147 +297,168 @@ export default {
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Mon_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Mon_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Tue_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Tue_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Tue_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Wed_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Wed_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Wed_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Thurs_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Thurs_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Thurs_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Fri_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Fri_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Fri_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sat_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sat_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sat_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sun_A: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sun_N: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             Sun_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                                 patient_id: 0,
-                                patient: ''
+                                patient: '',
+                                type:1
                             },
                             total: 0
                             }
@@ -465,135 +506,156 @@ export default {
                     var theSchedules = response.data.data.schdules;
                     var that = this;
                     that.scheduleZone.forEach(function(zone, index) {
-                        
+
                         that.scheduleZone[index].Mon_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Mon_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Mon_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Tue_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Tue_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Tue_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Wed_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Wed_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Wed_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Thurs_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Thurs_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Thurs_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Fri_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Fri_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Fri_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sat_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sat_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sat_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sun_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sun_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].Sun_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
-                            patient: ""
+                            patient: "",
+                            type:1
                         };
                         that.scheduleZone[index].total = 0;
-                        
+
                         if (response.data.data.schdules.length > 0) {
                             theSchedules.forEach(function(schedule, sindex) {
 
@@ -614,77 +676,73 @@ export default {
                                         patient_id: schedule.patient_id,
                                         patient: schedule.patient,
                                         patient_contagions: schedule.patient_contagions,
-                                        mode_name:
-                                            typeof that.modeOptions[schedule.mode_id] ===
-                                            "undefined"
-                                            ? ""
-                                            : that.modeOptions[schedule.mode_id].name
+                                        mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
                                         };
                                         that.scheduleZone[index].total += 1;
-                                        
+
                                     }
-                                    
+
                                 }
-                                
+
                             });
                         }
-                       
+
                     });
-                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
-                     
-                     
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1",type:0},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
+
+
                      for(let i=0;i<newArr.length;i++){
                        for(let j=0;j<this.scheduleCountList.length;j++){
                             newArr[i].cut = this.total
                          //礼拜一上午
                           if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
                         //礼拜一下午
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
-                           
+
                               newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜一晚上
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
-                          } 
-                         
+                          }
+
                         //礼拜二上午
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
                          //礼拜二下午
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
-                          } 
-                        
+                          }
+
                          //礼拜二晚上
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜三上午
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜三下午
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜三晚上
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
                           }
 
@@ -692,76 +750,76 @@ export default {
 
                         //礼拜四上午
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜四下午
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜四晚上
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜五上午
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜五下午
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜五晚上
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜六上午
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜六下午
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜六晚上
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
                           }
-                         
+
 
                           //礼拜日上午
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
-                            
+
                               newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
-                          } 
+                          }
 
                          //礼拜日下午
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
-                            
+
                               newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜日晚上
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
-                            
+
                               newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
                           }
 
@@ -771,7 +829,7 @@ export default {
                     console.log("newArr222222222",newArr)
                     that.scheduleZone.push(...newArr)
                     console.log('总数据77777777777',that.scheduleZone)
-                    
+
                 } else {
                     this.$message.error("网络错误");
                     return false;
@@ -841,13 +899,13 @@ export default {
                if(response.data.state == 1){
                   var list = response.data.data.list
                   console.log("list22222",list)
-                  
+
                   this.scheduleCountList = list
                   var total = response.data.data.total
                   console.log("totalw222",total)
                   this.total = total
                }
-           }) 
+           })
         },
         getSolutionSchedule(){
           getSolutionSchedule().then(response=>{
@@ -942,28 +1000,41 @@ export default {
                  if(solution[i].mode_id == 29){
                     solution[i].mode_name = "PE"
                  }
+                 if(solution[i].solution!=undefined){
+                    solution[i].dialysis_dialyszers = solution[i].solution.dialysis_dialyszers
+                    solution[i].dialysis_irrigation = solution[i].solution.dialysis_irrigation
+                    solution[i].dialyzer_perfusion_apparatus = solution[i].solution.dialyzer_perfusion_apparatus
+                 }
+
                }
                this.solutionList = solution
-             }  
-          })  
+             }
+          })
         },
         getDialyzer(patient_id,mode){
           var diazers = ""
+          var irrigation = ""
           for(let i=0;i<this.solutionList.length;i++){
+            if(patient_id == 0){
+              return ""
+            }  
             if(patient_id == this.solutionList[i].patient_id && mode == this.solutionList[i].mode_name){
                if(this.solutionList[i].dialyzer_perfusion_apparatus!=""){
                  diazers = this.solutionList[i].dialyzer_perfusion_apparatus
+                 irrigation = this.solutionList[i].dialysis_irrigation
                }else{
                  diazers = this.solutionList[i].dialysis_dialyszers
-                 if(this.solutionList[i].dialysis_dialyszers == ""){
-                    diazers = this.solutionList[i].dialysis_irrigation
-                 }
+                 irrigation = this.solutionList[i].dialysis_irrigation
                
                }
-               
+
             }
           }
-          return diazers
+          if(irrigation!=""){
+             return diazers + "/" + irrigation
+          }else{
+            return diazers 
+          }
         }
     }
 }
@@ -975,4 +1046,4 @@ td{
     text-align: center;
     padding: 5px;
 }
-</style>
+</style>