11月14日 库存扣减更新

src/api/dialysis.js

@@ -208,6 +208,7 @@ export function postAssessmentBeforeDislysis(params) {
 }
 
 export function postTreatmentsummary(params) {
+  console.log('param223322323', params)
   return request({
     url: '/api/dialysis/treatmentsummary',
     method: 'Post',

src/xt_pages/data/components/drugs.vue

@@ -47,7 +47,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
         <el-button type="primary" size="small"  @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.xlsx" :underline="false"
+        <el-link target="_blank" href="https://kuyi.shengws.com/drugsTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -89,16 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.max_unit}}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="最小单位" width="60" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.min_unit}}</div>
-        </template>
-      </el-table-column> -->
+  
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
@@ -937,17 +928,17 @@
 
           var isHasDrugName = header.includes('*药品名称');
           console.log("isHasDrugName",isHasDrugName)
-          var isHasUnval = header.includes('*拆零');
-          console.log("isHasUnval",isHasUnval)
-          var isHasMinUnit= header.includes('*拆零单位');
-           console.log("isHasMinUnit",isHasMinUnit)
           var isHasDosage =  header.includes('*剂量')
           console.log("isHasDosage",isHasDosage)
-
           var isHasMaxUnit= header.includes('*剂量单位');
           console.log("isHasMaxUnit",isHasMaxUnit)
+            var isHasUnval = header.includes('*拆零');
+          console.log("isHasUnval",isHasUnval)
+          var isHasMinUnit= header.includes('*拆零单位');
+           console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
+        
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -956,14 +947,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-
-          var isHasUnitMatrixing= header.includes("*单位换算");
-          console.log("isHasUnitMatrixing",isHasUnitMatrixing)
+         
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
-          var isHasLastPrice = header.includes('*进货价');
           var isHasPackingPrice= header.includes('*包装零售价');
-         console.log("isHasLastPrice",isHasLastPrice)
+          console.log("isHasLastPrice",isHasPackingPrice)
+          var isHasLastPrice = header.includes('*进货价');
+          console.log("进货价",isHasLastPrice)
+          
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -972,8 +963,9 @@
         console.log("isHasDrugDose",isHasDrugDose)
          var isDrugDoseUnit = header.includes('*默认单次用量单位');
          console.log("isDrugDoseUnit",isDrugDoseUnit)
-          if (!(isHasDrugName  && isHasUnval && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasPackingPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit && isHasDosage && isHasPackingUnit)) {
-            console.log("分区222222222222222222222222222222")
+          if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
+          isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
+           
             this.dialogVisible = true;
             return
           }
@@ -996,74 +988,49 @@
            }
 
 
-          if (results[i]['*拆零'] === undefined) {
-                obj['min_number'] = ''
-              } else {
-           if (key == '*拆零') {
-               obj['min_number'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['*拆零单位'] === undefined) {
-                obj['min_unit'] = ''
-              } else {
-           if (key == '*拆零单位') {
-               obj['min_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-            if (results[i]['*剂量'] === undefined) {
-                obj['dosage'] = ''
+          if (results[i]['*剂量'] === undefined) {
+                obj['dose'] = ''
               } else {
             if (key == '*剂量') {
-                obj['dosage'] = results[i][key].replace(/\s/g,"")
+                obj['dose'] = results[i][key].replace(/\s/g,"")
               }
            }
 
            if (results[i]['*剂量单位'] === undefined) {
-                obj['max_unit'] = ''
+                obj['dose_unit'] = ''
               } else {
            if (key == '*剂量单位') {
-               obj['max_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-            if (results[i]['*包装单位'] === undefined) {
-                obj['packing_unit'] = ''
-              } else {
-           if (key == '*包装单位') {
-               obj['packing_unit'] = results[i][key].replace(/\s/g,"")
+               obj['dose_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
 
-          if (results[i]['默认给药途径'] === undefined) {
-                obj['delivery_way'] = ''
+  
+          if (results[i]['*拆零'] === undefined) {
+                obj['min_number'] = ''
               } else {
-           if (key == '默认给药途径') {
-               obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零') {
+               obj['min_number'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['默认执行频率'] === undefined) {
-                obj['execution_frequency'] = ''
+           if (results[i]['*拆零单位'] === undefined) {
+                obj['min_unit'] = ''
               } else {
-           if (key == '默认执行频率') {
-               obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零单位') {
+               obj['min_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-          if (results[i]['默认开药天数'] === undefined) {
-                obj['drug_day'] = ''
+
+            if (results[i]['*包装单位'] === undefined) {
+                obj['max_unit'] = ''
               } else {
-           if (key == '默认开药天数') {
-               obj['drug_day'] = results[i][key].replace(/\s/g,"")
+           if (key == '*包装单位') {
+               obj['max_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-
-
             if (results[i]['*药品类型'] === undefined) {
                 obj['drug_type'] = ''
               } else {
@@ -1099,28 +1066,6 @@
            }
 
 
-            if (results[i]['*医保等级'] === undefined) {
-                obj['medical_insurance_level'] = ''
-              } else {
-           if (key == '*医保等级') {
-               obj['medical_insurance_level'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-
-
-            if (results[i]['*单位换算'] === undefined) {
-                obj['unit_matrixing'] = ''
-              } else {
-           if (key == '*单位换算') {
-               obj['unit_matrixing'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-
-
           if (results[i]['*拆零零售价'] === undefined) {
                 obj['retail_price'] = ''
               } else {
@@ -1195,6 +1140,22 @@
               }
            }
 
+            if (results[i]['默认给药途径'] === undefined) {
+                obj['delivery_way'] = ''
+              } else {
+            if (key == '经销商') {
+                obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+              if (results[i]['默认执行频率'] === undefined) {
+                obj['execution_frequency'] = ''
+              } else {
+            if (key == '默认执行频率') {
+                obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
            if (results[i]['限制性用药'] === undefined) {
                 obj['lmt_used_flag'] = ''
               } else {
@@ -1415,12 +1376,14 @@
 
         }
        }
-
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].dose = parseInt(tableData[i].dose)
+       }
        let params = {
           'drugs':tableData
         };
         console.log("params222222222",params)
-
+        
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -184,11 +184,11 @@ export default {
     show(record,date) {
       this.isVisibility = true
       this.record = record
-      console.log(111111111111111,date)
+      
       if(date){
         this.date = date
         this.record_date = uParseTime(this.date, '{y}-{m}-{d}')
-        console.log(22222222222,this.record_date)
+       
       }
       
       console.log('治疗小结', record)
@@ -320,16 +320,14 @@ export default {
       })
     },
     getPermission() {
-      request
-        .get('/api/func_per/get', {
+      request.get('/api/func_per/get', {
           params: {
             create_url: '/api/dialysis/treatmentsummary?mode=1',
             modify_url: '/api/dialysis/treatmentsummary?mode=2',
             modify_other_url: '/api/dialysis/treatmentsummary?mode=3',
             module: 9
           }
-        })
-        .then(res => {
+        }).then(res => {
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -751,7 +751,7 @@ export default {
 
        const data = this.formatJson(filterVal, this.tableOut)
        console.log("date2332323232",data)
-        return
+      
         excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -541,22 +541,20 @@ export default {
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9671 || this.org_id == 9919 ){
-             this.tablePrint[i].price = this.tablePrint[i].last_price
+           
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
-             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].last_price)
+             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].last_price)
+             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
            }else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
            }
-         
-          
         }
        console.log("列表数据333333333",this.tablePrint)
-    
+      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
@@ -659,7 +657,30 @@ export default {
             var list = response.data.data.list
             console.log("药品出库详情",list)
             let objInfo = {}
-            list.forEach((item,index)=>{
+            if(this.org_id == 9671 || this.org_id == 9919){
+              list.forEach((item,index)=>{
+              let { drug_id } = item
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.XtBaseDrug.drug_name,
+                  drug_spec:item.XtBaseDrug.drug_spec,
+                  min_unit:item.XtBaseDrug.min_unit,
+                  count:0,
+                  price:item.XtBaseDrug.last_price,
+                  remark:item.XtBaseDrug.remark,
+                  total_price:"",
+                  dose:item.XtBaseDrug.dose,
+                  dose_unit:item.XtBaseDrug.dose_unit,
+                  min_number:item.XtBaseDrug.min_number,
+                  max_unit:item.XtBaseDrug.max_unit,
+                  min_price:item.XtBaseDrug.min_price,
+                }
+              }
+            })
+            }else{
+               list.forEach((item,index)=>{
               let { drug_id } = item
               if(!objInfo[drug_id]){
                 objInfo[drug_id] = {
@@ -680,6 +701,8 @@ export default {
                 }
               }
             })
+            }
+           
             let newArr = Object.values(objInfo);
             for(let i=0;i<newArr.length;i++){
               for(let j=0;j<list.length;j++){
@@ -752,7 +775,7 @@ export default {
         return total*min_price
       },
       getCountSix(drug_id,val){
-        console.log("val233232",val)
+     
         var count = 0 
         for(let i=0;i<val.length;i++){
           count+= val[i].count

src/xt_pages/stock/stockPrint.vue

@@ -14,6 +14,9 @@
                     <div class="order_title_panl">
                         <span class="main_title">耗材管理查询表</span>
                     </div>
+                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px" v-if="org_id == 3907 || org_id == 9671">
+                      <span v-if="end_time!=''">查询日期:{{start_time}} ~</span>  {{end_time}}
+                    </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
                       打印时间：{{time_now}}
                     </div>

src/xt_pages/workforce/template.vue

@@ -103,7 +103,7 @@
 
 
         <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
-        <!-- <el-button size="small" icon="el-icon-setting" type="primary" @click="setData">同步数据</el-button> -->
+        <el-button size="small" icon="el-icon-setting" type="primary" @click="setData">同步数据</el-button>
       </div>
       <!-- </el-col> -->
     </div>
@@ -117,18 +117,19 @@
                           :patients="patients"></template-table>
         </el-tab-pane>
         <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-          <span slot="label"> 第一周
-             <span v-if="schedule.execute_times%2==0">(本周)</span>
-             <span v-if="schedule.execute_times%2!=0">(下一周)</span>
+          <span slot="label"> 模板一
+            <span v-if="schedule.mode ==1">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
           </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
 
         <el-tab-pane name="second" :disabled="template_mode.mode != 2">
-          <span slot="label"> 第二周
-             <span v-if="schedule.execute_times%2==0">(下一周)</span>
-             <span v-if="schedule.execute_times%2!=0">(本周)</span>
+          <span slot="label"> 模板二
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
            </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
@@ -141,9 +142,9 @@
 
      <el-dialog title="同步排班" width="600px" :visible.sync="newVisible">
             <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
-                <el-form-item label="同步周次:">
-                   <el-radio v-model="form.firstWeek" label="1">第一周</el-radio>
-                   <el-radio v-model="form.firstWeek" label="2">第二周</el-radio>
+                <el-form-item label="同步模板:">
+                   <el-radio v-model="form.firstWeek" label="1">模板一</el-radio>
+                   <el-radio v-model="form.firstWeek" label="2">模板二</el-radio>
                 </el-form-item>
                 <el-form-item label="同步到 :">
                   <el-select v-model="form.copyWeek" placeholder="请选择" required  prop="copyWeek">
@@ -267,14 +268,14 @@
      for(let i = 0; i < this.weekList.length; i++){
          if(this.weekNum + i + 1 <= 53){
              let num = this.weekNum + i 
-            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] 
              this.typeOptions.push({value:i,label:str})
             let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
             this.timeOptions.push({value:i,label:stt})
         }else{
 
             newNum++
-            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] 
             this.typeOptions.push({value:i,label:str})
             let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
             this.timeOptions.push({value:i,label:stt})