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/template/DialysisPrintOrderThirtySix.vue

@@ -985,6 +985,32 @@
           </td>
           
           
+          <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td>
+            <span v-if="setAdminUserES(advice.execution_staff) == ''">
+              {{ getAdminUser(advice.execution_staff) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+            </span>
+          </td>
+        </tr>
+        <tr v-for="(advice, advice_index) in projects" :key="advice_index + 'no'">
+          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
+          <td class="parent" style="text-align:left;padding-left:10px;">
+            <span v-if="advice.type == 2">{{ advice.project.project_name }} &nbsp;&nbsp;{{advice.count}}{{advice.unit}}</span>
+            <span v-if="advice.type == 3">{{ advice.good_info.good_name }} &nbsp;&nbsp;{{advice.count}}{{advice.good_info.packing_unit}}</span>
+          </td>
+          <td>
+            <span v-if="setAdminUserES(advice.doctor) == ''">
+              {{ getAdminUser(advice.doctor) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:38px;" :src="setAdminUserES(advice.doctor)" alt srcset />
+            </span>
+          </td>
+          
+          
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
           <td>
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
@@ -1122,7 +1148,8 @@ export default {
         gaijiliang_unit: ''
       },
       org_id:0,
-      tableAdvice:[]
+      tableAdvice:[],
+      projects:[]
     }
   },
   methods: {
@@ -1409,13 +1436,13 @@ export default {
             }
           }
           this.jilurow = this.monitors.length + 1
-
+          this.projects = response.data.data.projects
           var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
-          if (tableAdvice.length < 30) {
-            var nl = 30 - tableAdvice.length
+          if (tableAdvice.length + this.projects.length < 30) {
+            var nl = 30 - (tableAdvice.length + this.projects.length)
             for (let index = 0; index < nl; index++) {
-              tableAdvice.push([])
+              this.projects.push([])
             }
           }
           this.tableAdvice = tableAdvice

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2,7 +2,7 @@
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
+    element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -4252,5 +4252,17 @@
     }
 
     }
+    .el-icon-loading{
+      font-size: 30px;
+    }
+    .el-loading-spinner .el-loading-text{
+      font-size: 30px;
+    }
+    // .outpatientChargesManagement{
+    //   .el-loading-mask{
+    //     z-index: 5000;
+    //   }
+    // }
+    
 </style>
 

src/xt_pages/stock/detail/stockInDetail.vue

@@ -273,6 +273,7 @@ export default {
       goodUnit:[],
       stockTotal:[],
       org_id:0,
+      tableInfo:[],
     };
   },
   methods: {
@@ -746,19 +747,19 @@ export default {
     
       exportList(){
   
-        console.log("hhhh",this.tableList)
+        console.log("hhhh",this.tableInfo)
        
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1  
-          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].packing_price).toFixed(2) 
+        for(let i=0;i<this.tableInfo.length;i++){
+          this.tableInfo[i].index = i+1  
+          this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
         }
-        console.log("总共条数555",this.tableList)   
+        console.log("总共条数555",this.tableInfo)   
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
-        console.log("hhhhhhhh",this.tableList)
+        console.log("hhhhhhhh",this.tableInfo)
        
-        const data = this.formatJson(filterVal, this.tableList)
+        const data = this.formatJson(filterVal, this.tableInfo)
         console.log("data222222222",data)
           excel.export_json_to_excel({
             header: tHeader,
@@ -790,7 +791,7 @@ export default {
         if(response.data.state == 1){
           var list = response.data.data.list
           console.log("入库详情单",list)
-          this.tableList = list
+          this.tableInfo = list
         }
       })
      }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -276,12 +276,14 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
       // this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
       // this.getPrintStockGood()
+       this.getGoodDetailPrintList()
     },
     getTypeName: function(row) {
       let name = "";
@@ -461,7 +463,8 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
-        // this.getPrintStockGood()
+        this.getGoodDetailPrintList()
+       
       }
     },
     endTimeChange(val) {
@@ -471,7 +474,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
-        // this.getPrintStockGood()
+        this.getGoodDetailPrintList()
       }
     },
     getTimestamp(time) {
@@ -756,6 +759,7 @@ export default {
       },
 
     exportList(){
+       console.log("表格",this.tableOut)
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name

src/xt_pages/stock/drugs/query.vue

@@ -116,12 +116,16 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-            {{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              <span v-if="org_id == 10028 || org_id == 9671">{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}</span>
+              <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,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">
            <template slot-scope="scope">
-             <span>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+               <span v-if="(org_id == 10028 || org_id == 9671)">{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}} </span>
+               <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+            </div>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
@@ -174,23 +178,24 @@ import { min } from 'moment'
     name: 'stockIn',
     created() {
       
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
-      this.end_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
-      this.start_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+      // var nowDate = new Date();
+      // var nowYear = nowDate.getFullYear();
+      // var nowMonth = nowDate.getMonth() + 1;
+      // var nowDay = nowDate.getDate();
+      // this.end_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+      // nowDate.setMonth(nowDate.getMonth() - 1);
+      // nowYear = nowDate.getFullYear();
+      // nowMonth = nowDate.getMonth() + 1;
+      // nowDay = nowDate.getDate();
+      // this.start_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       var drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.drugTypeList.push(...drugTypeList)
-     
-      // this.getDrugCountList()
+      this.org_id =  this.$store.getters.xt_user.org.id
+      console.log("机构ID",this.org_id)
+      this.getDrugCountList()
      
       
     },
@@ -240,6 +245,7 @@ import { min } from 'moment'
         drugOutList:[],
         cancelCountList:[],
         allCountList:[],
+        org_id:"",
       }
     },
     methods: {
@@ -350,10 +356,12 @@ import { min } from 'moment'
       handleSizeChange(val) {
         this.limit = val
         this.getlist()
+        this.getDrugCountList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
+        this.getDrugCountList()
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
@@ -413,6 +421,7 @@ import { min } from 'moment'
       },
       search: function() {
         this.getlist()
+        this.getDrugCountList()
       }, 
       setting: function() {
         this.$refs.dialog.show()
@@ -528,8 +537,10 @@ import { min } from 'moment'
                  info[i].count = info[i].count * info[i].min_number
               }
             }
-            console.log("搜有列表",this.autoCountList)
-            console.log("info2222222",info)
+            this.outCountList = response.data.data.outCountList
+            console.log("手动出库",this.outCountList)
+            this.auCountList = response.data.data.auCountList
+            console.log("自动出库",this.auCountList)
             this.drugOutList = info
           }
         })

src/xt_pages/stock/stockQuery.vue

@@ -171,17 +171,17 @@ export default {
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
     var nowDay = nowDate.getDate();
-    this.end_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
-    this.start_time = nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.end_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    // nowDate.setMonth(nowDate.getMonth() - 1);
+    // nowYear = nowDate.getFullYear();
+    // nowMonth = nowDate.getMonth() + 1;
+    // nowDay = nowDate.getDate();
+    // this.start_time = nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
@@ -321,11 +321,13 @@ export default {
       this.limit = val;
 
       this.getlist()
+      this.getStockDrugCount()
       
     },
     handleCurrentChange(val) {
       this.page = val;
        this.getlist()
+        this.getStockDrugCount()
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
@@ -390,6 +392,7 @@ export default {
     showCancelStockDetailDialog: function() {},
     search: function() {
       this.getlist()
+      this.getStockDrugCount()
     },
 
     exportList(){