518合并代码

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -183,7 +183,7 @@ export default {
        if(response.data.state == 1){
           var list =  response.data.data.list
           this.tableData = []
-          console.log("list23232332232322323",list)
+          // console.log("list23232332232322323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].orders.length;j++){
               for(let z=0;z<list[i].orders[j].order_info.length;z++){
@@ -203,12 +203,11 @@ export default {
           obj.total_price = (obj.total_price).toFixed(2)
           this.tableData.push(obj)
           
-          console.log("tabledata",this.tableData)
+          // console.log("tabledata",this.tableData)
        }
      })
     },
     getAllPice(){
-      console.log("hhhhh",this.tableData)
       var total_price = 0
       for(let i=0;i<this.tableData.length;i++){
         if(this.tableData[i].index =="合计"){
@@ -219,7 +218,7 @@ export default {
     }
   },
   created() {
-   // this.getHisSummaryDetailList()
+    this.getHisSummaryDetailList()
   },
   watch:{
     "patient_id":function(){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -43,21 +43,28 @@
       <div>
       </div>
     </div>
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+    <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               show-summary
               max-height="600"
               v-loading="detail_loading"
               highlight-current-row>
-      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center">
+           <template slot-scope="scope">{{scope.row.index}}</template>
+      </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
         <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用分类">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+           <span v-if="scope.row.advice_id > 0 ">{{getAdviceName(scope.row.advice_id)}}</span>
+           <span v-if="scope.row.project_id > 0 ">{{getProjectName(scope.row.project_id)}}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格型号">
         <template slot-scope="scope"></template>
@@ -109,6 +116,7 @@ export default {
       sameRowArr: [],
       keywords: '',
       tableData: [],
+      tableList:[],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
       items: [
@@ -117,7 +125,7 @@ export default {
         { id: 2, name: '项目' }
 
       ]
-
+     
     }
   },
   methods: {
@@ -143,15 +151,60 @@ export default {
       }
      getGatherDetailList(params).then(response=>{
        if(response.data.state == 1){
-         var detailList = response.data.data.detailList
-         console.log("detailist232323322332",detailList)
+         var projectlist = response.data.data.projectlist
+         for(let i=0;i<projectlist.length;i++){
+          this.tableList.push(projectlist[i])
+         }
+         console.log("detailist232323322332",projectlist)
+         var advicelist = response.data.data.advicelist
+         for(let i=0;i<advicelist.length;i++){
+           this.tableList.push(advicelist[i])
+         }
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableList[i].index = i +1
+         }
+         console.log("advicelist332233323232323232",this.tableList)
+      
          var list = response.data.data.list
          console.log("list233223232323",list)
+         for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].orders.length;j++){
+              for(let z=0;z<list[i].orders[j].order_info.length;z++){
+                  list[i].orders[j].order_info[z].record_date = list[i].orders[j].settle_accounts_date
+                  list[i].orders[j].order_info[z].number = list[i].orders[j].number
+                  this.tableData.push(list[i].orders[j].order_info[z])
+               }
+            }
+          }
+        for(let i=0;i<this.tableData.length;i++){
+          this.tableData[i].index = i+1
+          this.tableData[i].total_price = 0
+          this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+        }
+        console.log("322323232323322323",this.tableData)
        }
      })
 
 
     },
+    getAdviceName(id){
+      var drug_name = ""
+      for(let i= 0;i<this.tableData.length;i++){
+         if(id == this.tableData[i].advice_id){
+           drug_name = this.tableData[i].advice.advice_name
+         }
+      }
+      return drug_name
+    },
+    getProjectName(id){
+     var project_name = ""
+     for(let i=0;i<this.tableData.length;i++){
+       if(id == this.tableData[i].project_id){
+         project_name = this.tableData[i].project.project.project_name
+       }
+     }
+     return project_name
+    }
   },
   created() {
     this.getGatherDetailList()

src/xt_pages/stock/drugs/inventory.vue

@@ -78,15 +78,15 @@
               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
-                    <span><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.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><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:100px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                   </template> 
               </el-table-column>
 
              <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
                 <template slot-scope="scope">
-                  <el-input style="width:50px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
-                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
+                  <el-input style="width:100px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
+                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
                  </template> 
               </el-table-column>