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

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[20, 40, 60, 80, 100]"
+          :page-sizes="[20, 40, 60, 80, 100,200,300,500,1000]"
           :page-size="10"
           background
           style="margin-top:20px;"

src/xt_pages/stock/drugs/drugDamaged.vue

           end_time:this.end_time,
           keyword:this.searchKey,
         }
+        console.log("博阿孙param232332232323",params)
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
              this.tableList = response.data.data.list
         return user_name
      },
      changeStartTime(){
-
+       this.start_time = this.getTime(this.start_time)
+       this.getlist()
      },
      changeEndTime(){
-
+       this.end_time = this.getTime(this.end_time)
+       this.getlist()
      },
      getTotalCount(drugid,max_unit,min_unit,min_number){
         
      getDrugDamageRadio(count){
 
        var total_count =  this.getDamagedCountOne(this.total_count)
+       console.log("count888888888888",count)
+       console.log("hh23232数据列表23322323",total_count)
        var all_count = 0
        all_count =  total_count * this.min_number
       

src/xt_pages/stock/drugs/inventory.vue

               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.stock_max_number > 0"><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
-                    <span v-if="scope.row.stock_min_number > 0"><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                    <span><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                   </template> 
               </el-table-column>
 
             if (keyword != undefined) {
                 key = keyword
             }
-            postSearchDrugWarehouseList(key).then(response => {
+            console.log("keyword23323232323223",keyword)
+             var params = {
+                keyword:key,
+             }
+            postSearchDrugWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
                       }
                    }
                  }
+                console.log("newlist23233223323222323232332",newList)
                 this.tableData = newList
                 this.showSearch = false
                 this.showTable = true

src/xt_pages/stock/drugs/inventoryDetails.vue

                 <template slot-scope="scope">
                   <span v-if="scope.row.stock_max_number>0">{{scope.row.stock_max_number}}{{scope.row.warehousing_unit}} </span>  
                   <span v-if="scope.row.stock_min_number>0">{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
+                  <span v-if="scope.row.stock_max_number == 0 && scope.row.stock_min_number == 0">0</span>
                 </template> 
             </el-table-column>
 
                 <template slot-scope="scope">
                    <span v-if="scope.row.last_stock_max_number > 0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>  
                    <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
+                   <span v-if="scope.row.last_stock_max_number == 0 && scope.row.last_stock_min_number == 0">0</span>
                 </template> 
             </el-table-column>
             <el-table-column prop="name" label="盘点类型" width="120"  align="center">

src/xt_pages/stock/drugs/query.vue

            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
                <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243">
-                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
                
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>

src/xt_pages/stock/inventory.vue

           <div style="font-size:16px">{{item.good_name}}</div> &nbsp;&nbsp;{{item.specification_name}} <el-button type="warning" icon="el-icon-remove" style="margin-left:20px;" @click="toMove(item,index)">移除</el-button>
         </template>
         <el-table :data="item.child" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
-              <el-table-column prop="date" label="药品名称" width="150" align="center">
+              <el-table-column prop="date" label="耗材名称" width="150" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>
               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.stock_count > 0"><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
                   </template> 
               </el-table-column>
 
             if (keyword != undefined) {
                 key = keyword
             }
-            postSearchGoodWarehouseList(key).then(response => {
+            var params = {
+              keyword:key
+            }
+            postSearchGoodWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
+              list[i].type = 0
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventoryDetails.vue

            
             <el-table-column prop="name" label="盘点前数量" width="100" align="center">
               <template slot-scope="scope">
-                 <span v-if="scope.row.stock_count >0 ">{{scope.row.stock_count}}</span>
+                 <span>{{scope.row.stock_count?scope.row.stock_count:0}}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="盘点后数量" width="100" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.last_stock_count>0">{{scope.row.last_stock_count}}</span> 
+                <span>{{scope.row.last_stock_count?scope.row.last_stock_count:0}}</span> 
              </template>
             </el-table-column>
            

src/xt_pages/stock/stockInventory.vue

             crumbs: [
                 { path: false, name: "库存管理" },
                 { path: false, name: "耗材管理" },
-                { path: false, name: "耗材报损" }
+                { path: false, name: "耗材盘点" }
             ],
             activeName:'first'
         }

src/xt_pages/user/dialysisSolution.vue

             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
+          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 3 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
              <el-form-item label="灌流器:">
                <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>

src/xt_pages/user/doctorAdvice.vue

           <ul>
             <li>
               <span class="name">姓名：</span>
-              <!-- <input type="text" class="InputBox" v-model="currentPatient.name"> -->
               <span class="InputBox">&nbsp;{{ currentPatient.name }}</span>
             </li>
             <li>
               <span class="name">性别：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranSex(currentPatient.gender) }}</span
               >
             </li>
             <li>
               <span class="name">年龄：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
               >
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name">科别：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li>
               <span class="name">透析号：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;&nbsp;&nbsp;{{
                   currentPatient.dialysis_no
                 <span v-if="advice.advice_desc"
                   >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
                 >
-                <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                 <span v-if="advice.prescribing_number"
                   >*{{ advice.prescribing_number
                   }}{{ advice.prescribing_number_unit }}</span
 
               <td>
                 <div>
-                  <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
-                    getXuserName(advice.advice_doctor)
-                  }}</span>
+                  <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{getXuserName(advice.advice_doctor)}}</span>
                   <img
                     class="es-img"
                     :src="setAdminUserES(advice.advice_doctor)"
 
               <td></td>
               <td>
-                <span
-                  v-if="
-                    advice.stop_state == 1 && isShowCQStartTime(index, advice)
-                  "
-                  >{{ advice.stop_time | parseTime("{y}-{m}-{d}") }}</span
-                >
+                <span v-if="advice.stop_state == 1">{{ advice.stop_time | parseTime("{y}-{m}-{d}") }}</span>
               </td>
               <td>
-                <span
-                  v-if="
-                    advice.stop_state == 1 && isShowCQStartTime(index, advice)
-                  "
-                  >{{ advice.stop_time | parseTime("{h}:{i}") }}</span
-                >
+                <span v-if="advice.stop_state == 1">{{ advice.stop_time | parseTime("{h}:{i}") }}</span>
               </td>
               <td>
-                <div v-if="isShowCQStartTime(index, advice)">
-                  <span v-if="setAdminUserES(advice.stop_doctor) == ''">{{
-                    getXuserName(advice.stop_doctor)
-                  }}</span>
+                <div><span v-if="setAdminUserES(advice.stop_doctor) == ''">{{getXuserName(advice.stop_doctor)}}</span>
                   <img
                     class="es-img"
                     :src="setAdminUserES(advice.stop_doctor)"
           <ul>
             <li>
               <span class="name" style="width:50px;">姓名：</span>
-              <!-- <input type="text" class="InputBox" v-model="currentPatient.name"> -->
               <span class="InputBox">&nbsp;{{ currentPatient.name }}</span>
             </li>
             <li>
               <span class="name" style="width:50px;">性别：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranSex(currentPatient.gender) }}</span
               >
             </li>
             <li>
               <span class="name" style="width:50px;">年龄：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox"
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
               >
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">科：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">区：</span>
-              <!-- <input type="text" class="InputBox"> -->
+             
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">房：</span>
-              <!-- <input type="text" class="InputBox"> -->
+              
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
-            <li>
+            <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">床：</span>
-              <!-- <input type="text" class="InputBox"> -->
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li>
               <span class="InputBox"
                 >&nbsp;{{ currentPatient.dialysis_no }}&nbsp;&nbsp;&nbsp;</span
               >
-
-              <!-- <input type="text" class="InputBox"> -->
             </li>
           </ul>
         </div>
               </td>
 
               <td>
-                <span v-if="advice.stop_state == 1 && advice.parent_id == 0">{{
+                <span v-if="advice.parent_id == 0">{{
                   advice.stop_time | parseTime("{y}-{m}-{d} {h}:{i}")
                 }}</span>
                 <span v-else></span>
               </td>
 
               <td>
-                <span v-if="advice.stop_state == 1 && advice.parent_id == 0">{{
+                <span v-if="advice.parent_id == 0">{{
                   getXuserName(advice.stop_doctor)
                 }}</span>
                 <span v-else></span>
       // console.log("column", column);
     },
     onTranPatient: function(tranPatient) {
+      console.log("患者信息",tranPatient)
       this.currentPatient = tranPatient;
     },
     adviceNameShow({ row, column, rowIndex, columnIndex }) {
       getDoctorAdviceList(this.listQuery).then(response => {
         if (response.data.state == 1) {
           this.adviceTableData = response.data.data.advices;
-          //console.log("数据是什么", this.adviceTableData);
+          console.log("数据是什么", this.adviceTableData);
           var advice = response.data.data.advices;
           var one = response.data.data.advicetwo;
           let dataInfo = {};
     this.unitsOption = getDataConfig("hemodialysis", "units");
     //查询该病人是否有排班记录
     this.getPatientSchedules(id);
-
-
     this.getSelfMedicalList(id)
   }
 };