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

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -387,6 +387,17 @@
 
       },
       choosePatient(val) {
+        let isShowDailog = false
+        for (let i = 0; i < this.prescriptions.length; i++){
+          if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
+            isShowDailog = true
+          }
+        }
+        if(isShowDailog){
+          this.$message.error('需要保存当前处方才能切换')
+          return
+        }
+
 
         this.patientid = val.patients.id
         let params = {

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -35,12 +35,12 @@
           <template slot-scope="scope">{{scope.row.info?scope.row.info.doctor:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.info ? scope.row.info.diagnosis :''}}</template>
+          <template slot-scope="scope">{{ scope.row.info?scope.row.info.diagnosis :''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
-            <div v-if=" scope.row.info.id == 0">未就诊</div>
-            <div v-if=" scope.row.info.id > 0">已就诊</div>
+            <div v-if=" scope.row.info && scope.row.info.id > 0">已就诊</div>
+            <div v-else>未就诊</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -142,10 +142,9 @@ export default {
          for(let i=0;i<this.tableData.length;i++){
             this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
          }
-         console.log("表哥------",this.tableData)
+        
          const data = this.formatJson(filterVal, this.tableData)
-         console.log("data",data)
-         return
+      
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/stockQuery.vue

@@ -4,23 +4,58 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container ">
-      <div class="cell clearfix">
-        <el-input
-          size="small"
-          style="width: 400px;"
-          class="filter-item"
-          v-model.trim="keywords"
-          placeholder="商品编码/商品名称/规格名称"
-        />
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="search"
-          >搜索</el-button
-        >
+      <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+        <div>
+          <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+          <el-time-select
+            style="width:140px;"
+            v-model="value"
+            :picker-options="{
+              start: '08:30',
+              step: '00:15',
+              end: '18:30'
+            }"
+            placeholder="选择时间">
+          </el-time-select>-
+          <el-time-select
+            style="width:140px;"
+            v-model="value"
+            :picker-options="{
+              start: '08:30',
+              step: '00:15',
+              end: '18:30'
+            }"
+            placeholder="选择时间">
+          </el-time-select>
+          <el-input
+            size="small"
+            style="width: 200px;margin-left:10px;"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="商品编码/商品名称/规格名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="exportList">导出</el-button>
+          <el-button size="small" type="primary">打印</el-button>
+        </div>
       </div>
+      
 
       <el-table
         :row-style="{ color: '#303133' }"
@@ -161,7 +196,9 @@ export default {
       WarehouseInfo: {
         loading: false,
         warehouseInfoDate: []
-      }
+      },
+      options:[],
+      value:""
     };
   },
   methods: {
@@ -183,12 +220,30 @@ export default {
           this.WarehouseInfo.loading = false;
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-
-              this.WarehouseInfo.warehouseInfoDate.push(
-                response.data.data.list[i]
-              );
+           this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
           }
         }
+        console.log("数据源头",this.WarehouseInfo.warehouseInfoDate)
+         
+         for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
+            this.WarehouseInfo.warehouseInfoDate[i].type_name = this.WarehouseInfo.warehouseInfoDate[i].type.type_name
+
+            this.WarehouseInfo.warehouseInfoDate[i].stockInCount = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].salesReturnCount = this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].realCount = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].stockOutCount = this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].cancelStockCount = this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].realOutCount =  this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            this.WarehouseInfo.warehouseInfoDate[i].overplus = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i]) - this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) + this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
+         }
+        
+        console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
       });
     },
 
@@ -270,7 +325,25 @@ export default {
     showCancelStockDetailDialog: function() {},
     search: function() {
       this.GetAllStockQuery();
-    }
+    },
+
+    exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 
+         const data = this.formatJson(filterVal, this.WarehouseInfo.warehouseInfoDate)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '库存查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   }
 };
 </script>