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

src/api/drug/drug.js

     params: params
   })
 }
+
+export function getDrugWarehouseInfoTotal(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfototal',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                                                     </div>
                                                     </el-tab-pane>
 
-                                                    
+
 
                                                     <prescription-table ref="prescription_tables"
                                                                         :prescription="items.curPrescriptions"></prescription-table>
             }
           })
         } else {
-          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 ||this.$store.getters.xt_user.org_id == 10088) {
             axios.get('http://127.0.0.1:9532/api/register/get', {
               params: forms,
               headers: {
             })
           }
         } else if (index == 6) {
-          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028) {
+          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088) {
             this.$refs.register9504.show()
           } else {
             this.$refs.register.show()

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
-                    groupno: prescription.advices[b].groupno
 
                   }
 

src/xt_pages/outpatientRegistration/index.vue

           this.is_Name = true
           return
         }
-
         if (this.form.sex == '') {
           this.$message.error('患者性别不能为空')
         }
 
           }
         }
-      }
-      ,
+      },
       changeName(id) {
         this.form.sex = ''
         this.form.age = ''
 
     },
     created() {
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088) {
         this.form.certificates = 2
         this.form.id_card_type = 1
         this.form.settlementValue = 1

src/xt_pages/stock/detail/stockOutDetail.vue

       stockTotal:[],
       goodInfoData:[],
       orgId:"",
-      tableData:[]
+      tableData:[],
+      tableOut:[],
     };
   },
   methods: {
       },
 
     exportList(){
-       for(let i=0;i<this.tableData.length;i++){
-        this.tableData[i].index = i+1
-        this.tableData[i].good_name = this.tableData[i].good_name
-        this.tableData[i].specification_name = this.tableData[i].specification_name
-        this.tableData[i].packing_unit = this.tableData[i].packing_unit
-        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].packing_price).toFixed(2)
-        this.tableData[i].out_count = this.getStockCount(this.tableData[i].good_id)
+       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
+        this.tableOut[i].specification_name = this.tableOut[i].specification_name
+        this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
+        this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+        this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
-       const data = this.formatJson(filterVal, this.tableData)
+       const data = this.formatJson(filterVal, this.tableOut)
        console.log("data",data)
        
         excel.export_json_to_excel({
         if(response.data.state == 1){
           var list = response.data.data.list
           console.log("出库单详单",list)
-          this.tableData = list
+          this.tableOut = list
           var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal
         }

src/xt_pages/stock/drugs/drugDamaged.vue

             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
                   {{getTime(scope.row.start_time)}}
                 </template>
             </el-table-column>
+            <el-table-column prop="name" label="药品名称" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.drug_name}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" 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}}
                 <span v-if="scope.row.checker_status == 2">未核对</span>
               </template>   
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="moDrugDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteDrugDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
         </el-pagination>
     </div>
     <el-dialog
-        title="库房报损"
+        title="药品报损"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
               <el-autocomplete
                   placeholder="请输入药品名称"
                   @select="handleSelect"
                   @input="changeGoodName(scope.$index)"
-                  style="width:160px;"
+                  style="width:260px;"
                   >
                   <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
             </el-form-item>
          
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
-              <!-- <el-select v-model="scope.row.warehousing_unit" filterable placeholder="请选择单位" style="width:80px">
-                <el-option
-                  v-for="(option, index) in unitList"
-                  :key="index"
-                  :label="option.name"
-                  :value="option.name">
-                </el-option>
-              </el-select> -->
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </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>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total" :disabled="true"></el-input>
+                <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;">
                 {{scope.row.retail_price}}
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="新零售价" width="100" align="center">
-                <template slot-scope="scope">
-                {{scope.row.new_price}}
-               </template>
-            </el-table-column> -->
+        
             <el-table-column  prop="name"  label="生产厂商"  width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
             label="操作">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click="toDel(scope.$index)">删除</el-button>
-                    <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>
                 </template>
             </el-table-column>
         </el-table>
    
 
     <el-dialog
-        title="耗材盘点核对"
+        title="药品盘点核对"
         :visible.sync="checkDialogVisible"
         width="30%"
         >
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
                 </template>
                 </el-autocomplete>  
             </el-form-item>
-            <!-- <el-form-item label="规格">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item> -->
+            <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.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </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>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <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;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
                 <el-input v-model="form.name"></el-input>
             </el-form-item> -->
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </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>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <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;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList } from "@/api/drug/drug"
+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:{
                 warehouse_info_id:"",
                 expiry_date:"",
                 product_date:"",
+                stock_max_number:"",
+                stock_min_number:"",
             },
             drugList:[],
             manufacturerList:[],
             modifyDialogVisible:false,
             id:"",
             numberList:[],
+            index:0,
+            unitList:[],
         }
     },
     methods:{
+      
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
                 this.form.dealer = val.dealer
                 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.batch_number = val.batch_number
+                this.form.warehousing_unit = val.max_unit 
+                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.expiry_date = val.expiry_date
                 this.form.product_date = val.product_date
                 this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
                 this.form.drug_origin_place = val.drug_origin_place
+                this.form.batch_number = ""
+                this.form.total = ""
              }
            }) 
         },
         changeNumber(val){
           console.log("val",val)
           this.form.warehousing_info_id = val
+          this.getDrugWarehouseInfoTotal(val)
         },
         getDrugBatchNumber(id){
             var params = {
          }
         },
         addPrice(){
+          console.log("批次号",this.form.batch_number)
+          if(this.form.drug_name == ""){
+             this.$message.error("请输入药品名称")
+             return
+          }
+          if(this.form.batch_number == ""){
+            this.$message.error("请选择批次号")
+            return false
+          }
+          if(this.form.count == ""){
+             this.$message.error("请输入报损数量")
+             return false
+          }
           var obj = {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
             specification_name:this.form.specification_name,
             drug_origin_place:this.form.drug_origin_place,
             warehousing_info_id:this.form.warehousing_info_id,
-            batch_number:this.form.batch_number
+            batch_number:this.form.batch_number,
+            stock_max_number:this.form.stock_max_number,
+            stock_min_number:this.form.stock_min_number,
+            total:this.form.total,
           } 
           this.tableData.push(obj)   
           this.form.drug_name = ""
           this.form.product_date = ""
           this.form.specification_name = ""
           this.form.drug_origin_place = "" 
+          this.form.total = ""
         },
         saveDrugDamage(){
-          console.log("hhhh",this.tableData)
-          console.log("oooo",this.numberList)
+        
           for(let i=0;i<this.tableData.length;i++){
               this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
               this.tableData[i].last_price = this.tableData[i].last_price.toString()
               this.tableData[i].new_price = this.tableData[i].new_price.toString()
               this.tableData[i].count =  parseInt(this.tableData[i].count)
+              if(this.tableData[i].stock_max_number == ""){
+                this.tableData[i].stock_max_number = 0
+              }else{
+                this.tableData[i].stock_max_number = parseInt(this.tableData[i].stock_max_number)
+              }
+              if(this.tableData[i].stock_min_number == ""){
+                this.tableData[i].stock_min_number = 0
+              }else{
+                this.tableData[i].stock_min_number = parseInt(this.tableData[i].stock_min_number)
+              }
               if(this.tableData[i].expiry_date == undefined){
                 this.tableData[i].expiry_date  = 0
               }else{
             tableData:this.tableData,
           }
           console.log("parasm222",params)
- 
+   
         saveDrugDamage(params).then(response=>{
             if(response.data.state == 1){
             var msg =  response.data.data.msg
           page:this.page, 
           start_time:this.start_time,
           end_time:this.end_time,
+          keyword:this.searchKey,
         }
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
      toDel(index){
        this.tableList.splice(index,1)
      },
-     toEdit(val){
+     toEdit(val,index){
+       this.index = index
        this.form.drug_name = val.drug_name
        this.form.drug_origin_place = val.drug_origin_place
        this.form.last_price = val.last_price
        this.form.remark = val.remark
        this.form.id = val.id
        this.form.count = val.count
+       this.form.specification_name = val.specification_name
+       this.form.warehousing_unit = val.warehousing_unit
+       this.form.stock_max_number = val.stock_max_number
+       this.form.stock_min_number = val.stock_min_number,
        this.editDialogVisible = true
      },
      EditDrugDamage(){
             this.tableData[i].retail_price = this.form.retail_price
             this.tableData[i].remark = this.form.remark
             this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
+          }
+          if(this.index == i){
+            this.tableData[i].drug_name = this.form.drug_name
+            this.tableData[i].drug_origin_place = this.form.drug_origin_place
+            this.tableData[i].last_price = this.form.last_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].number = this.form.number
+            this.tableData[i].retail_price = this.form.retail_price
+            this.tableData[i].remark = this.form.remark
+            this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
           }
        }
        this.editDialogVisible = false
        getDrugDamageDetail(id).then(response=>{
          if(response.data.state ==1){
            var detail = response.data.data.detail
+           console.log("系准给",detail)
            this.form.drug_id = detail.drug_id
            this.form.drug_name = detail.drug_name
            this.form.drug_origin_place = detail.drug_origin_place
            this.form.remark = detail.remark
            this.form.count = detail.count
            this.id = detail.id
-           this.form.warehousing_unit = detail.warehouseing_unit
+           this.form.warehousing_unit = detail.warehousing_unit
+           this.form.stock_max_number = detail.stock_max_number
+           this.form.stock_min_number = detail.stock_min_number
+           this.form.total = detail.total
+           this.form.warehousing_info_id = detail.warehousing_info_id
            this.modifyDialogVisible = true
          }
        })
      },
      modifyDrugDamage(){
+       if(this.form.stock_max_number == ""){
+         this.form.stock_max_number = 0
+       }else{
+         this.form.stock_max_number = parseInt(this.form.stock_max_number)
+       }
+       if(this.form.stock_min_number == ""){
+         this.form.stock_min_number = 0
+       }else{
+         this.form.stock_min_number = parseInt(this.form.stock_min_number)
+       }
          var params = {
            drug_id:this.form.drug_id,
            drug_name:this.form.drug_name,
            count:parseInt(this.form.count),
            warehousing_unit:this.form.warehousing_unit,
            id:this.id,
+           total:this.form.total,
+           stock_max_number:this.form.stock_max_number,
+           stock_min_number:this.form.stock_min_number,
          }
        modifyDrugDamage(params).then(response=>{
           if(response.data.state == 1){
      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)
+          //  this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
+          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
+          }
+          
+         }
+      })
+     },
+     changeMaxUnit(){
+
      }
     },
     created(){
+     
       this.getlist()
     },
     mounted() {

src/xt_pages/stock/drugs/drugStockFlow.vue

              <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">
              <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">
              <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

                   {{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}}
             <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>
         >
         </el-pagination>
         <el-dialog
-        title="库房调价"
+        title="药品盘点"
         :visible.sync="dialogVisible"
         width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id"></el-input>
+                <el-form-item label="药品ID">
+                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="药品名称">
                   <el-autocomplete
                 <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="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"></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>
                     <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;">
                 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>
                 <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>
                 <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>
                     <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;">
                   </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>
 
 <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() {
             modifydialogVisible:false,
             numberList:[],
             profdialogVisible:false,
+            index:"",
+            unitList:[],
         }
     },
     methods:{
         changeNumber(val){
           this.form.warehouse_info_id = val
+          this.getDrugWarehouseInfoTotal(val)
         },
         search(){
           this.getlist()
                 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
         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
            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(){
                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
         },
        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
             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
          }
        })
           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,
           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
           this.loading = false
         });   
      },
-       exportList(){
+    exportList(){
        
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['药品名称', '规格', '单位','零售价','当前库存','盘点数','亏损金额']
        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/stockModifyPrice.vue

     
      },
      SaveCheckedPrice(){
-       
          var params = {
             ids:this.ids,
             check_time:this.getTime(this.check_time),

src/xt_pages/stock/stockQuery.vue

        </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>
+          <span v-if="getWareInfo(scope.row.xt_warehouse_info) > 0">{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
+           <!-- <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">
     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.start_time = nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
-    // this.getStockDrugCount()
+    this.getStockDrugCount()
   },
   components: {
     BreadCrumb
       this.limit = val;
 
       this.getlist()
+      
     },
     handleCurrentChange(val) {
       this.page = val;
       } else {
         this.start_time = val
          this.getlist()
+         this.getStockDrugCount()
+
       }
     },
     endTimeChange: function(val) {
       } else {
         this.end_time = val
          this.getlist()
+         this.getStockDrugCount()
       }
 
     },
            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)
+          if(this.getWareInfo(this.tableList[i].xt_warehouse_info) > 0){
+            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)
+          }else{
+             this.tableList[i].overplus = 0
+          }
+          
          }
          console.log("table",this.tableList)
          const data = this.formatJson(filterVal, this.tableList)
     },
     getStockDrugCount(){
         var params ={
-          keywords: this.$route.query.keywords,
-          start_time:this.$route.query.start_time,
-          end_time:this.$route.query.end_time,
+           keywords: this.$route.query.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
         }
       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

                 <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>
                      <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>
                 <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>
                        <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>
               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                  <el-form-item
+                  <!-- <el-form-item
                    label="时间:"
                    prop="startYear"
                    style="width:100%;"
                     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"
         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()
 
         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=>{