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

src/App.vue

   },
   watch:{
   $route(to,from){
-    console.log("pppppppppp",to.path);
+    
     if(to.path.indexOf('/patients/patient')== -1){
       window.sessionStorage.removeItem('patientKey')
     }

src/xt_pages/data/components/addConsumable.vue

             <el-tab-pane label="基础数据" name="first">
                 <div>
                     <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                        <el-form-item label="耗材名称22 : " prop="name" style="width:100%">
+                        <el-form-item label="耗材名称 : " prop="name" style="width:100%">
                             <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="拼音 : " prop="name" style="width:50%">

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

         this.lastafterdialysis = response.data.data.assessmentAfterDislysis;
         this.operators = response.data.data.operators;
         console.log("operators", this.operators);
-        console.log('pppppppppppppppppp22',response.data.data.dialysisOrder)
+        // console.log('pppppppppppppppppp22',response.data.data.dialysisOrder)
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

                       <td width="100">BP<br />mmHg</td>
                       <td width="60">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90">超滤量累计 <span v-if="orgid == 9555">ml</span><span v-else>L</span></td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">病情特殊情况处理<br />及专科护理措施记录</td>
                       <td width="100">护士签名</td>
                       <td width="100">BP<br />mmHg</td>
                       <td width="70">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90">超滤量累计 <span v-if="orgid == 9555">ml</span><span v-else>L</span> </td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">病情特殊情况处理<br />及专科护理措施记录</td>
                       <td width="100">护士签名</td>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{ "/" }}
                   </div>
-                  L
+                  <span v-if="orgid == 9555">ml</span>
+                  <span v-else>L</span>
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
                   <div class="under_line" style="width: 70px;" v-else>
                     {{ "/" }}
                   </div>
-                  L
+                  <span v-if="orgid == 9555">ml</span>
+                  <span v-else>L</span>
                 </div>
                 <div class="inline_block">
                   透后体重：

src/xt_pages/stock/Dialog/stockInDialog.vue

           style="width: 100%">
           <el-table-column
             align="center"
-            label="商品类型">
+            label="耗材类型">
             <template slot-scope="scope">
               <!-- <span>{{getGoodTypeName(scope.row)}}</span> -->
               <span>{{scope.row.type_name}}</span>

src/xt_pages/stock/cancelStockOrderAdd.vue

           <el-select
             size="small"
             v-model="form.dealer"
-            clearable
+            filterable
             placeholder="请选择经销商"
             @change="changeDealer"
           >
           <el-select
             size="small"
             v-model="form.manufacturer"
-            clearable
+            filterable
             placeholder="请选择厂商"
             @change="changeManufacturer"
           >

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

           <el-select
             size="small"
             v-model="form.dealer"
-            clearable
+            filterable
             placeholder="请选择经销商"
             @change="changeDealer"
           >
           <el-select
             size="small"
             v-model="form.manufacturer"
-            clearable
+            filterable
             placeholder="请选择厂商"
             @change="changeManufacturer"
           >

src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue

 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商" @change="changeManufacturer">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
                    @change="changeManufacturer">
           <el-option
             v-for="(option, index) in manufacturer"

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

         <el-select
           size="small"
           v-model="form.dealer"
-          clearable
+          filterable
           placeholder="请选择经销商"
           @change="changeDealer"
         >
         <el-select
           size="small"
           v-model="form.manufacturer"
-          clearable
+          filterable
           placeholder="请选择厂商"
           @change="changeManufacturer"
         >

src/xt_pages/stock/salesReturnOrderAdd.vue

 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商" @change="changeManufacturer">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"

src/xt_pages/stock/stockInOrderAdd.vue

 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
-          <el-option
+       
+       <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商"  @change="changeDealer">
+           <el-option
             v-for="(option, index) in dealer"
             :key="index"
             :label="option.dealer_name"
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
                    @change="changeManufacturer">
           <el-option
             v-for="(option, index) in manufacturer"
           <el-table-column align="center" width="200">
 
             <template slot="header" slot-scope="scope">
-              <span>商品类型<span style="color: red">*</span></span>
+              <span>耗材类型<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
-                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
+                <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id"
                           :value="typeName(scope.row.good_type_id)"
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
               </el-form-item>
 
             </template>
           </el-table-column>
-
+          <el-table-column align="center" width="200">
+             <template slot="header" slot-scope="scope">
+              <span>单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top:15px">
+              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
+                 <el-option
+                   v-for="(item,index) in propForm.goodUnit"
+                   :key="index"
+                   :label="item.name"
+                   :value="item.id">
+                </el-option>
+              </el-select>
+ 
+              </el-form-item>
+            </template>
+          </el-table-column>
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
 <script>
   import stockInDialog from './Dialog/stockInDialog'
   import { uParseTime } from '@/utils/tools'
-
+ import {getDataConfig } from "@/utils/data";
   import {
     deleteWarehouseInfo,
     GetAllConfig,
         this.propForm.formValue = {}
         this.propForm.isCreated = 1
         this.isVisibility = true
-      }, comfirm: function(val) {
+      },
+       comfirm: function(val) {
+        console.log("val99999999999999",val)
         this.propForm.goodType = []
         this.propForm.goods = []
 
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
-
+              this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
             } else {
               const tempForm = {}
               tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
+              tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
         return name
       }, specificationName: function(good_info_id) {
+        console.log("333333333",this.goodInfo)
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == good_info_id) {
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
-      }, GetWarehouseInfoByOrdeNumber: function() {
+      }, 
+      GetWarehouseInfoByOrdeNumber: function() {
         const params = {
           'warehousing_order': sessionStorage.getItem('warehousing_orders')
         }
         this.recordInfo.recordData = []
         getWarehouseInfoByOrdeNumber(params).then(response => {
           if (response.data.state != 0) {
+             console.log("8888888888mma",response.data.data.info)
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
+            console.log("array9999999",array)
+           
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
 
       }, changeDealer(val) {
 
-      }
+      },
+      getDataConfig(module, filed_name){
+         return getDataConfig(module, filed_name)
+       },
     }
     ,
     created() {
       tempObj['remark'] = ''
       tempObj['dealer'] = ''
       tempObj['manufacturer'] = ''
-
+      tempObj['good_unit'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
+
+      console.log("单位",this.getDataConfig('hemodialysis','units'))
     }
 
   }

src/xt_pages/stock/stockOutOrderAdd.vue

         <el-select
           size="small"
           v-model="form.dealer"
-          clearable
+          filterable
           placeholder="请选择经销商"
           @change="changeDealer"
         >
         <el-select
           size="small"
           v-model="form.manufacturer"
-          clearable
+          filterable
           placeholder="请选择厂商"
           @change="changeManufacturer"
         >
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>商品类型</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
               </el-form-item>
             </template>
           </el-table-column>
+          
+          <el-table-column min-width="35" align="center">
+             <template slot="header" slot-scope="scope">
+              <span>单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
+                 <el-option
+                   v-for="(item,index) in propForm.goodUnit"
+                   :key="index"
+                   :label="item.name"
+                   :value="item.id">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" min-width="20" width="150">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
             this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
             this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
             this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
-
+            this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
           } else {
             const tempForm = {}
             tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
             tempForm['count'] = ''
             tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
             tempForm['remark'] = ''
+            tempForm['good_unit'] = ''
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-
+    tempObj["good_unit"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockQuery.vue

             <span>{{ scope.row.specification_name }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            <span>{{getUnit(scope.row.good_unit)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             <span
       toPrint(){
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
         
+      },
+
+      getUnit(id){
+        
+        var name = ""
+        for(let i=0;i<this.$store.getters.good_unit.length;i++){
+           if(id == this.$store.getters.good_unit[i].id){
+              name = this.$store.getters.good_unit[i].name
+           } 
+        }
+        return name
       }
   }
 };

src/xt_pages/user/patients.vue

            if(response.data.state == 1){
              this.gridData = response.data.data.patients;
              this.totalOne = response.data.data.total;
-             this.value = response.data.data.total
+             var  value = response.data.data.total
+             if(value == 0){
+               this.value = ""
+             }
+             if(value != 0){
+               this.value = value
+             }
            }
         })
       },