11月14日 库存扣减更新

package-lock.json

     },
     "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
     },
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/xt_pages/data/components/consumables.vue

       },
       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){
-                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[i].name
+                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[j].name
               }
            }
-           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType;z++){
-              if(this.goodInfo.goodInfoDialog.formValue[z].id == this.goodInfo.goodInfoData[i].good_type_id){
-                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue[z].name
+           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
+              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
               }
            }
 
              } 
           }
          }
-        
+         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'] 
          

src/xt_pages/data/components/drugs.vue

         </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">
       </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>
           <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>
           <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>
             value: '2',
             label: '未备案'
           }],
+         optionsOne: [
+          {
+            value: '0',
+            label: '全部'
+          }, {
+            value: '1',
+            label: '是'
+          }, {
+            value: '2',
+            label: '否'
+          }],
         value: '',
 
         dealer:[],
                this.list[i].dealer_name = this.dealer[s].dealer_name
              }
            }
+           for(let b=0;b<this.getDataConfig('hemodialysis','units').length;b++){
+             if(this.list[i].drug_dose_unit == this.getDataConfig('hemodialysis','units')[b].id){
+               this.list[i].drug_dose_unit_name = this.getDataConfig('hemodialysis','units')[b].name
+
+             }
+           }
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
          }
 
          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)
      

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

                         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

             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

         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 = '收缩压'
         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
         }
       }
       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/cancelStockOrderEdit.vue

         <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>
                     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>

src/xt_pages/stock/detail/stockInDetail.vue

       </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"
           </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) }}
       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

       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

               <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>    
                 <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>
              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){
        
         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=  ""
         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

         </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

                         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>
      
      
               </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>
                   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">
           expiry_date:[
            {required:true,message:'有效日期不能为空',trigger:'blur'}
           ],
+          retail_price:[
+            {required:true,message:'请输入包装零售价',trigger:'blur'}
+          ]
         },
         type: this.$route.query.type,
         total: '',
         showTwo:false,
         drugTypeList:[],
         totalPrice:0,
+        unitList:[],
       }
     },
     methods: {
              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
              }
               '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)
         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
              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
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       
-     
-    
+     this.unitList =  getDataConfig('hemodialysis','units')
     }
 
   }

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

 
       <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

     </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"
         </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
           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"
                     @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>
                 </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>
                     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>
   GetAllConfig,
   GetAllDrugInfoByID,
   getDrugWarehouseInfoList,
-  modifyDrugWarehouseInfo,
-  deleteDrugWarehouseInfo,
   DeleteDrugWarehouseInfoItem,
   EditDrugWarehouse
 } from "@/api/drug/drug_stock";
         batch_number:[
           {required:true,message:'批号不能为空',trigger:'blur'}
         ],
+        retail_price:[
+         {required:true,message:'请输入包装零售价',trigger:'blur'}
+        ]
       },
 
       total: "",
       dealerList:[],
       org_id:0,
       listLoading:false,
+      unitList:[],
+      drug_show:false,
     };
   },
   methods: {
 
              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
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+     
           EditDrugWarehouse(
             params,
             this.warehousing_time,
         } 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,
 
             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){
             this.warehouse.warehousing_time,
             "{y}-{m}-{d}"
           );
-
-        
         }
       });
     },
              }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
     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>
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+
 </style>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

     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/query.vue

         </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">
     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
       }
         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){
            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)
 
         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

         >
         </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"
           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>
                     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

           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/workforce/remind_print.vue

                     (<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.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                   <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <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>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <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 == 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>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>

src/xt_pages/workforce/scheduleTablePrintOne.vue

                         <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>
     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:{
                 }
                 this.zones.push(...zones)
                 var strArr =  this.zoneIdList.join(",")
-                
+
                 this.strArr = strArr
                 this.getWeekPanels()
                 //统计患者排班数量
                                 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
                             }
                     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) {
 
                                         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
                           }
 
 
                         //礼拜四上午
                          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
                           }
 
                     console.log("newArr222222222",newArr)
                     that.scheduleZone.push(...newArr)
                     console.log('总数据77777777777',that.scheduleZone)
-                    
+
                 } else {
                     this.$message.error("网络错误");
                     return false;
                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=>{
                  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 
+          }
         }
     }
 }
     text-align: center;
     padding: 5px;
 }
-</style>
+</style>