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

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

                   template_id == 40 ||
                   template_id == 41 ||
                   template_id == 43 ||
+                  template_id == 44 ||
                   org_id == 9555)
             "
           >
                 template_id != 40 &&
                 template_id != 41 &&
                 template_id != 43 &&
+                template_id != 44 &&
                 org_id!=9555
             "
           >
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38  || template_id == 41 || template_id == 43) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38  || template_id == 41 || template_id == 43 || template_id == 44) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38  && template_id != 41 && template_id != 43"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38  && template_id != 41 && template_id != 43 && template_id != 44"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38 && template_id != 41 && template_id != 43">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38 && template_id != 41 && template_id != 43 && template_id != 44">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38  && template_id!=41 && template_id!=43 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38  && template_id!=41 && template_id!=43 && template_id!=44 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 44">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
             v-if="org_template_info.template_id == 43"
           >
           </DialysisPrintOrderFortyThree>
+          <DialysisPrintOrderFortyFour
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 44"
+          >
+          </DialysisPrintOrderFortyFour>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
 import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
 import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
+import DialysisPrintOrderFortyFour from "./template/DialysisPrintOrderFortyFour";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortyFour,
     DialysisPrintOrderFortyThree,
     DialysisPrintOrderFortyTwo,
     DialysisPrintOrderFortyOne,
           style: style2,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 44){
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style9,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 ){
+            if (row.count <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.count <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
               }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }else{
+           if (row.total <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
         }
+
         this.curDrugs = selection
       },
 
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 ){
+           if (row.stock_count <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.stock_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
             }
-            this.$message.error(row.project_name + '库存不足')
-            return
           }
+        }else{
+           if (row.total <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
+
         }
+
         this.teamList.push(row)
       },
       getlist() {

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

     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+         
            <el-autocomplete
              class="checkSearch"
              popper-class="my-autocomplete"
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
+        <div><el-button type="primary" @click="exportList">导出</el-button></div>
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
             }
           })
           let list = Object.values(dataInfo)
-          // console.log("arr",list)    
+             
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
         var strs = str.substring(0, str.length - 1)
        
         return strs
-      }
+      },
+      exportList(){
+        console.log("DialysisData",this.DialysisData)
+       for(let i=0;i<this.DialysisData.length;i++){
+         this.DialysisData[i].index = i+1
+         this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
+         this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
+       }
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
+        
+        const data = this.formatJson(filterVal, this.DialysisData)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+       );
+     }
+
   },
   created(){
     var nowDate = new Date();

src/xt_pages/stock/detail/cancelStockDetail.vue

           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+            console.log("批次列表",this.numberList)
              for(let j=0;j<this.numberList.length;j++){
                 if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
                    this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
             cancelStock: this.recordInfo.recordData
           };
           console.log("params2222",params,this.return_time)
-          
+        
           postDrugCancelStock(
             params,
             this.return_time,
            if(response.data.state == 1){
              var list = response.data.data.list
              console.log("list2222",list)
-             this.numberList = list
+             for(let i=0;i<list.length;i++){
+               this.numberList.push(list[i])
+             }
+             
            }
         })
       },

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

            if(response.data.state == 1){
              var list = response.data.data.list
              console.log("list2222",list)
-             this.numberList = list
+             for(let i=0;i<list.length;i++){
+               this.numberList.push(list[i])
+             }
            }
         })
       },

src/xt_pages/stock/drugs/drugDamaged.vue

 <template>
-  <div class="main-contain">
-    <div class="app-container">
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;"
-                class="filter-item"
-                v-model.trim="searchKey"
-                placeholder="请输入药品名称"
-                />
-                <el-button
-                size="small"
-                class="filter-item"
-                type="primary"
-                icon="el-icon-search"
-                @click="search"
-                >搜索</el-button
-                >
-                <el-date-picker
-                size="small"
-                v-model="start_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeStartTime">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                v-model="end_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeEndTime">
-                </el-date-picker>
-            </div> 
-        </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column  prop="date" label="报损日期" align="center">
-               <template slot-scope="scope">
-                  {{getTime(scope.row.start_time)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="药品名称" align="center">
-               <template slot-scope="scope">
-                  {{scope.row.drug_name}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="规格" align="center">
-               <template slot-scope="scope">
-                  {{scope.row.specification_name}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="总报损数量" align="center">
-               <template slot-scope="scope">
-                  {{getTotalCount(scope.row.drug_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="总报损金额" align="center">
-               <template slot-scope="scope">
-                  {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="操作人" align="center">
-               <template slot-scope="scope">
-                  {{getDoctorName(scope.row.creater)}}
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="clickDetai(scope.row.drug_id)">查看详情</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-        </el-pagination>
-    </div>
+  <div>
+    <div  style="margin-bottom:10px;">
+      <el-input
+      size="small"
+      style="width: 200px;"
+      class="filter-item"
+      v-model.trim="searchKey"
+      placeholder="请输入药品名称"
+      />
+      <el-button
+      size="small"
+      class="filter-item"
+      type="primary"
+      icon="el-icon-search"
+      @click="search"
+      >搜索</el-button
+      >
+      <el-date-picker
+      size="small"
+      v-model="start_time"
+      type="date"
+      style="margin-left:5px;width:140px;"
+      placeholder="选择日期"
+      @change="changeStartTime">
+      </el-date-picker>
+      <el-date-picker
+      size="small"
+      v-model="end_time"
+      type="date"
+      style="margin-left:5px;width:140px;"
+      placeholder="选择日期"
+      @change="changeEndTime">
+      </el-date-picker>
+    </div> 
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column  prop="date" label="报损日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.start_time)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="药品名称" align="center">
+            <template slot-scope="scope">
+              {{scope.row.drug_name}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="规格" align="center">
+            <template slot-scope="scope">
+              {{scope.row.specification_name}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="总报损数量" align="center">
+            <template slot-scope="scope">
+              {{getTotalCount(scope.row.drug_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="总报损金额" align="center">
+            <template slot-scope="scope">
+              {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="操作人" align="center">
+            <template slot-scope="scope">
+              {{getDoctorName(scope.row.creater)}}
+            </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="clickDetai(scope.row.drug_id)">查看详情</el-button>
+            </template>
+        </el-table-column>
+    </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+    </el-pagination>
 
     <el-dialog
       title="盘点批次详情"
       <span>
         <el-form>
           <el-row>
-            <el-col>
+            <el-col :span="8">
               <el-form-item label="入库单号:">
                  <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="原因:">
                   <el-select v-model="form.type" placeholder="请选择">
                       <el-option
                       </el-option>
                   </el-select>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-button type="primary" @click="toQuery">查询</el-button>
             </el-col>
           </el-row>
-          <el-row>
-            <div>&nbsp;&nbsp;{{drug_name}}  &nbsp;&nbsp;总损耗数量: {{getDamagedCount(total_count)}}    &nbsp;&nbsp;总报损金额:{{(total_count * min_price).toFixed(2)}}</div>
+          <el-row style="margin-bottom:10px;">
+            <div>{{drug_name}}  &nbsp;&nbsp;总损耗数量: {{getDamagedCount(total_count)}}    &nbsp;&nbsp;总报损金额:{{(total_count * min_price).toFixed(2)}}</div>
           </el-row>
           <el-row>
             <el-table

src/xt_pages/stock/drugs/drugStockInOrder.vue

         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{getManufacturer(scope.row.drug.manufacturer)}}
+            {{getManufacturer(scope.row.manufacturer)}}
           </template>
         </el-table-column>
        <el-table-column label="生产日期" align="center">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

               total += this.drugFlowList[i].count
           }
         }
-        all_price = total * price
+        all_price = total * min_price
       
         return  all_price
       },

src/xt_pages/stock/drugs/inventoryDetails.vue

             </div> -->
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
-            <el-table-column prop="date" label="药品名称" width="200" align="center">
+            <el-table-column prop="date" label="药品名称" align="center">
                <template slot-scope="scope">
                  {{scope.row.drug_name}}
                </template>

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="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877">
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243">
                 <span> 
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
                 </span> 
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <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">
+               <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)}}
                </span>
                

src/xt_pages/stock/inventory.vue

         style="width:300px;"
       >
         <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>
-      </template>
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+        </template>
     </el-autocomplete>  
   </div>
    <div v-show="showTable">

src/xt_pages/stock/inventoryDetails.vue

         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" >
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="耗材名称"  width="300" align="center">
+            <el-table-column prop="date" label="耗材名称" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>

src/xt_pages/stock/stockDamaged.vue

 <template>
-  <div class="main-contain">
-    <!-- <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div> -->
-    <div class="app-container">
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;"
-                class="filter-item"
-                v-model.trim="searchKey"
-                placeholder="请输入耗材名称"
-                />
-                <el-button
-                size="small"
-                class="filter-item"
-                type="primary"
-                icon="el-icon-search"
-                @click="search">搜索</el-button>
-                <!-- <el-date-picker
-                size="small"
-                @change="changeStartTime"
-                v-model="start_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                @change="changeEndTime"
-                v-model="end_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker> -->
-            </div>
-            <!-- <div>
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
-            </div> -->
-        </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <!-- <el-table-column prop="date" label="报损编码" align="center">
-               <template  slot-scope="scope">
-                {{scope.row.warehousing_order}}
-               </template>    
-            </el-table-column> -->
-            <!-- <el-table-column prop="date" label="报损日期"  align="center">
-              <template  slot-scope="scope">
-                {{getTime(scope.row.start_time)}}
-               </template>    
-            </el-table-column> -->
-            <el-table-column prop="date" label="耗材名称"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.good_name}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="date" label="耗材规格"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.specification_name}}
-               </template>    
-            </el-table-column>
-             <el-table-column prop="date" label="总耗损数量"  align="center">
-              <template  slot-scope="scope">
-                {{getDamageCount(scope.row.good_id)}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="date" label="总报损金额"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.count}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="name" label="操作"  align="center">
-              <template  slot-scope="scope">
-                <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
-               </template>     
-            </el-table-column>
-            <!-- <el-table-column prop="name" label="审核日期"  align="center">
-              <template  slot-scope="scope">
-                {{getTime(scope.row.checker_time)}}
-             </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="name" label="核对人"  align="center">
-              <template slot-scope="scope">
-                {{getChecker(scope.row.checker)}}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="状态"  align="center">
-             <template slot-scope="scope">
-                <span v-if="scope.row.checker_status == 1">已核对</span>
-                <span v-if="scope.row.checker_status == 2">未核对</span>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column label="操作"  align="center"  width="200" >
-                <template slot-scope="scope">
-                <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
-                <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
-                </template>
-            </el-table-column> -->
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
-        </el-pagination>
+  <div>
+    <div  style="margin-bottom:10px;">
+        <el-input
+        size="small"
+        style="width: 200px;"
+        class="filter-item"
+        v-model.trim="searchKey"
+        placeholder="请输入耗材名称"
+        />
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search">搜索</el-button>
     </div>
+  
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column prop="date" label="耗材名称"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.good_name}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="date" label="耗材规格"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.specification_name}}
+            </template>    
+        </el-table-column>
+          <el-table-column prop="date" label="总耗损数量"  align="center">
+          <template  slot-scope="scope">
+            {{getDamageCount(scope.row.good_id)}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="date" label="总报损金额"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.count}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="name" label="操作"  align="center">
+          <template  slot-scope="scope">
+            <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
+            </template>     
+        </el-table-column>
+        <!-- <el-table-column prop="name" label="审核日期"  align="center">
+          <template  slot-scope="scope">
+            {{getTime(scope.row.checker_time)}}
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column prop="name" label="核对人"  align="center">
+          <template slot-scope="scope">
+            {{getChecker(scope.row.checker)}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="状态"  align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.checker_status == 1">已核对</span>
+            <span v-if="scope.row.checker_status == 2">未核对</span>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column label="操作"  align="center"  width="200" >
+            <template slot-scope="scope">
+            <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
+            <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
+            </template>
+        </el-table-column> -->
+    </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+    >
+    </el-pagination>
     <el-dialog
         title="耗材报损"
         :visible.sync="dialogVisible"
       title="盘点批次详情"
       :visible.sync="modifyDialogVisible"
       width="80%">
-      <span>
         <el-form>
           <el-row>
-            <el-col>
+            <el-col :span="8">
               <el-form-item label="入库单号:">
                  <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="原因:">
                   <el-select v-model="form.type" placeholder="请选择">
                       <el-option
                       </el-option>
                   </el-select>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-button type="primary" @click="toQuery">查询</el-button>
             </el-col>
           </el-row>
-          <el-row>
-            <div>&nbsp;&nbsp; &nbsp;&nbsp;总损耗数量:{{getDamageCount(good_id)}}     &nbsp;&nbsp;总报损金额:{{ (getDamageCount(good_id) * price).toFixed(2) }}</div>
+          <el-row style="margin-bottom:10px;">
+            <div>总损耗数量:{{getDamageCount(good_id)}}     &nbsp;&nbsp;总报损金额:{{ (getDamageCount(good_id) * price).toFixed(2) }}</div>
           </el-row>
           <el-row>
             <el-table
             </el-table>
           </el-row>
         </el-form>
-      </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="modifyDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="modifyDialogVisible = false">确 定</el-button>

src/xt_pages/stock/stockInOrder.vue

         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
+            {{ getManufactuerName(scope.row.manufacturer)}}
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">

src/xt_pages/stock/stockQuery.vue

        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
          </template>
        </el-table-column>

src/xt_pages/workforce/next_remind_print.vue

               scheduleData[i].sort = scheduleData[i].number.sort
             }
             var arr =   scheduleData.sort(this.compare('sort'))
-            console.log("打印",arr)
+            // console.log("打印",arr)
             this.scheduleData = arr
           }
           if(this.pre_status == 1){
         var name = ''
         for (let i = 0; i < solution.length; i++) {
           if (mode_id == solution[i].mode_id) {
-         
+
             name = solution[i].dialyzer_perfusion_apparatus
-            
+
           }
         }
         console.log('name', name)