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

config/dev.env.js

@@ -6,9 +6,9 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/drug/drug.js

@@ -276,11 +276,11 @@ export function getPatientDetail(id,params){
    })
 }
 
-// export function toSeachPatient(params){
+export function getSelfStockQuery(params){
    
-//    return request({
-//       url:"/api/drug/toseachpatient",
-//       methods:"Get",
-//       params:params
-//    })
-// }
+   return request({
+      url:"/api/drug/getselfstockquery",
+      methods:"get",
+      params:params
+   })
+}

src/api/stock.js

@@ -574,4 +574,13 @@ export function PostSearchStock(keyword,params){
     method:"get",
     params:params
   })
+}
+
+export function GetOutStockTotalCount(params){
+  
+  return request({
+    url:"/api/warehouseout/getoutstocktotalcount",
+    method:"get",
+    params:params
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -12,6 +12,14 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/stock/selfstockquery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),
+      name: 'stockquery',
+      meta: { title: '库存查询', noCache: true } 
+
+    },
+
     {
         path: '/stock/selfPreparedMedicineIndex',
         component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
@@ -46,5 +54,13 @@ export default {
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
      },
+     {
+       path:"/stock/selfstockprint",
+       component:()=>import('@/xt_pages/stock/selfStockPrint'),
+       name:'selfStockQuery',
+       hidden:true,
+       is_menu:false,
+       meta:{title:'selfStockPrint',noCache:true}
+     }
   ]
 }

src/utils/tools.js

@@ -153,10 +153,10 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
-  // console.log(type)
-  // console.log('首剂', shouji)
-  // console.log('总量', shichang)
-  // console.log('维持', weichi)
+  console.log('类型',type)
+  console.log('首剂', shouji)
+  console.log('总量', shichang)
+  console.log('维持', weichi)
 
   var t = 0.5
   if (type == 1) {
@@ -177,6 +177,9 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
 }
 
 
+
+
+
 export function formatDate (date, format) {
   if (/(y+)/.test(format)) {
       format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));

src/xt_pages/data/components/project.vue

@@ -107,7 +107,7 @@ export default {
               {value:2,label:'否'}
             ],
             value: '',
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             tableData: [],
@@ -177,6 +177,7 @@ export default {
                console.log('projectlist',projecList)
                this.tableData = projecList
                var total = response.data.data.total
+               console.log("total-----",total)
                this.total = total
              }
           })  

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -308,6 +308,31 @@
           <span class="content">{{ this.record.special_treatment}}</span>
           <span class="unit"></span>
         </li>
+        
+        <li v-if="isShow('血栓')">
+          <label>血栓: </label>
+          <span class="content" v-if="this.record.thromubus_type == 1">有</span>
+          <span class="content" v-if="this.record.thromubus_type == 2">无</span>
+          <span class="unit"></span>
+        </li>
+
+         <li v-if="isShow('血栓')">
+          <label>导管AV端约为(cm): </label>
+          <span class="content">{{this.record.thrombus_av}}</span>
+          <span class="unit"></span>
+        </li>
+       
+        <li v-if="isShow('血栓')">
+          <label>导管A端约(cm): </label>
+          <span class="content">{{this.record.thromubus_a}}</span>
+          <span class="unit"></span>
+        </li>
+
+         <li v-if="isShow('血栓')">
+          <label>导管V端约(cm): </label>
+          <span class="content">{{this.record.thromubus_v}}</span>
+          <span class="unit"></span>
+        </li>
       </ul>
     </div>
     <div class="note">
@@ -334,7 +359,11 @@ export default {
       type: Object
     }
   },
+  created(){
+    console.log("血栓22222",this.record)
+  },
   computed: {
+   
     weight_before: function() {
       if (this.record.id == 0) {
         return '-'
@@ -382,7 +411,6 @@ export default {
         return '-'
       }
       return this.record.catheter
-      console.log('导管', this.record.catheter)
     },
 
     temperature: function() {

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

@@ -289,15 +289,6 @@
                 <el-option label="是" value="1"></el-option>
                 <el-option label="否" value="2"></el-option>
               </el-select>
-
-             <!-- <el-select v-model="assessmentBeforeDislysis.is_hemorrhage" placeholder="请选择">
-                <el-option
-                  v-for="item in hemorrhages"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select> -->
             </el-form-item>
           </el-col>
 
@@ -310,6 +301,36 @@
             </el-form-item>
           </el-col>
 
+
+
+           <el-col :span="8">
+            <el-form-item label="血栓：" v-if="isShow('血栓')">
+              <el-select v-model="assessmentBeforeDislysis.thromubus_type" @change="changeThrombus">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
+                <el-option label="无" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="导管AV端约为(cm):" v-show="thrombuShow" label-width="200px">
+              <el-input v-model="assessmentBeforeDislysis.thrombus_av" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="导管A端约(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_a" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="导管V端约(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_v" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('皮肤')">
             <el-form-item label="皮肤： ">
               <!-- <el-select v-model="assessmentBeforeDislysis.skin">
@@ -525,34 +546,10 @@
             </el-form-item>
           </el-col>
 
+         
 
-
-
-
-
-
-
-
-
-
-
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-          <!--<el-col :span="8">-->
-          <!--<el-form-item label="穿刺方法： " v-if="isShow('穿刺方法')">-->
-
-          <!--<el-select v-model="assessmentBeforeDislysis.puncture_method">-->
-          <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--<el-option v-for="item in puncture_method" :label="item.name" :value="item.name"-->
-          <!--:key="item.id"></el-option>-->
-          <!--</el-select>-->
-
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-
+         
+      
         </el-row>
 
 
@@ -704,6 +701,11 @@
           edema:'',
           special_treatment:'',
           catheter_maintenance:"",
+          thromubus_type:"",
+          thrombus_av:"",
+          thromubus_a:"",
+          thromubus_v:""
+
         },
 
         InnerDialogProps: {
@@ -718,7 +720,8 @@
         puncture_ways: '',
         skins:[],
         pinholings:[],
-        catheter_maintenancelist:[]
+        catheter_maintenancelist:[],
+        thrombuShow:false
       }
     },
     props: {
@@ -759,7 +762,15 @@
       },
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
+       
+       
+        console.log("获取上次数据",this.lastPredialysisEvaluation)
         if(this.lastPredialysisEvaluation != null) {
+         if(this.lastPredialysisEvaluation.thromubus_type == 1){
+          this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
+           this.thrombuShow = true
+        }
+
           if (this.lastPredialysisEvaluation.is_hemorrhage == 1) {
             this.lastPredialysisEvaluation.is_hemorrhage = "1"
           }
@@ -828,6 +839,8 @@
           }
 
         } else {
+         
+     
           this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
         }
@@ -1165,7 +1178,7 @@
         }).then(res => {
           // console.log(res)
           // console.log('透前', this.patient_prop)
-           console.log('透前', this.assessment)
+          
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
@@ -1189,6 +1202,15 @@
             }
           }
         })
+      },
+
+      changeThrombus(val){
+        if(val == 1){
+          this.thrombuShow = true
+        }
+        if(val == 2){
+         this.thrombuShow = false
+        }
       }
     },
     created() {
@@ -1221,6 +1243,7 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
+     
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){
@@ -1240,6 +1263,11 @@
 
       },
       'predialysis_evaluation.id': function() {
+         
+       if(this.predialysis_evaluation.thromubus_type == 1){
+             this.predialysis_evaluation.thromubus_type = this.predialysis_evaluation.thromubus_type.toString()
+             this.thrombuShow = true
+        }
 
         if (this.predialysis_evaluation.id > 0) {
           for (var index in this.assessmentBeforeDislysis) {

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

@@ -3237,10 +3237,7 @@
           parseFloat(dialysis_duration_hour) +
           parseFloat(dialysis_duration_minute) / 60
 
-        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-          1,
-          this.dialysisPrescription.anticoagulant_shouji,
-          duration,
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1,this.dialysisPrescription.anticoagulant_shouji,duration,
           this.dialysisPrescription.anticoagulant_weichi
         )
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {

src/xt_pages/dialysis/details/index.vue

@@ -971,7 +971,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          console.log("患者排班信息99999999",schedual)
+          // console.log("患者排班信息99999999",schedual)
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -983,7 +983,8 @@ export default {
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
           // console.log('receiver_treatment_access', receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          // console.log('透前评估22222', predialysis_evaluation)
+         
+        
 
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -419,6 +419,56 @@
                   </tr>
                 </tbody>
               </table>
+
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="70"></td>
+                    <td width="40">血栓:</td>
+                    <td width="90">
+                      <div>
+                        <label-box :isChecked="predialysis.thromubus_type == 1?true:false" showValue="有"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.thromubus_type == 2?true:false" showValue="无"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
+                    <td width="10">（</td>
+                    <td width="90">导管AV端各约</td>
+                    <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thrombus_av ? predialysis.thrombus_av : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="50">A端约</td>
+                     <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thromubus_a ? predialysis.thromubus_a : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="50">V端约</td>
+                     <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thromubus_v ? predialysis.thromubus_v : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="10">）</td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
               <table >
                 <tbody>
                   <tr class="table-box">

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -789,7 +789,9 @@
               <div>
                 <span style="width:70px;display:inline-block">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
-                </span>ml
+                </span>
+
+                <span>L</span>
               </div>
             </td>
             <td width="100" style="border:none;border-left:1px solid #000;padding-left:5px">

src/xt_pages/medicalScheduling/index.vue

@@ -7,6 +7,7 @@
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
+                <!-- <el-button type="primary" icon="el-icon-printer" @click="toPrint">导出</el-button> -->
             </div>
         </div>
         <div class="app-container">
@@ -312,19 +313,25 @@
                             </el-table>
                         </el-tab-pane>
                     </el-tabs>
-                    <!-- <div style="margin-top:20px;">
-                        <p style="line-height:20px;">1.默认科室所有排序在职员工账号</p>
-                        <p style="line-height:20px;">2.护士默认排序，按加入机构先后降序排序，最先加入机构的排序为1，显示在列表最下面，自定义排序，最大的序号排在最上面</p>
-                        <p style="line-height:20px;">3.职称显示与管理中旬的员工列表显示的职称一样</p>
-                        <p style="line-height:20px;">4.是否排班，默认机构所有用户是“是”，如果是否，则该用户不在医护排班列表中</p>
-                    </div> -->
+                 
                 </div>
-                <!-- <div slot="footer" class="dialog-footer">
-                <el-button @click="hide">取 消</el-button>
-                <el-button type="primary" @click="submitAction()">保 存</el-button>
-                </div> -->
-            </el-dialog>
+            </el-dialog>    
         </div>
+
+
+        <el-dialog
+            title="导出排班"
+            :visible.sync="exportDialogVisible"
+            width="30%"
+            :before-close="handleClose">
+            <span>
+
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>    
     </div>
 </template>
 
@@ -390,22 +397,18 @@ export default {
            arrFive:[],
            arrSix:[],
            arrSeven:[],
-
-           //
-            nurseVisible:false,
-            activeName:'nurse',
-            radio:'1',
-            nurseTableData:[],
-            doctorTableData:[],
+           nurseVisible:false,
+           activeName:'nurse',
+           radio:'1',
+           nurseTableData:[],
+           doctorTableData:[],
+           exportDialogVisible:false
         }
     },
     methods:{
         search(){},
         toPrint(){
-            this.$router.push({
-                path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr+"&typeValue="+this.typeValue,
-                // query: { date: date }
-            })
+          this.exportDialogVisible = true
         },
         getDoctorList(){
             getDoctorList().then(response=>{

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -29,8 +29,7 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small" v-model="key" class="filter-item"/>
-
+          <!--<el-input size="small" v-model="key" class="filter-item"/>-->
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
@@ -87,7 +86,8 @@
           <!--&gt;退号-->
           <!--</el-button>-->
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(11)" type="primary"-->
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(11)" type="primary"-->
           <!--&gt;撤销明细-->
           <!--</el-button>-->
 
@@ -96,7 +96,8 @@
           <!--&gt;查编码-->
           <!--</el-button>-->
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(13)" type="primary"-->
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(13)" type="primary"-->
           <!--&gt;查待遇-->
           <!--</el-button>-->
 
@@ -324,8 +325,8 @@
     data() {
       return {
         key: "",
-        other_start_time:"",
-        other_end_time:"",
+        other_start_time: "",
+        other_end_time: "",
         crumbs: [
           {path: false, name: '门诊收费'},
           {path: false, name: '门诊收费管理'}
@@ -394,25 +395,27 @@
       this.getPatientList()
     },
     methods: {
-      changeTime(val){
+      changeTime(val) {
         this.other_start_time = val
 
 
-      },changeEndTime(val){
+      }, changeEndTime(val) {
         this.other_end_time = val
 
 
-
       }, chargeConfirm(form) {
 
         form['id'] = this.patientInfo.id
         form['record_time'] = this.record_date
-        if(this.activeName == 'first'){
+        form['admin_user_id'] = this.$store.getters.xt_user.user.id
+
+        if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
-        }else {
+        } else {
           form['start_time'] = this.other_start_time
           form['end_time'] = this.other_end_time
           form['settle_accounts_type'] = 2
+
         }
 
         this.loadingtwo = true
@@ -468,8 +471,9 @@
       },
       confirm(forms) {
         forms['id'] = this.patientInfo.id,
-          forms['record_time'] = this.record_date,
-          this.loadingone = true
+        forms['record_time'] = this.record_date,
+        forms['admin_user_id'] = this.$store.getters.xt_user.user.id
+        this.loadingone = true
 
         if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
           var that = this
@@ -555,7 +559,7 @@
                   single_dose: prescription.advices[b].single_dose,
                   delivery_way: prescription.advices[b].delivery_way,
                   execution_frequency: prescription.advices[b].execution_frequency,
-                  retail_price: prescription.advices[b].price.toString(),
+                  retail_price: prescription.advices[b].price,
                   remark: prescription.advices[b].remark,
                   day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -643,14 +647,14 @@
         if (this.curPrescriptions.type == 1) {
           if (this.curPrescriptions.advices != null) {
             for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              total = total + Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number) * 100) / 100
+              total = total + (this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)
 
             }
           }
         } else {
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              total = total + Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
+              total = total + (this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total)
 
             }
           }
@@ -658,10 +662,10 @@
 
         if (this.curPrescriptions.addition != null) {
           for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
-            total = total + Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
+            total = total + (this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count)
           }
         }
-        return Math.floor(total * 100) / 100
+        return (total * 100) / 100
 
       },
       getTotal() {
@@ -669,22 +673,22 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total = total + Math.floor((this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number) * 100) / 100
+              total = total + (this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number)
             }
           }
           if (this.prescriptions[i].project != null) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
 
-              total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
+              total = total + (this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total)
             }
           }
           if (this.prescriptions[i].addition != null) {
             for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
-              total = total + Math.floor((this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count) * 100) / 100
+              total = total + (this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count)
             }
           }
         }
-        return Math.floor(total * 100) / 100
+        return (total * 100) / 100
 
       },
       moreState(tab, event) {
@@ -734,6 +738,8 @@
                 'number': this.order.number,
                 'patient_id': this.patientInfo.id,
                 'record_time': this.record_date,
+                'admin_user_id':this.$store.getters.xt_user.user.id
+
 
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,7 +150,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 4) {
+      if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
 
         var that = this
 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -186,9 +186,9 @@
             </tr>
             <tr>
                 <td>合计</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total) * 100 /100 }}</td>
+                <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total)*100/100}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total)*100/100}}</td>
                 <td style="text-align:right;padding-right:10px;"></td>
                 <td colspan="2" style="text-align:right;padding-right:10px;"></td>
                 <td style="text-align:right;padding-right:10px;"></td>

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -80,7 +80,7 @@
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
               <template slot-scope="scope">
-                <div>{{scope.row.retail_price}}</div>
+                <div>{{scope.row.price}}元</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="remark" label="备注">
@@ -131,7 +131,7 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                <div>{{ scope.row.count }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" width="60" label="单价">
@@ -247,7 +247,7 @@
             let tempAddition = []
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
-                advice_id: prescription.doctor_advice[b].id,
+                advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
@@ -268,7 +268,7 @@
 
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
-                id: prescription.project[b].id,
+                id: 0,
                 project_id: prescription.project[b].project_id,
                 project_name: prescription.project[b].project.project_name,
                 statistical_classification: prescription.project[b].project.statistical_classification,
@@ -276,7 +276,7 @@
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
-                total:prescription.project[b].count.toString(),
+                total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 medical_code:prescription.project[b].project.medical_code,
@@ -288,6 +288,7 @@
               advices: tempAdvice,
               project: tempProject,
               addition:tempAddition,
+              type:prescription.type,
               order_status:0,
             }
             prescriptions.push(obj)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -90,8 +90,8 @@
                 v-model="item.pre_time"
                 type="datetime"
                 :clearable="false"
-                format="yyyy-MM-dd hh:mm"
-                value-format="yyyy-MM-dd hh:mm"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择日期">
               </el-date-picker>
               <el-date-picker
@@ -118,12 +118,12 @@
                 </el-button>
               </div>
             </div>
-              
+
 
             </el-tab-pane>
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
-            
+
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -302,7 +302,7 @@
             let tempAddition = []
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
-                advice_id: prescription.doctor_advice[b].id,
+                advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
@@ -323,7 +323,7 @@
 
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
-                id: prescription.project[b].id,
+                id: 0,
                 project_id: prescription.project[b].project_id,
                 project_name: prescription.project[b].project.project_name,
                 statistical_classification: prescription.project[b].project.statistical_classification,

src/xt_pages/sign/signIn.vue

@@ -279,6 +279,13 @@ export default {
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                         })
+                    }else if(res.channel == 'queue/queuelistbyq'){
+                        console.log(11111111111,res.data)
+                        this.signInList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        this.signInList.map(item => {
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        })
                     }
                 
                 // console.log("action", re.action);

src/xt_pages/stock/drugs/query.vue

@@ -2,34 +2,77 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-      <el-button
-        size="small"
-        class="filter-item"
-        type="primary"
-        icon="el-icon-search"
-        @click="setting"
-      >设置
-      </el-button
-      >
-    </div>
-    <div class="app-container ">
-      <div class="cell clearfix">
-        <el-input
-          size="small"
-          style="width: 400px;"
-          class="filter-item"
-          v-model.trim="keywords"
-          placeholder="商品名称/规格名称"
-        />
+      <div>
         <el-button
           size="small"
           class="filter-item"
           type="primary"
           icon="el-icon-search"
-          @click="search"
-        >搜索
+          @click="setting"
+        >设置
         </el-button
         >
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="exportStock"
+        >导出
+        </el-button>
+      </div>
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+         <el-select v-model="drug_category" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+            <el-option
+              v-for="(item,index) in drugCategory"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+        </el-select>
+         <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;margin-right:10px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+          <el-input
+            size="small"
+            style="width: 200px;"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="商品名称/规格名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >搜索
+          </el-button>
       </div>
 
 
@@ -113,7 +156,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         align="right"
@@ -136,11 +179,15 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
-
+  import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     name: 'stockIn',
     created() {
       this.GetAllDrugStockQueryList()
+
+      var drugCategory = getDictionaryDataConfig('system','drug_category')
+      this.drugCategory.push(...drugCategory)
+      console.log("透析记录",this.drugCategory)
     },
     components: {
       SettingDialog,
@@ -167,7 +214,12 @@
         WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
-        }
+        },
+        tableData:[],
+        drug_category:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ]
       }
     },
     methods: {
@@ -218,12 +270,16 @@
         }
       },
       GetAllDrugStockQueryList: function() {
-        console.log(this.keywords)
+       
         const Params = {
           page: this.page,
           limit: this.limit,
-          keyword: this.keywords
+          keyword: this.keywords,
+          drug_category:this.drug_category,
+          start_time:this.start_time,
+          end_time:this.end_time,
         }
+        console.log("parasm22222",Params)
         this.WarehouseInfo.loading = true
         this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
@@ -234,12 +290,25 @@
           } else {
             this.WarehouseInfo.loading = false
             this.total = response.data.data.total
+            var arr = []
             for (let i = 0; i < response.data.data.list.length; i++) {
-
               this.WarehouseInfo.warehouseInfoDate.push(
                 response.data.data.list[i]
               )
+              arr.push(response.data.data.list[i])
             }
+            console.log("数据源头",arr)
+            for(let i=0;i<arr.length;i++){
+               arr[i].stockInCount =  this.stockInCount(arr[i])
+               arr[i].salesReturnCount = this.salesReturnCount(arr[i])
+               arr[i].reactCount = (this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]))?this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]):0
+               arr[i].stockOutCount = this.stockOutCount(arr[i])
+               arr[i].cancelStockCount = this.cancelStockCount(arr[i])?this.cancelStockCount(arr[i]):0
+               arr[i].reactOutCount = (this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i]))?(this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i])):0
+               arr[i].overplusCount = (this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]))?this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]):0
+            }
+             console.log("arr222222222",arr)
+             this.tableData = arr
             this.handleSpanTempArr()
           }
         })
@@ -277,12 +346,27 @@
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
-      startTimeChange: function() {
-        this.GetAllDrugStockQueryList()
-      },
-      endTimeChange: function() {
-        this.GetAllDrugStockQueryList()
-      },
+  
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+    },
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+     
+    },
       stockInCount: function(row) {
         let total = 0
         for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
@@ -323,8 +407,37 @@
       },
       search: function() {
         this.GetAllDrugStockQueryList()
-      }, setting: function() {
+      }, 
+      setting: function() {
         this.$refs.dialog.show()
+      },
+       exportStock(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
+       
+        
+         const data = this.formatJson(filterVal, this.tableData)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '自备药查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getTimestamp(time) { // 把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
+      changeDrug(){
+       this.GetAllDrugStockQueryList()
       }
     }
   }

src/xt_pages/stock/selfPreparedMedicine/stockquery.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container ">
+      <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+        <div>
+          <el-select v-model="type_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+          @change="changeTypeName">
+            <el-option
+              v-for="item in drugType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+          <el-input
+            size="small"
+            style="width: 200px;margin-left:10px;"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="药品名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="exportList">导出</el-button>
+          <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        </div>
+      </div>
+      
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.drug_name?scope.row.drug_name:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.drug_spec?scope.row.drug_spec:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.Count?scope.row.Count:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际入库" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.Count?scope.row.Count:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.outCount?scope.row.outCount:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际出库" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.outCount?scope.row.outCount:""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="剩余库存" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.total?scope.row.total:""}}</span>
+          </template>
+        </el-table-column>
+       
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100,200,500,1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { getSelfStockQuery } from "@/api/drug/drug"
+export default {
+  name: "stockIn",
+  created() {
+    var types =  getDictionaryDataConfig('system','drug_type')
+    console.log("44444",types)
+    var arr= []
+    var obj = {id:0,name:"全部" }
+    arr.push(obj)
+    arr.push(...types)
+    this.drugType = arr
+    console.log("arrr",arr)
+    this.getlist()
+  },
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/query", name: "库存查询" }
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      tableData:[],
+      drugType:[],
+      type_name:0,
+      stockOutData:[]
+    };
+  },
+  methods: {
+     
+     getlist(){
+         var params ={
+           type_name:this.type_name,
+           start_time:this.start_time,
+           end_time:this.end_time,
+           keywords:this.keywords,
+           page:this.page,
+           limit:this.limit
+         }
+        console.log("params",params)
+       getSelfStockQuery(params).then(response=>{
+          if(response.data.state == 1){
+            var stockQuery =  response.data.data.stockQuery
+            console.log("入库",stockQuery)
+            this.total = response.data.data.total
+            console.log("total",this.total)
+            var stockOutQuery = response.data.data.stockOutQuery
+            console.log("stockOut",stockOutQuery)
+             for(let i=0;i<stockQuery.length;i++){
+               for(let j=0;j<stockOutQuery.length;j++){
+                  if(stockQuery[i].drug_name_id == stockOutQuery[j].drug_name_id ){
+                     stockQuery[i].outCount = stockOutQuery[j].Count
+                     stockQuery[i].total = stockQuery[i].Count - stockOutQuery[j].Count
+                  }
+               }
+             }
+            console.log("表格数据",stockQuery)
+             this.tableData = stockQuery
+          }
+       })
+     },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+  
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.getlist()
+      }
+    },
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+     
+    },
+   
+
+    search: function() {
+      this.getlist()
+    },
+
+    exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['药品名称', '规格名称', '入库数量','实际入库','出库数量','实际出库','剩余库存']
+         const filterVal = ['drug_name', 'drug_spec', 'Count','Count','outCount','outCount','total'] 
+         const data = this.formatJson(filterVal, this.tableData)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '库存查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      changeTypeName(){
+        this.getlist()
+      },
+      toPrint(){
+        this.$router.push("/stock/selfstockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
+        
+      },
+
+     
+      getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },
+      getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
+      },
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/selfStockPrint.vue

@@ -0,0 +1,202 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">耗材管理查询表</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <td width="60">药品名称</td>
+                                    <td width="80">规格名称</td>
+                                    <td width="80">入库数量</td>
+                                    <td width="80">实际入库</td>
+                                    <td width="80">出库数量</td>
+                                    <td width="80">实际出库</td>
+                                    <td width="80">剩余库存</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for='(item,index) in tableData' :key="index">
+                                    <td>{{item.drug_name}}</td>
+                                    <td>{{item.drug_spec}}</td>
+                                    <td>{{item.Count}}</td>
+                                    <td>{{item.Count}}</td>
+                                    <td>{{item.outCount}}</td>
+                                    <td>{{item.outCount}}</td>
+                                    <td>{{item.total}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getSelfStockQuery } from "@/api/drug/drug"
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '自备药管理' },
+            { path: false, name: '库存查询' },
+            { path: false, name: '库存打印' },
+          ],
+          start_time:"",
+          end_time:"",
+          drug_name:"",
+          drug_spec:"",
+          keyword:"",
+          tableData:[],
+          time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+          type_name:"",
+          limit:20,
+          page:1,
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+      getlist(){
+          var params ={
+           type_name:this.type_name,
+           start_time:this.start_time,
+           end_time:this.end_time,
+           keywords:this.keywords,
+           page:this.page,
+           limit:this.limit
+         }
+          console.log("params",params)
+         getSelfStockQuery(params).then(response=>{
+          if(response.data.state == 1){
+            var stockQuery =  response.data.data.stockQuery
+            var stockOutQuery = response.data.data.stockOutQuery
+             for(let i=0;i<stockQuery.length;i++){
+               for(let j=0;j<stockOutQuery.length;j++){
+                  if(stockQuery[i].drug_name_id == stockOutQuery[j].drug_name_id ){
+                     stockQuery[i].outCount = stockOutQuery[j].Count
+                     stockQuery[i].total = stockQuery[i].Count - stockOutQuery[j].Count
+                  }
+               }
+             }
+            console.log("表格数据",stockQuery)
+             this.tableData = stockQuery
+          }
+       })
+      },
+    },
+    created(){
+      var starttime =  this.$route.query.start_time
+      this.start_time = starttime
+      var endtime =  this.$route.query.end_time
+      this.end_time = endtime
+      var type_name = this.$route.query.type_name
+      this.type_name = type_name
+      var keyword = this.$route.query.keyword
+      this.keyword = keyword
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockOutOrder.vue

@@ -132,7 +132,7 @@
                 size="small"
                 type="warning"
                 icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
+                @click="handleSearch(scope.row.id,scope.row)"
               >
               </el-button>
             </el-tooltip>
@@ -259,8 +259,8 @@
                 <span>出库数量</span>
               </template>
               <template slot-scope="scope">
-                <span>{{scope.row.count}}</span>
-
+                <!-- <span>{{scope.row.count}}</span> -->
+                <span>{{getOutStockCount(scope.row.good_id)}}</span>
               </template>
             </el-table-column>
             <el-table-column label="总价" min-width="20" align="center">
@@ -383,7 +383,8 @@ import {
   GetAllConfig,
   getWarehouseOutList,
   getWarehouseOutInfo,
-  getWarehouseOutUser
+  getWarehouseOutUser,
+  GetOutStockTotalCount
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -452,7 +453,7 @@ export default {
       userList:[],
       type_name:'',
       specification_name:"",
-      
+      stockCount:[]
     };
   },
   methods: {
@@ -607,9 +608,10 @@ export default {
       }
     },
     handleEdit: function(index, row) {
+      
       this.$router.push({
         name: "stockOutDetail",
-        query: { id: row.id, type: this.type }
+        query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
       });
     },
     handleDelete: function(index, row) {
@@ -708,11 +710,13 @@ export default {
 
     
     //新增
-    handleSearch(id){ 
+    handleSearch(id,row){ 
+      console.log("row2233r5",row)
       this.warehousingOutInfo.info = []
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)
-      this.dialogVisible = true
+      this.GetTotalCount(row.warehouse_out_time)
+      
     },
   
     //获取出库单详情数据
@@ -790,11 +794,13 @@ export default {
             return false
           } else {
             var total = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              var obj = response.data.data.list[i]
+            var list = response.data.data.list
+            var arrList =  this.unique(list)
+            for (let i = 0; i < arrList.length; i++) {
+              var obj = arrList[i]
               obj['is_total'] = 0
               this.userList.push(obj)
-              total = total + response.data.data.list[i].count
+              total = total + arrList[i].count
             }
             this.userList.push({
               is_total: 1,
@@ -803,7 +809,7 @@ export default {
             this.type_name = this.userList[0].type.type_name
             this.specification_name = this.userList[0].info.specification_name
             console.log("详情数据区",this.userList)
-              this.editdialogVisible = true
+            this.editdialogVisible = true
           }
         })
       },
@@ -813,7 +819,36 @@ export default {
       },
       deleteRecord(){
 
-      }
+      },
+
+      GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("出库数量2323",stockCount)
+              this.stockCount = stockCount
+              this.dialogVisible = true
+           }
+        })
+      },
+
+     getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
+     },
+
+     unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
+     }
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -74,8 +74,8 @@
               <span>出库数量</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.count}}</span>
-
+              <!-- <span>{{scope.row.count}}</span> -->
+                <span>{{getOutStockCount(scope.row.good_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">
@@ -112,7 +112,7 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutInfo } from '@/api/stock'
+  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutInfo,GetOutStockTotalCount } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
   export default {
@@ -120,8 +120,11 @@
     components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
+      const warehouse_out_time = this.$route.query.warehouse_out_time
+      console.log("时间搓",warehouse_out_time)
       this.GetConfigInfo()
       this.GetOrderDetail(order_id)
+      this.GetTotalCount(warehouse_out_time)
     },
     data() {
       return {
@@ -149,7 +152,8 @@
           loading: false,
           warehousingOutData: [],
           info: {}
-        }
+        },
+        stockCount:[]
       }
     },
     methods: {
@@ -221,12 +225,12 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log("=====",response.data.data.list)
-            console.log("=11111",response.data.data.info)
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
             this.handleSpanTempArr()
           }
         })
@@ -263,7 +267,8 @@
         })
       }, editRecord: function() {
         this.$emit('edit-record')
-      },jump(row){
+      },
+      jump(row){
         this.$router.push({
           name: 'user_detail',
           query: { id: row.id }
@@ -277,7 +282,8 @@
             colspan: _col
           }
         }
-      },handleSpanTempArr(){
+      },
+      handleSpanTempArr(){
         this.tempArr = []
 
         for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
@@ -311,9 +317,29 @@
           }
         })
         this.sameRowArr = sameRowArr
+      },
 
+      GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("stockCount",stockCount)
+              this.stockCount = stockCount
+           }
+        })
+      },
 
-
+      getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
       }
     }
   }

src/xt_pages/stock/stockQuery.vue

@@ -345,7 +345,7 @@ export default {
       return total;
     },
     stockOutCount: function(row) {
-      console.log("row------",row)
+      
       let total = 0;
       for (let i = 0; i < row.query_warehouseout_info.length; i++) {
         total = total + row.query_warehouseout_info[i].count;

src/xt_pages/stock/stockUserDetail.vue

@@ -117,20 +117,27 @@
             return false
           } else {
             var total = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              var obj = response.data.data.list[i]
+          
+            var list =  response.data.data.list
+            console.log("list",list)
+            var arrList = this.unique(list)
+            for (let i = 0; i < arrList.length; i++) {
+              var obj = arrList[i]
               obj['is_total'] = 0
               this.userList.push(obj)
-              total = total + response.data.data.list[i].count
+              total = total + arrList[i].count
             }
             this.userList.push({
               is_total: 1,
               total: total,
             })
-
-            console.log(this.userList)
           }
         })
+      },
+
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
       }
     }
   }