数据

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -448,6 +448,7 @@ import BreadCrumb from "../../components/bread-crumb";
 import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList,getDrugWarehouseInfoTotal } from "@/api/drug/drug"
 import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 import { uParseTime } from '@/utils/tools'
+import { getDataConfig } from '@/utils/data'
 export default {
     name: "stockModifyPrice",
     components:{
@@ -517,9 +518,11 @@ export default {
             id:"",
             numberList:[],
             index:0,
+            unitList:[],
         }
     },
     methods:{
+      
         search(){
           this.getlist()
         },
@@ -1018,9 +1021,13 @@ export default {
           
          }
       })
+     },
+     changeMaxUnit(){
+
      }
     },
     created(){
+     
       this.getlist()
     },
     mounted() {

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -68,6 +68,7 @@
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
              <span v-if="scope.row.consumable_type == 4">手动退库</span>
+             <span v-if="scope.row.consumable_type == 5">报损数量</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -75,6 +76,7 @@
              <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
               <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
               <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>
+              <span v-if="scope.row.consumable_type == 5">{{scope.row.cancel_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -88,7 +90,7 @@
              <span v-if="scope.row.consumable_type == 2">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
              <span v-if="scope.row.consumable_type == 3">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
              <span v-if="scope.row.consumable_type == 4">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
-            
+             <span v-if="scope.row.consumable_type == 5">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
            </template>
         </el-table-column>
        

src/xt_pages/stock/drugs/inventory.vue

@@ -53,6 +53,16 @@
                   {{getTime(scope.row.start_time)}}
                 </template>
             </el-table-column>
+            <el-table-column prop="date" label="药品名称" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.drug_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="name" label="盘点数量" align="center">
                 <template slot-scope="scope">
                   {{scope.row.count}}
@@ -82,7 +92,6 @@
             <el-table-column label="操作" align="center" width="260">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="editInventory(scope.row.id,scope.row.checker_status,scope.$index)">编辑</el-button>
-                  <el-button type="primary" size="small" @click="toProof(scope.row.id)">校正</el-button>
                   <el-button type="danger" size="small" @click="deleteDrugInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                  
                 </template>
@@ -138,8 +147,18 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="单位">
+                <!-- <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
+                </el-form-item> -->
+                 <el-form-item prop="max_unit" label="单位">
+                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="进货价">
                     <el-input v-model="form.last_price" :disabled="true"></el-input>
@@ -231,7 +250,7 @@
                 width="100"
                 label="操作">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
+                        <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
                         <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
                        
                     </template>
@@ -273,8 +292,28 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="单位">
+               <el-form-item label="批次">
+                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.batch_number"
+                        :value="item.id">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+                <!-- <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
+                </el-form-item> -->
+               <el-form-item prop="warehousing_unit" label="单位">
+                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="进货价">
                     <el-input v-model="form.last_price" :disabled="true"></el-input>
@@ -381,14 +420,24 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
+                <!-- <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
+                </el-form-item> -->
+                <el-form-item prop="warehousing_unit" label="单位">
+                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.last_price"></el-input>
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price"></el-input>
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
@@ -397,13 +446,13 @@
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place"></el-input>
+                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.number"></el-input>
+                    <el-input v-model="form.number" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">
@@ -441,8 +490,18 @@
                   </template>
                  </el-autocomplete>  
                 </el-form-item>
-                <el-form-item label="单位">
+                <!-- <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit"></el-input>
+                </el-form-item> -->
+                <el-form-item prop="warehousing_unit" label="单位">
+                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
@@ -471,8 +530,9 @@
 
 <script>
 import { uParseTime } from '@/utils/tools'
-import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory,SaveDrugProofInventory} from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory,SaveDrugProofInventory,getDrugWarehouseInfoTotal} from "@/api/drug/drug"
 import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
+import { getDataConfig } from '@/utils/data'
 export default {
     name: "drugInventory",
     data() {
@@ -529,11 +589,14 @@ export default {
             modifydialogVisible:false,
             numberList:[],
             profdialogVisible:false,
+            index:"",
+            unitList:[],
         }
     },
     methods:{
         changeNumber(val){
           this.form.warehouse_info_id = val
+          this.getDrugWarehouseInfoTotal(val)
         },
         search(){
           this.getlist()
@@ -620,7 +683,8 @@ export default {
                 this.form.manufacturer = val.manufacturer
                 this.form.remark = val.remark
                 this.form.warehousing_unit = val.max_unit  
-                this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
+                this.form.total = ""
+                // this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
                 this.form.batch_number = val.batch_number
                 this.form.last_price = val.last_price
                 this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
@@ -705,8 +769,7 @@ export default {
         toDelete(index){
           this.tableData.splice(index,1)
         },
-        toEdit(val){
-            console.log("val2323223",val)
+        toEdit(val,index){
            this.form.id= val.id
            this.form.drug_id = val.drug_id,
            this.form.drug_name = val.drug_name
@@ -724,7 +787,7 @@ export default {
            this.form.expiry_date = val.expiry_date
            this.form.product_date =val.product_date  
            this.form.count = val.count
-          
+           this.index = index
            this.editdialogVisible = true
         },
         saveInventory(){
@@ -747,6 +810,24 @@ export default {
                this.tableData[i].product_date = this.form.product_date
                this.tableData[i].count =this.form.count
              }
+            if(this.index == i){
+               this.tableData[i].drug_id = this.form.drug_id
+               this.tableData[i].drug_name = this.form.drug_name
+               this.tableData[i].retail_price = this.form.retail_price
+               this.tableData[i].warehousing_order = this.form.warehousing_order
+               this.tableData[i].number = this.form.number
+               this.tableData[i].dealer = this.form.dealer
+               this.tableData[i].manufacturer = this.form.manufacturer
+               this.tableData[i].remark = this.form.remark
+               this.tableData[i].warehouseing_unit = this.form.warehousing_unit
+               this.tableData[i].total = this.form.total
+               this.tableData[i].batch_number = this.form.batch_number
+               this.tableData[i].last_price = this.form.last_price
+               this.tableData[i].specification_name = this.form.specification_name
+               this.tableData[i].expiry_date = this.form.expiry_date
+               this.tableData[i].product_date = this.form.product_date
+               this.tableData[i].count =this.form.count
+             }
           }   
           this.editdialogVisible = false
         },
@@ -864,6 +945,7 @@ export default {
        getDrugInventoryDetail(id).then(response=>{
          if(response.data.state == 1){
             var detail = response.data.data.detail
+            console.log("detial2323223",detail)
             this.id = detail.id
             this.form.drug_id = detail.drug_id
             this.form.drug_name = detail.drug_name
@@ -878,9 +960,12 @@ export default {
             this.form.total = detail.total
         
             this.form.last_price = detail.last_price
-          
+           
             this.form.count =  parseInt(detail.count)
             this.form.drug_origin_place = detail.drug_origin_place
+            this.form.stock_max_number = detail.stock_max_number
+            this.form.stock_min_number = detail.stock_min_number
+            this.form.warehouse_info_id = detail.warehouse_info_id
             this.modifydialogVisible = true
          }
        })
@@ -891,7 +976,7 @@ export default {
           drug_id:this.form.drug_id,
           drug_name:this.form.drug_name,
           specification_name:this.form.specification_name,
-          warehousing_unit:this.form.warehouseing_unit,
+          warehousing_unit:this.form.warehousing_unit,
           last_price:this.form.last_price,
           retail_price:this.form.retail_price,
           count:this.form.count,
@@ -900,7 +985,12 @@ export default {
           batch_number:this.form.batch_number,
           manufacturer:this.form.manufacturer,
           remark:this.form.remark,
+          stock_max_number:this.form.stock_max_number,
+          stock_min_number:this.form.stock_min_number,
+          warehouse_info_id:this.form.warehouse_info_id,
        }
+       console.log("params2222",params)
+      
       modifyInventory(params).then(response=>{
          if(response.data.state == 1){
            var inventory =  response.data.data.inventory
@@ -933,7 +1023,7 @@ export default {
           this.loading = false
         });   
      },
-       exportList(){
+    exportList(){
        
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['药品名称', '规格', '单位','零售价','当前库存','盘点数','亏损金额']
@@ -1013,9 +1103,39 @@ export default {
        changeEndTime(val){
          this.end_time = this.getTime(val)
          this.getlist()
-       }
+       },
+      getDrugWarehouseInfoTotal(val){
+        var params = {
+          id:val,
+        }
+      getDrugWarehouseInfoTotal(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list",list)
+        
+          if(list.stock_max_number > 0){
+            this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
+            this.form.stock_max_number = list.stock_max_number
+          }
+          if(list.stock_min_number >0 ){
+            this.form.total = list.stock_min_number + list.XtBaseDrug.min_unit
+            this.form.stock_min_number = list.stock_min_number
+          }
+          
+         }
+      })
+     },
+     getDataConfig(module, filed_name) {
+       return getDataConfig(module, filed_name)
+      },  
+    changeMaxUnit(val){
+      console.log("val23232",val)
+      this.form.warehousing_unit = val
+    }
     },
     created(){
+      this.unitList =  this.getDataConfig('hemodialysis','units')
+      console.log("单位",this.unitList)
       this.getlist()
     },
     mounted() {

src/xt_pages/stock/stockQuery.vue

@@ -109,13 +109,15 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-            <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info) - getOverplus(scope.row.xt_warehouse_info) - getCancelInfo(scope.row.cancel_stock_info)}}{{scope.row.packing_unit}}</span>
+            {{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}}
+            <!-- <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info) - getOverplus(scope.row.xt_warehouse_info) - getCancelInfo(scope.row.cancel_stock_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           <span v-if="getOverplus(scope.row.xt_warehouse_info)>0">{{getOverplus(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
+           {{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}
+           <!-- <span v-if="getOverplus(scope.row.xt_warehouse_info)>0">{{getOverplus(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -188,7 +190,7 @@ export default {
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
-    // this.getStockDrugCount()
+    this.getStockDrugCount()
   },
   components: {
     BreadCrumb
@@ -403,9 +405,10 @@ export default {
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
-        
-          this.tableList[i].outCount = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverplus(this.tableList[i].xt_warehouse_info) - this.getCancelInfo(this.tableList[i].cancel_stock_info)
-          this.tableList[i].overplus = this.getOverplus(this.tableList[i].xt_warehouse_info)
+          this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
+          // this.tableList[i].outCount = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverplus(this.tableList[i].xt_warehouse_info) - this.getCancelInfo(this.tableList[i].cancel_stock_info)
+          // this.tableList[i].overplus = this.getOverplus(this.tableList[i].xt_warehouse_info)
+          this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
          }
          console.log("table",this.tableList)
          const data = this.formatJson(filterVal, this.tableList)
@@ -516,18 +519,18 @@ export default {
         }
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
-           var count = response.data.data.count
-           console.log("入库统计",count)
-           this.countList = count
+          //  var count = response.data.data.count
+          //  console.log("入库统计",count)
+          //  this.countList = count
            var outlist = response.data.data.outList
            console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
            console.log("autoCount",autoCount)
            this.autoCountList = autoCount
-           var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
-           this.cancelCountList = totalCount
+          //  var totalCount = response.data.data.totalCount
+          //  console.log("totalcount",totalCount)
+          //  this.cancelCountList = totalCount
          }
       })
     },

src/xt_pages/user/templateSummary.vue

@@ -126,7 +126,7 @@
                 <el-row :gutter="24">
                   <el-col :span="20">
                     <el-form-item label="阶段小结名称:">
-                      <el-input v-model="form.title"></el-input>
+                      <el-input v-model="form.title" style="width:200px"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -308,7 +308,7 @@
                      <keep-alive>
                         <editor ref="edit_neditor"
                                 id="edit_editor1"
-                                style="width: 800px"
+                                style="width: 1200px"
                                 v-bind:r_content="form.template_summary_content">
                         </editor>
                     </keep-alive>
@@ -400,7 +400,7 @@
                 <el-row :gutter="24">
                   <el-col :span="20">
                     <el-form-item label="阶段小结名称:">
-                      <el-input v-model="form.title"></el-input>
+                      <el-input v-model="form.title" style="width:200px"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -580,7 +580,7 @@
                        <keep-alive>
                         <editor ref="edit_neditor"
                                 id="edit_editor2"
-                                style="width: 800px"
+                                style="width: 1200px"
                                 v-bind:r_content="form.template_summary_content">
                         </editor>
                       </keep-alive>
@@ -672,7 +672,7 @@
               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                  <el-form-item
+                  <!-- <el-form-item
                    label="时间:"
                    prop="startYear"
                    style="width:100%;"
@@ -686,6 +686,16 @@
                     format="yyyy-MM"
                     value-format="yyyy-MM">
 	               </el-date-picker>
+                 </el-form-item> -->
+                 <el-form-item>
+                    <el-select v-model="quartype" placeholder="请选择" @change="changetype">
+                      <el-option
+                        v-for="item in quarterType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
                  </el-form-item>
                  <!-- <el-form-item  label="月份:"
                    prop="startYear"
@@ -939,9 +949,17 @@
         end_date: moment(new Date()).endOf('month').format("YYYY-MM-DD"),
         ids:"",
         lastYear:new moment().subtract(1,'months').date(1).format("YYYY-MM-DD"),
+       quarterType: [
+        { id: 1, name: "第一季度"},
+        { id: 2,  name: "第二季度"},
+        { id: 3, name: "第三季度"},
+        { id: 4, name: "第四季度"}
+       ],
+       quartype:1,
       }
     },
     created() {
+     
       console.log("this.$store.getters.xt_user.user.id",this.$store.getters.xt_user.user.id)
       this.patient_id = this.$route.params && this.$route.params.id
       var now = new Date()
@@ -1162,14 +1180,36 @@
 
         this.dialogVisibleInspection = true
       },
-
+      changetype(){
+        this.getInspectionMajor()
+      },
       //获取大项数据来源
       getInspectionMajor(){
-          console.log("start_year",this.startYear)
+          console.log("type23232232",this.quartype)
+          var start_time = ""
+          var end_time = ""
+          if(this.quartype == 1){
+             start_time =  moment().startOf('year').format('YYYY-MM-DD')
+             end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 2){
+            start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+            end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 3){
+            start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
+            end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 4){
+             start_time = moment().month(8).startOf('month').format("YYYY-MM-DD")
+             end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+          }
+          console.log("start_time",start_time)
+          console.log("end_time",end_time)
           var params = {
-            other_start_time:this.startYear,
+            other_start_time:end_time,
             patient_id:this.patient_id,
-            last_time:this.lastYear,
+            last_time:start_time,
           }
          console.log("开始数据",params)
         getInspectionMajorItem(params).then(response=>{