Changes

package.json

@@ -59,7 +59,6 @@
     "jszip": "^3.10.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "pdfmake": "^0.2.8",

src/xt_pages/charging/charging_collect.vue

@@ -9,7 +9,7 @@
                v-model.trim="smart_keyword"
               :fetch-suggestions="querySearch"
               placeholder="请输入内容"
-              @select="handleSelect"
+              @select="handleSelectOne"
               
             >
            <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -83,17 +83,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div style="text-align: right;">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 40,100]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-      </div>
+     
     </div>
 
     <el-dialog
@@ -157,7 +147,7 @@
           <div><el-button type="primary" @click="queryCount">查询</el-button></div>
         </div>
         <div style="margin: 10px 0;">
-          <el-table border :data="tableList" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
+          <el-table border :data="tableData" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
             <el-table-column prop="index" label="序号" width="">
                <template slot-scope="scope">
                    {{ scope.$index+1 }}
@@ -247,6 +237,7 @@ import {uParseTime } from "@/utils/tools";
         {mode_id:4,mode_name:"HP"},
         {mode_id:5,mode_name:"其他"}
         ],
+        tableData:[]
       }
     },
     methods:{
@@ -285,6 +276,9 @@ import {uParseTime } from "@/utils/tools";
         this.smart_keyword = val.name;
         this.patient_id = val.id
       },
+      handleSelectOne(){
+        this.getlist()
+      },
       querySearch(queryString, cb){
         let key = ''
         if (queryString != undefined) {
@@ -326,8 +320,8 @@ import {uParseTime } from "@/utils/tools";
             if(response.data.state == 1){
               this.collect_show = true
               var tableList =  response.data.data.list
-              this.tableList = []
-              this.tableList = tableList
+              this.tableData = []
+              this.tableData = tableList
               this.patient = response.data.data.patient
               this.userList = []
               this.userList = response.data.data.userList
@@ -410,23 +404,7 @@ import {uParseTime } from "@/utils/tools";
         return user_name
       },
       getQuery(){
-        var params = {
-           patient_id:this.patient_id,
-           mode_id:this.mode_id,
-           is_type:this.is_type,
-           start_time:this.start_time,
-           end_time:this.end_time,
-          }
-          getPatientCountFlowById(params).then(response=>{
-            if(response.data.state == 1){
-              var tableList =  response.data.data.list
-              this.tableList = []
-              this.tableList = tableList
-              this.patient = response.data.data.patient
-              this.userList = []
-              this.userList = response.data.data.userList
-            }
-        })
+        this.getlist()
       }
     },
     created(){

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4357,7 +4357,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724  || this.org_id ==10751 || this.org_id == 0 || this.org_id ==10744) {
+        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724  || this.org_id ==10751) {
           if (response.data.data.doctorAdevieInfo != null && response.data.data.doctorAdevieInfo.length > 0) {
 
             for (let i = 0; i < response.data.data.doctorAdevieInfo.length; i++) {

src/xt_pages/outpatientTool/labelPrint.vue

@@ -134,12 +134,12 @@
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
+                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217&& $store.getters.xt_user.org.id != 10278&& $store.getters.xt_user.org.id != 0"  id="barcode">
                       </div>
                       <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
-                          <div style="font-size:28px;margin-left:20px;font-weight: bold">{{current_name}}</div>
+                          <div style="font-size:18px;margin-left:20px;font-weight: bold">{{current_name}}</div>
                       </div>
                   </div>
             </div>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -301,7 +301,7 @@
                 :trigger-on-focus="true"
                 placeholder="请输入耗材名称"
                 @select="handleSelectOne"
-                style="width:500px;"
+                style="width:400px;"
                 :popper-append-to-body="true"
               >
                 <i class="el-icon-search el-input__icon" slot="suffix"></i>

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -321,7 +321,7 @@
               :trigger-on-focus="true"
               placeholder="请输入药品名称"
               @select="handleSelectOne"
-              style="width: 500px"
+              style="width: 400px"
            >
             <i class="el-icon-search el-input__icon" slot="suffix"></i>
             <template slot-scope="{ item }">

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -1720,9 +1720,13 @@ export default {
             min_str = (total % min_number) + min_unit;
           }
       }
+      if(max_str<0){
+         max_str =""
+      }
       if(max_str == "" && min_str == ""){
         return "0"
       }else{
+
         return max_str + min_str;
       }
     },

src/xt_pages/stock/drugs/drugNewPrint.vue

@@ -144,18 +144,19 @@
      },
       getSumCount(){
         var sum_count = 0
-        for(let i=0;i<this.tableData.length;i++){
-          sum_count+=this.tableData[i].warehousing_count
+        for(let i=0;i<this.goodList.length;i++){
+          sum_count+=this.goodList[i].warehousing_count
         }
         return sum_count
       },
       getSumPrice(){
         var all_price = 0
-        for(let i=0;i<this.tableData.length;i++){
-          all_price+= (this.tableData[i].warehousing_count * this.tableData[i].price)
+        console.log("taoblePrint===========",this.tableData)
+        for(let i=0;i<this.goodList.length;i++){
+          all_price+= (this.goodList[i].warehousing_count * this.goodList[i].price)
         }
         if(all_price>0){
-           all_price.toFixed(2)
+          return all_price.toFixed(2)
         }else{
           return ""
         }

src/xt_pages/stock/goodPrint.vue

@@ -155,11 +155,14 @@
       },
       getSumPrice(){
         var all_price = 0
+        console.log("tabliedate----------",this.tableData)
         for(let i=0;i<this.tableData.length;i++){
-          all_price+= (this.tableData[i].warehousing_count * this.tableData[i].price)
+          all_price +=(this.tableData[i].warehousing_count * this.tableData[i].price)
         }
+        console.log("all_price-------------",all_price)
         if(all_price>0){
-           all_price.toFixed(2)
+          return all_price.toFixed(2)
+
         }else{
           return ""
         }