数据

src/api/drug/drug.js

@@ -451,3 +451,11 @@ export function getInventoryDetailList(params) {
     params: params
   })
 }
+
+export function SaveDrugProofInventory(params) {
+  return request({
+    url: '/api/drug/savedrugproofinventory',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -11,7 +11,7 @@
                 style="width: 200px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
@@ -26,14 +26,16 @@
                 v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeStartTime">
                 </el-date-picker>
                 <el-date-picker
                 size="small"
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeEndTime">
                 </el-date-picker>
             </div>
             <div>
@@ -100,7 +102,7 @@
         </el-pagination>
     </div>
     <el-dialog
-        title="库房调价"
+        title="库房报损"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
@@ -108,28 +110,45 @@
                 <el-input v-model="form.drug_id"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
-            <el-autocomplete
-                class="checkSearch"
-                popper-class="my-autocomplete"
-                v-model="form.drug_name"
-                :fetch-suggestions="querySearchAsync"
-                :trigger-on-focus="true"
-                placeholder="请输入药品名称"
-                @select="handleSelect"
-                @input="changeGoodName(scope.$index)"
-                style="width:160px;"
-                >
-                <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                <template slot-scope="{ item }">
-                <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                </template>
-                </el-autocomplete>  
+              <el-autocomplete
+                  class="checkSearch"
+                  popper-class="my-autocomplete"
+                  v-model="form.drug_name"
+                  :fetch-suggestions="querySearchAsync"
+                  :trigger-on-focus="true"
+                  placeholder="请输入药品名称"
+                  @select="handleSelect"
+                  @input="changeGoodName(scope.$index)"
+                  style="width:160px;"
+                  >
+                  <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                  <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
+                  </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.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-form-item>
             <el-form-item label="进货价">
                 <el-input v-model="form.last_price"></el-input>
@@ -160,62 +179,62 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column  prop="date" label="药品ID" width="100">
+            <el-table-column  prop="date" label="药品ID" width="100" align="center">
                 <template slot-scope="scope">
                   {{scope.row.drug_id}}
                 </template>
             </el-table-column>
-            <el-table-column prop="date" label="药品名称"  width="100">
+            <el-table-column prop="date" label="药品名称"  width="100" align="center">
                   <template slot-scope="scope">
                   {{scope.row.drug_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="规格" width="100">
+            <el-table-column prop="name" label="规格" width="100" align="center">
               <template slot-scope="scope">
-                 {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                {{scope.row.specification_name}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
                <template slot-scope="scope">
                  {{scope.row.warehousing_unit}}
               </template> 
             </el-table-column>
-            <el-table-column prop="name" label="报损数量" width="100">
+            <el-table-column prop="name" label="报损数量" width="100" align="center">
               <template slot-scope="scope">
                  {{scope.row.count}}
               </template> 
             </el-table-column>
-            <el-table-column prop="name" label="原进货价"  width="100">
+            <el-table-column prop="name" label="原进货价"  width="100" align="center">
              <template slot-scope="scope">
                  {{scope.row.last_price}}
               </template> 
             </el-table-column>
-            <el-table-column  prop="name" label="原零售价" width="100">
+            <el-table-column  prop="name" label="原零售价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.retail_price}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="新零售价" width="100">
+            <!-- <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">
+            </el-table-column> -->
+            <el-table-column  prop="name"  label="生产厂商"  width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="产地" width="100">
+            <el-table-column prop="name" label="产地" width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.drug_origin_place}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="批准文号" width="100">
+            <el-table-column prop="name" label="批准文号" width="100" align="center">
              <template slot-scope="scope">
                 {{scope.row.number}}
               </template>
             </el-table-column>
-            <el-table-column  prop="name" label="备注"  width="100">
+            <el-table-column  prop="name" label="备注"  width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.remark}}
               </template>
@@ -420,7 +439,8 @@
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage } from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList } from "@/api/drug/drug"
+import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
@@ -431,7 +451,7 @@ export default {
         return{
             crumbs: [
                 { path: false, name: "库存管理" },
-                { path: false, name: "耗材管理" },
+                { path: false, name: "药品管理" },
                 { path: false, name: "药品报损" }
             ],
             searchKey:'',
@@ -465,7 +485,9 @@ export default {
                 max_unit:"",
                 batch_number:"",
                 last_price:"",
-                batch_number:"",
+                warehouse_info_id:"",
+                expiry_date:"",
+                product_date:"",
             },
             drugList:[],
             manufacturerList:[],
@@ -485,6 +507,7 @@ export default {
             editDialogVisible:false,
             modifyDialogVisible:false,
             id:"",
+            numberList:[],
         }
     },
     methods:{
@@ -550,20 +573,74 @@ export default {
         },
          handleSelect(val){
             console.log("val232323223",val)
-            this.form.id = val.id
-            this.form.drug_id = val.drug_id,
-            this.form.drug_name = val.drug_name
-            this.form.retail_price = val.retail_price
-            this.form.warehousing_order = val.warehousing_order
-            this.form.number = val.number
-            this.form.dealer = val.dealer
-            this.form.manufacturer = val.manufacturer
-            this.form.remark = val.remark
-            this.form.warehousing_unit = val.warehouseing_unit  
-            this.form.total = val.total
-            this.form.batch_number = val.batch_number
-            this.form.last_price = val.last_price
-           
+            this.getDrugBatchNumber(val.drug_id)
+            var params = {
+              id:val.drug_id
+            }
+           getDrugWarehouseInfoList(params).then(response=>{
+             if(response.data.state == 1){
+               var list =   response.data.data.list
+               for(let i=0;i<list.length;i++){
+                  list[i].stock_max_number = val.min_number * list[i].stock_max_number
+                }
+                var total = 0
+                for(let i=0;i<list.length;i++){
+                   total += (list[i].stock_max_number+list[i].stock_min_number)
+                }
+                this.form.id = val.id
+                this.form.drug_id = val.drug_id,
+                this.form.drug_name = val.drug_name
+                this.form.retail_price = val.retail_price
+                this.form.warehousing_order = val.warehousing_order
+                this.form.number = val.number
+                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.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
+             }
+           }) 
+        },
+
+        getTotal(total,max_unit,min_unit,min_number){
+            var str = ""
+            var min_str = ""
+            if(total<min_number){
+            str = ""
+            min_str = total + min_unit
+            }
+            if(total >= min_number){
+            if(parseInt(total/min_number)!=0){
+                str = parseInt(total/min_number)+ max_unit
+            }
+            if((total%min_number)!=0){
+                min_str =  total%min_number + min_unit
+            }
+            }
+        
+            return str + min_str
+        },
+        changeNumber(val){
+          console.log("val",val)
+          this.form.warehousing_info_id = val
+        },
+        getDrugBatchNumber(id){
+            var params = {
+              id:id
+            }
+          getDrugBatchNumber(params).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.list
+              console.log("list2222",list)
+              this.numberList = list
+            }
+          })
         },
         getTime(val) {
          if(val < 0){
@@ -580,7 +657,7 @@ export default {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
             warehousing_unit:this.form.warehousing_unit,
-            count:parseInt(this.form.count),
+            count:this.form.count,
             retail_price:this.form.retail_price.toString(),
             manufacturer:this.form.manufacturer,
             drug_origin_place:this.form.drug_origin_place,
@@ -592,26 +669,68 @@ export default {
             last_price:this.form.last_price,
             start_time:this.getTime(new Date()),
             number:this.form.number,
-            } 
-          this.tableData.push(obj)     
+            expiry_date:this.form.expiry_date,
+            product_date:this.form.product_date,
+            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
+          } 
+          this.tableData.push(obj)   
+          this.form.drug_name = ""
+          this.form.warehousing_unit = ""
+          this.form.count = ""
+          this.form.retail_price = ""
+          this.form.manufacturer = ""
+          this.form.drug_origin_place = ""
+          this.form.number = ""
+          this.form.remark = ""
+          this.form.new_price = ""
+          this.form.warehousing_order = ""
+          this.form.dealer = ""
+          this.form.last_price = ""
+          this.form.number = ""
+          this.form.expiry_date = ""
+          this.form.product_date = ""
+          this.form.specification_name = ""
+          this.form.drug_origin_place = "" 
         },
         saveDrugDamage(){
-            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)
-            }
-            var params= {
+          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].expiry_date == undefined){
+                this.tableData[i].expiry_date  = 0
+              }else{
+               this.tableData[i].expiry_date = this.tableData[i].expiry_date
+              }
+              if( this.tableData[i].product_date  == undefined){
+                this.tableData[i].product_date = 0
+              }else{
+               this.tableData[i].product_date = this.tableData[i].product_date
+              }
+             if(this.tableData[i].dealer == 0){
+                console.log("你啦")
+                this.tableData[i].dealer = ""
+             }
+            
+          }
+          var params= {
             tableData:this.tableData,
-            }
-            console.log("parasm222",params)
+          }
+          console.log("parasm222",params)
+ 
         saveDrugDamage(params).then(response=>{
             if(response.data.state == 1){
             var msg =  response.data.data.msg
             console.log("msg",msg)
             this.$message.success("保存成功!")
             this.dialogVisible = false
+            this.tableData = []
             this.getlist()
           }
          })  
@@ -789,6 +908,14 @@ export default {
         }).catch(() => {
           this.loading = false
         });
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getlist()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getlist()
      }
     },
     created(){

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -11,36 +11,40 @@
             style="width: 200px;"
             class="filter-item"
             v-model.trim="searchKey"
-            placeholder=""
+            placeholder="请输入单据编号或操作人姓名"
             />
             <el-button
             size="small"
             class="filter-item"
             type="primary"
             icon="el-icon-search"
+          
             @click="search"
             >搜索</el-button
             >
             <el-date-picker
             size="small"
-            v-model="value1"
+            v-model="start_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeStartime"
+            >
             </el-date-picker>
             <el-date-picker
             size="small"
-            v-model="value2"
+            v-model="end_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeEndTime">
             </el-date-picker>
         </div>
         <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" @click="toExport">导出</el-button>
+            <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
         </div>
       </div>
       <div style="margin-top:10px">
@@ -127,9 +131,9 @@
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <el-form-item label="调价数量">
+            <!-- <el-form-item label="调价数量">
                 <el-input v-model="form.count"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -158,11 +162,11 @@
               {{scope.row.warehousing_unit}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="调价数量" width="100">
+            <!-- <el-table-column prop="name" label="调价数量" width="100">
               <template slot-scope="scope">
               {{scope.row.count}}
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100">
                 <template slot-scope="scope">
                 {{scope.row.retail_price}}
@@ -216,7 +220,7 @@
     </el-dialog>
    
      <el-dialog
-        title="耗材盘点核对"
+        title="药品盘点核对"
         :visible.sync="checkDialogVisible"
         width="30%"
         >
@@ -295,9 +299,9 @@
             </el-row>
             <el-row>
              <el-col>
-               <el-form-item label="调价数量：">
+               <!-- <el-form-item label="调价数量：">
                     <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -350,9 +354,9 @@
             </el-row>
             <el-row>
              <el-col>
-               <el-form-item label="调价数量：">
+               <!-- <el-form-item label="调价数量：">
                     <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -435,11 +439,13 @@ export default {
             editPriceDialogVisible:false,
             modifyPriceDialogVisible:false,
             id:0,
+            start_time:"",
+            end_time:"",
         }
     },
     methods:{
         search(){
-
+          this.getlist()
         },
         print(){
            if(this.ids == ""){
@@ -721,8 +727,8 @@ export default {
       },
      toExport(){
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['药品名称','规格','单位','批次','调价数量','原进货价','新进货价','进货差价','原零售价','新零售价','零售差价',]
-        const filterVal = ['drug_name', '','warehousing_unit','number','count','retail_price','new_price','','new_price','']
+        const tHeader = ['药品名称','规格','单位','批次','原进货价','新进货价','进货差价','原零售价','新零售价','零售差价',]
+        const filterVal = ['drug_name', '','warehousing_unit','number','retail_price','new_price','','new_price','']
         console.log("table",this.tableList)
       
         const data = this.formatJson(filterVal, this.tableList)
@@ -737,6 +743,14 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
+    changeStartime(val){
+      this.start_time = this.getTime(val)
+      this.getlist()
+    },
+    changeEndTime(val){
+      this.end_time = this.getTime(val)
+      this.getlist()
+    }
     },
     created(){
         let tableHeight = document.body.clientHeight - 200;

src/xt_pages/stock/drugs/inventory.vue

@@ -2,20 +2,12 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!-- <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
@@ -30,21 +22,23 @@
                 v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeStartTime">
                 </el-date-picker>
                 <el-date-picker
                 size="small"
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeEndTime">
                 </el-date-picker>
             </div>
             <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" @click="exportList">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
@@ -59,7 +53,7 @@
                   {{getTime(scope.row.start_time)}}
                 </template>
             </el-table-column>
-             <el-table-column prop="name" label="盘点数量" align="center">
+            <el-table-column prop="name" label="盘点数量" align="center">
                 <template slot-scope="scope">
                   {{scope.row.count}}
                 </template>
@@ -81,14 +75,16 @@
             </el-table-column>
             <el-table-column prop="name" label="状态" align="center">
               <template slot-scope="scope">
-                 <span v-if="scope.row.checker_status == 1">已核对</span>
-                 <span v-if="scope.row.checker_status == 2">未核对</span>
+                 <span v-if="scope.row.checker_status == 1">盘点完成</span>
+                 <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="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-table-column>
         </el-table>
@@ -128,6 +124,17 @@
                   </template>
                  </el-autocomplete>  
                 </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>
@@ -163,62 +170,58 @@
                 </el-form-item>
             </el-form>
             <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column prop="date" label="耗材ID" width="100">
+                <el-table-column prop="date" label="耗材ID" width="100" align="center">
                     <template slot-scope="scope">
                        {{scope.row.drug_id}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="date" label="耗材名称" width="100">
+                <el-table-column prop="date" label="耗材名称" width="100" align="center">
                    <template slot-scope="scope">
                        {{scope.row.drug_name}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="规格" width="100">
+                <el-table-column prop="name" label="规格" width="100" align="center">
                    <template slot-scope="scope">
                        {{scope.row.specification_name}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="单位" width="100">
+                <el-table-column prop="name" label="单位" width="100" align="center">
                      <template slot-scope="scope">
                        {{scope.row.warehousing_unit}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name"  label="盘点数量" width="100">
+                <el-table-column prop="name"  label="盘点数量" width="100" align="center">
                      <template slot-scope="scope">
                        {{scope.row.count}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="原进货价" width="100">
+                <el-table-column prop="name" label="原进货价" width="100" align="center">
                    <template slot-scope="scope">
                        {{scope.row.last_price}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="原零售价" width="100">
+                <el-table-column prop="name" label="原零售价" width="100" align="center">
                     <template slot-scope="scope">
                        {{scope.row.retail_price}}
                     </template>
                 </el-table-column>
-                <!-- <el-table-column prop="name" label="新零售价" width="100">
-                     <template slot-scope="scope">
-                       {{scope.row.new_price}}
-                    </template>
-                </el-table-column> -->
-                <el-table-column  prop="name" label="生产厂商" width="100">
+             
+                <el-table-column  prop="name" label="生产厂商" width="100" align="center">
                     <template slot-scope="scope">
                        {{scope.row.manufacturer}}
                     </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="产地"  width="100">
+                <el-table-column prop="name" label="产地"  width="100" align="center">
                   <template slot-scope="scope">
                        {{scope.row.drug_origin_place}}
                   </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="批准文号" width="100">
+                <el-table-column prop="name" label="批准文号" width="100" align="center">
                  <template slot-scope="scope">
                        {{scope.row.number}}
                   </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="备注" width="100">
+                <el-table-column prop="name" label="备注" width="100" align="center">
                     <template slot-scope="scope">
                        {{scope.row.remark}}
                     </template> 
@@ -248,7 +251,7 @@
             <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
@@ -271,13 +274,13 @@
                     <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>
@@ -413,12 +416,63 @@
                 <el-button type="primary" @click="modifyInventory">确 定</el-button>
             </span>
         </el-dialog>
+
+
+         <el-dialog
+            title="校正"
+            :visible.sync="profdialogVisible"
+            width="1200px">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+
+                <el-form-item label="药品名称">
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit"></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.proof_count" type="number"></el-input>
+                </el-form-item>
+              
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"></el-input>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="profdialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="proofInventory">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import { uParseTime } from '@/utils/tools'
-import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory} from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory,SaveDrugProofInventory} from "@/api/drug/drug"
+import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 export default {
     name: "drugInventory",
     data() {
@@ -456,6 +510,8 @@ export default {
                 batch_number:"",
                 product_date:"",
                 expiry_date:"",
+                warehouse_info_id:"",
+                proof_count:"",
             },
             total: 0,
             editdialogVisible:false,
@@ -471,11 +527,16 @@ export default {
             check_time:new Date(),
             id:"",
             modifydialogVisible:false,
+            numberList:[],
+            profdialogVisible:false,
         }
     },
     methods:{
+        changeNumber(val){
+          this.form.warehouse_info_id = val
+        },
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -531,7 +592,8 @@ export default {
           })
          },
          handleSelect(val){
-            console.log("999999",val)
+           console.log("val233223232332",val)
+           this.getDrugBatchNumber(val.drug_id)
             var params = {
               id:val.drug_id
             }
@@ -546,8 +608,6 @@ export default {
                    total += (list[i].stock_max_number+list[i].stock_min_number)
                 }
                 console.log("total",total)
-               
-
                 console.log("库存",list)
                 this.form.id = val.id
                 this.form.drug_id = val.drug_id,
@@ -558,13 +618,14 @@ export default {
                 this.form.dealer = val.dealer
                 this.form.manufacturer = val.manufacturer
                 this.form.remark = val.remark
-                this.form.warehousing_unit = val.warehouseing_unit  
+                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.last_price = val.last_price
                 this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
                 this.form.expiry_date = val.expiry_date
                 this.form.product_date =val.product_date
+                this.form.drug_origin_place = val.drug_origin_place
              }
            })
         },
@@ -617,9 +678,28 @@ export default {
             specification_name:this.form.specification_name,
             batch_number:this.form.batch_number,
             expiry_date:this.form.expiry_date,
-            product_date:this.form.product_date
+            product_date:this.form.product_date,
+            warehouse_info_id:this.form.warehouse_info_id,
          } 
-         this.tableData.push(obj)   
+         this.tableData.push(obj) 
+         this.form.drug_name = ""  
+         this.form.warehousing_unit = ""
+         this.form.count = ""
+         this.form.retail_price = ""
+         this.form.manufacturer = ""
+         this.form.drug_origin_place = ""
+         this.form.number = ""
+         this.form.remark = ""
+         this.form.new_price = ""
+         this.form.warehousing_order = ""
+         this.form.dealer = ""
+         this.form.last_price = ""
+         this.form.number = ""
+         this.form.total = ""
+         this.form.specification_name = ""
+         this.form.batch_number = ""
+         this.form.expiry_date = ""
+         this.form.product_date = ""
         },
         toDelete(index){
           this.tableData.splice(index,1)
@@ -635,7 +715,7 @@ export default {
            this.form.dealer = val.dealer
            this.form.manufacturer = val.manufacturer
            this.form.remark = val.remark
-           this.form.warehousing_unit = val.warehouseing_unit  
+           this.form.warehousing_unit = val.max_unit  
            this.form.total = val.total
            this.form.batch_number = val.batch_number
            this.form.last_price = val.last_price
@@ -643,6 +723,7 @@ export default {
            this.form.expiry_date = val.expiry_date
            this.form.product_date =val.product_date  
            this.form.count = val.count
+          
            this.editdialogVisible = true
         },
         saveInventory(){
@@ -703,7 +784,9 @@ export default {
             if(response.data.state == 1){
               var msg = response.data.data.msg
               this.$message.success("保存成功")
+              this.getlist()
               this.editdialogVisible = false
+              this.dialogVisible = false
             }
           })
         },
@@ -767,6 +850,7 @@ export default {
            this.$message.success("保存成功")
            var msg = response.data.data.msg
            this.checkDialogVisible = false
+           this.tableData = []
            this.getlist()
          }
        })
@@ -790,7 +874,7 @@ export default {
             this.form.manufacturer = detail.manufacturer
             this.form.remark = detail.remark
             this.form.warehousing_unit = detail.warehousing_unit
-            this.form.total = parseInt(detail.total)
+            this.form.total = detail.total
         
             this.form.last_price = detail.last_price
           
@@ -866,6 +950,69 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+      getDrugBatchNumber(id){
+            var params = {
+              id:id
+            }
+          getDrugBatchNumber(params).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.list
+              console.log("list2222",list)
+              this.numberList = list
+            }
+          })
+       },
+       toProof(id){
+         getDrugInventoryDetail(id).then(response=>{
+          if(response.data.state == 1){
+            var detail = response.data.data.detail
+            console.log("detail22222222",detail)
+            this.id = detail.id
+            this.form.drug_id = detail.drug_id
+            this.form.drug_name = detail.drug_name
+            this.form.specification_name = detail.specification_name
+            this.form.retail_price = detail.retail_price
+            this.form.warehousing_order =detail.warehousing_order
+            this.form.number = detail.number
+            this.form.manufacturer = detail.manufacturer
+            this.form.remark = detail.remark
+            this.form.warehousing_unit = detail.warehousing_unit
+            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.warehouse_info_id = detail.warehouse_info_id
+            this.profdialogVisible = true
+         }
+        })
+       },
+       proofInventory(){
+           var params = {
+             id:this.id,
+             warehouseing_unit:this.form.warehousing_unit,
+             warehouse_info_id:this.form.warehouse_info_id,
+             total:this.total.toString(),
+             remark:this.remark,
+             prof_count:parseInt(this.prof_count),
+           }
+          console.log("params",params)
+         SaveDrugProofInventory(params).then(response=>{
+            if(response.data.state == 1){
+              var inventory = response.data.data.inventory
+              console.log("inventory",inventory)
+              this.profdialogVisible = false
+              this.getlist()
+            }
+         })
+       },
+       changeStartTime(val){
+          this.start_time = this.getTime(val)
+          this.getlist()
+       },
+       changeEndTime(val){
+         this.end_time = this.getTime(val)
+         this.getlist()
+       }
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -570,6 +570,7 @@ export default {
                 this.tableData[i].warehousing_info_id = this.numberList[j].id
               }
            }
+          
          }
           var params = {
             tableData:this.tableData,

src/xt_pages/user/templateSummary.vue

@@ -303,7 +303,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                     <keep-alive>
+                        <editor ref="edit_neditor"
+                                id="edit_editor1"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
@@ -315,7 +322,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input>
+                     <keep-alive>
+                        <editor ref="edit_neditorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -561,7 +575,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                      <keep-alive>
+                        <editor ref="editor"
+                                id="edit_editor1"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
@@ -573,7 +594,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input>
+                      <keep-alive>
+                        <editor ref="editorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -850,7 +878,6 @@
           template_summary_id:"",
           template_summary_content:"",
           template_plan_id:"",
-          template_summary_content:"",
           template_inspection_id:0,
           template_inspection_content:"",
           admin_user_id:this.$store.getters.xt_user.user.id,
@@ -1257,6 +1284,8 @@
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
         console.log("月",month)
+        console.log("hhhhhh",this.$refs.edit_neditor.r_content)
+        console.log("ooooo",this.$refs.edit_neditorOne.r_content)
          var params = {
             title:this.form.title,
             dry_weight:this.form.dry_weight.toString(),
@@ -1276,14 +1305,15 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            template_summary_content:this.form.template_summary_content,
-            template_plan_content:this.form.template_plan_content,
+            // template_plan_content:this.form.template_plan_content,
+            template_plan_content:this.$refs.edit_neditor.r_content,
             // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
             template_summary_id:this.form.template_summary_id,
-            template_summary_content:this.form.template_summary_content,
+            // template_summary_content:this.form.template_summary_content,
+            template_summary_content:this.$refs.edit_neditorOne.r_content,
             template_plan_id:this.form.template_plan_id,
             template_inspection_id:this.form.template_inspection_id,
             patient_id:parseInt(this.patient_id),

src/xt_pages/workforce/remind.vue

@@ -68,7 +68,6 @@ export default {
         console.log(tab, event);
       },
       changeActiveName(val){
-        console.log("val------",val)
         this.activeName = val
       }
     },

src/xt_pages/workforce/remind_print_setting.vue

@@ -22,15 +22,22 @@
               <div class="signPrint">
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
                 <div>姓名:{{main_collection.patient.name}}</div> 
-                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name + ' 5000iu/瓶' : ''}}</div> 
+                <div>抗凝剂: 
+                  <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
+                  <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
+                </div> 
                 <div>用量:  
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </div> 
                 <div>用法:静脉注射</div> 
                 <div>打印时间:{{currentDate}}</div>
@@ -104,8 +111,8 @@
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-            
-             this.scheduleData = arr
+            console.log("Arr222222",arr)
+           this.scheduleData = arr
             
              let a = response.data.data.day
               console.log("a",a)