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

src/api/drug/drug_stock.js

@@ -565,3 +565,19 @@ export function getDrugCancelExportList(params) {
     params: params
   })
 }
+
+export function getDrugWarehouseInfoPrint(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfoprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugOutOrderPrint(params) {
+  return request({
+    url: '/api/drug/getdrugoutorderprint',
+    method: 'get',
+    params: params
+  })
+}

src/api/patient.js

@@ -476,3 +476,27 @@ export function getInitDataList(params) {
     params: params
   })
 }
+
+export function getInspectionMajorItem(params) {
+  return request({
+    url: '/api/patient/getinspectionmajoritem',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInspectionDetail(params) {
+  return request({
+    url: '/api/patient/getinspectiondetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInspectionItemList(params) {
+  return request({
+    url: '/api/patient/getinspectionitemlist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/consumables.vue

@@ -43,8 +43,8 @@
     </div>
 
      <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">批量备案</el-button>
-        <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+        <!--<el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">批量备案</el-button>-->
+        <!--<el-button type="primary" size="mini">批量备案</el-button>-->
         <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -130,12 +130,12 @@
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
-             <span v-if="scope.row.is_mark == 0">备案</span>
-             <span v-if="scope.row.is_mark == 1">撤销</span>
-          </el-button>
+          <!--<el-button type="primary" size="small" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">-->
+             <!--<span v-if="scope.row.is_mark == 0">备案</span>-->
+             <!--<span v-if="scope.row.is_mark == 1">撤销</span>-->
+          <!--</el-button>-->
 
-          <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+          <el-button type="primary" size="small" >
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>

src/xt_pages/data/components/drugs.vue

@@ -45,8 +45,8 @@
 
     </div>
     <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" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028  && $store.getters.xt_user.org_id != 10138 && $store.getters.xt_user.org_id != 10138" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!--<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"
                  style="margin-left:15px">
           <el-button
@@ -149,13 +149,13 @@
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
 
-        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138" >
-          <span v-if="scope.row.is_mark == 0">备案</span>
-          <span v-if="scope.row.is_mark == 1">撤消</span>
-        </el-button>
+        <!--<el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138" >-->
+          <!--<span v-if="scope.row.is_mark == 0">备案</span>-->
+          <!--<span v-if="scope.row.is_mark == 1">撤消</span>-->
+        <!--</el-button>-->
 
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left">
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
@@ -736,7 +736,7 @@
             return false
           } else {
             this.total = response.data.data.total;
-          
+
             this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])

src/xt_pages/data/components/project.vue

@@ -39,8 +39,8 @@
             </div>
         </div>
         <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 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $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/itemTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -114,12 +114,12 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
-                      <span v-if="scope.row.is_mark ==0">备案</span>
-                      <span v-if="scope.row.is_mark ==1">撤销</span>
-                    </el-button>
+                    <!--<el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">-->
+                      <!--<span v-if="scope.row.is_mark ==0">备案</span>-->
+                      <!--<span v-if="scope.row.is_mark ==1">撤销</span>-->
+                    <!--</el-button>-->
 
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left">
                         <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
                         <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
                     </el-button>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -310,6 +310,7 @@
                              v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
 
         <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
+
         <el-dialog
                 class="centerDialog"
                 width="900px"

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -50,16 +50,16 @@
             </el-form-item>
 
 
-            <el-form-item label="医疗类别：" prop="medical_care">
-                <el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="(item,index) in medical_care"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
+            <!--<el-form-item label="医疗类别：" prop="medical_care">-->
+                <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in medical_care"-->
+                            <!--:key="index"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
 
 
             <el-form-item label="证件类型：" prop="certificates" >
@@ -320,7 +320,7 @@
           birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
           certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
           id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
+          // medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
 
         },
         visibility: false,
@@ -435,7 +435,7 @@
 
         }
         this.read_loading = true
-        axios.get('http://127.0.0.1:9532/sz/api/readcard', {
+        axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })
           .then(function (response) {

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -193,8 +193,8 @@
                 scanStyles: false
               });
             }
-
-
+            
+            
           },500)
         }else{
           const style =
@@ -232,7 +232,7 @@
 
               return false
             } else {
-
+              
               this.balanceAccounts = response.data.data
               let arr = []
               let obj = {
@@ -252,7 +252,7 @@
               }
               let num = 0
               this.balanceAccounts.order_info.map(item => {
-
+                
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
@@ -378,7 +378,7 @@
                         }
                       }
                       that.info.new_detail_list.push(obj)
-
+                      
                     }
                     let num = 0
                     that.info.new_detail_list.map(item => {
@@ -394,36 +394,30 @@
                       if(that.info.transBody.outputlist2[i].aka111 == '07') {
                         console.log('0707007')
                         newTotal += that.info.transBody.outputlist2[i].bka058
-                        // that.info.transBody.outputlist2.splice(i, 1);
                       }
                       if(that.info.transBody.outputlist2[i].aka111 == '19'){
                         console.log('191919')
                         newTotal += that.info.transBody.outputlist2[i].bka058
-                        // that.info.transBody.outputlist2.splice(i, 1);
                       }
+                      console.log(8888888,that.info.transBody.outputlist2)
                     }
+                    console.log(1111111111111)
                     let aka111obj = {
                       aka111:'99',
                       bka058:newTotal
                     }
-                    that.info.transBody.outputlist2.push(aka111obj)
-
-                    for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
-                      if(that.info.transBody.outputlist2[i].aka111 == '07') {
-                        // console.log('0707007')
-                        // newTotal += that.info.transBody.outputlist2[i].bka058
-                        that.info.transBody.outputlist2.splice(i, 1);
+                    console.log('aka111obj',aka111obj)
+                    let newOutputlist2 = []
+                    newOutputlist2.push(aka111obj)
+                    that.info.transBody.outputlist2.map(item => {
+                      if(item.aka111 != '07' && item.aka111 != '19'){
+                        newOutputlist2.push(item)
                       }
-                      if(that.info.transBody.outputlist2[i].aka111 == '19'){
-                        // console.log('191919')
-                        // newTotal += that.info.transBody.outputlist2[i].bka058
-                        that.info.transBody.outputlist2.splice(i, 1);
-                      }
-                    }
-
+                    })
+                    that.info.transBody.outputlist2 = newOutputlist2
                     console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-
+                    
                   }
                 }
               })
@@ -454,7 +448,7 @@
 
     created() {
       this.org_id = this.$store.getters.xt_user.org_id
-
+      
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/summary.vue

@@ -6,7 +6,8 @@
         <div class="app-container">
             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
-                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction" @keyup.enter.native='searchAction'
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                              @keyup.enter.native='searchAction'
                               class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                                @click="searchAction">
@@ -98,7 +99,6 @@
                 </el-table-column>
 
 
-
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
                         {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
@@ -117,8 +117,7 @@
                 <el-table-column align="center" prop="name" label="操作">
                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-                        <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)  || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+                        <el-button size="mini" type="primary" @click="toPrint(scope.row)">
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
@@ -173,15 +172,15 @@
             <allListPrint :paramsObj='paramsObj'></allListPrint>
         </el-dialog>
 
-        <el-dialog
-                class="centerDialog"
-                width="1200px"
-                title="打印"
-                :visible.sync="statementVisible9504">
-            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-            <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
-            <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
-        </el-dialog>
+        <!--<el-dialog-->
+        <!--class="centerDialog"-->
+        <!--width="1200px"-->
+        <!--title="打印"-->
+        <!--:visible.sync="statementVisible9504">-->
+        <!--&lt;!&ndash;<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>&ndash;&gt;-->
+        <!--&lt;!&ndash;<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>&ndash;&gt;-->
+        <!--<new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>-->
+        <!--</el-dialog>-->
 
         <el-dialog
                 class="centerDialog"
@@ -258,92 +257,31 @@
     methods: {
       getMedType(med_type) {
         var med_type = parseInt(med_type)
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-          switch (med_type) {
-            case 11:
-              return '普通门诊'
-
-              break
-            case 12:
-              return '家庭通道'
-
-              break
-            case 13:
-              return '门诊大病'
-
-              break
-
-            case 14:
-              return '重疾特药'
-              break
-
-            case 15:
-              return '门诊慢病'
-
-              break
-            case 16:
-              return '门诊特检'
-
-              break
-            case 17:
-              return '健康体检'
-
-              break
-            case 18:
-              return '预防接种'
-
-              break
-            case 19:
-              return '门诊输血'
-
-              break
-            case 91:
-              return '新冠肺炎门诊'
-              break
-            case 1111:
-              return '精一' + '处方'
-              break
-            case 1112:
-              return '精二' + '处方'
-              break
-          }
-
-        } else {
-
-          switch (med_type) {
-            case 11:
-              return '普通门诊'
-
-              break
-            case 12:
-              return '门诊挂号'
-
-              break
-            case 13:
-              return '急诊'
-
-              break
-
-            case 14:
-              return '门诊特殊病'
-              break
-
-            case 15:
-              return '门诊统筹'
-
-              break
-            case 16:
-              return '门诊慢性病'
-
-              break
-            case 21:
-              return '普通住院'
-              break
-
-          }
-
+        switch (med_type) {
+          case 11:
+            return '普通门诊'
+            break
+          case 12:
+            return '门诊挂号'
+            break
+          case 13:
+            return '急诊'
+            break
+          case 14:
+            return '门诊特殊病'
+            break
+
+          case 15:
+            return '门诊统筹'
+
+            break
+          case 16:
+            return '门诊慢性病'
+            break
+          case 21:
+            return '普通住院'
+            break
         }
-
       },
       uploadInfo(row) {
         var that = this
@@ -402,8 +340,8 @@
           }).then(() => {
             let params = {
               'order_id': row.id,
-              'patient_id':  row.patient_id,
-              'record_time':this.getTimes(row.settle_accounts_date),
+              'patient_id': row.patient_id,
+              'record_time': this.getTimes(row.settle_accounts_date)
             }
             Refund(params).then(response => {
               if (response.data.state == 0) {
@@ -419,149 +357,80 @@
 
         } else {
 
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
-            var that = this
-            this.$confirm('是否退费', '退费', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'order_id': row.id,
-                'patient_id': row.patient_id,
-                'record_time': that.getTimes(row.settle_accounts_date),
-                'admin_user_id': that.$store.getters.xt_user.user.id
-              }
-              axios.get('http://127.0.0.1:9532/api/refund/post', {
-                params: params
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    } else {
-                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
-                      that.getHisOrderList()
-
-                    }
-                  }
-                })
-                .catch(function(error) {
-                })
-            }).catch(() => {
-            })
-
-          } else if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-            var that = this
-            this.$confirm('是否退费', '退费', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'order_id': row.id,
-                'patient_id': row.patient_id,
-                'record_time': this.getTimes(row.settle_accounts_date),
-                'admin_user_id': this.$store.getters.xt_user.user.id
-              }
-              axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
-                params: params
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-
-                    } else {
-                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
-                      that.getHisOrderList()
-                    }
-                  }
-                })
-                .catch(function(error) {
-                })
-
-            }).catch(() => {
+          var that = this
+          this.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': row.id,
+              'patient_id': row.patient_id,
+              'record_time': that.getTimes(row.settle_accounts_date),
+              'admin_user_id': that.$store.getters.xt_user.user.id
+            }
+            axios.get('http://127.0.0.1:9532/api/refund/post', {
+              params: params
             })
-
-          } else {
-            this.$confirm('是否退费', '退费', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'order_id': row.id,
-                'patient_id':  row.patient_id,
-                'record_time':this.getTimes(row.settle_accounts_date),
-
-              }
-              Refund(params).then(response => {
+              .then(function(response) {
                 if (response.data.state == 0) {
-                  this.$message.error(response.data.msg)
+                  that.$message.error(response.data.msg)
                   return false
                 } else {
-                  this.$message({ message: '退费成功', type: 'success' })
-                  this.getHisOrderList()
+                  if (response.data.data.failed_code == -10) {
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  } else {
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.getHisOrderList()
+
+                  }
                 }
               })
-            }).catch(() => {
-            })
-          }
+              .catch(function(error) {
+              })
+          }).catch(() => {
+          })
         }
       }, toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
-          if (row.mdtrt_id.indexOf('H') > -1) {
-            this.statementVisible9504 = true
-            let obj = {
-              order_id: row.id,
-              patient_id: row.patient_id,
-              record_time: this.getTimes(row.settle_accounts_date),
-              admin_user_id: this.$store.getters.xt_user.user.id
-            }
-            this.orderObj9504 = obj
-          } else {
-
-            this.statementVisible9504 = true
-            let obj = {
-              order_id: row.id,
-              patient_id: row.patient_id,
-              record_time: this.getTimes(row.settle_accounts_date),
-              admin_user_id: this.$store.getters.xt_user.user.id,
-              balance_accounts_type: 2
-            }
-            this.orderObj9504 = obj
-          }
-
-        } else {
-          this.statementVisible = true
-          let obj = {
-            order_id: row.id,
-            settle_type: row.settle_type,
-            start_time: row.settle_start_time,
-            end_time: row.settle_end_time
-          }
-          this.orderObj = obj
+        // if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+        //   if (row.mdtrt_id.indexOf('H') > -1) {
+        //     this.statementVisible9504 = true
+        //     let obj = {
+        //       order_id: row.id,
+        //       patient_id: row.patient_id,
+        //       record_time: this.getTimes(row.settle_accounts_date),
+        //       admin_user_id: this.$store.getters.xt_user.user.id
+        //     }
+        //     this.orderObj9504 = obj
+        //   } else {
+        //
+        //     this.statementVisible9504 = true
+        //     let obj = {
+        //       order_id: row.id,
+        //       patient_id: row.patient_id,
+        //       record_time: this.getTimes(row.settle_accounts_date),
+        //       admin_user_id: this.$store.getters.xt_user.user.id,
+        //       balance_accounts_type: 2
+        //     }
+        //     this.orderObj9504 = obj
+        //   }
+        //
+        // } else {
+        this.statementVisible = true
+        let obj = {
+          order_id: row.id,
+          settle_type: row.settle_type,
+          start_time: row.settle_start_time,
+          end_time: row.settle_end_time
         }
+        this.orderObj = obj
 
       },
       settlementPrint(row) {
@@ -819,7 +688,7 @@
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
-          number:obj.mdtrt_id,
+          number: obj.mdtrt_id,
           name: obj.patient.name,
           age: obj.age,
           gend: obj.gend,
@@ -828,7 +697,9 @@
         this.invoiceParams = paramsObj
         this.invoiceVisible = true
       }
-    }, created() {
+    }
+    ,
+    created() {
 
       this.fetchAllAdminUsers()
       this.getDoctorList()

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -266,7 +266,7 @@
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
               } else if(obj.prescribing_number_unit == prescription.doctor_advice[b].drug.max_unit){
-                obj['retail_price'] =  prescription.doctor_advice[b].drug.max_price
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.retail_price
               } else {
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
               }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -48,7 +48,7 @@
 
                     <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;">
 
-                        <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple>
+                        <el-select style="width:100%;"  v-model="diagnose" placeholder="" multiple filterable>
                             <el-option
                                     v-for="(item,index) in diagnoses"
                                     :key="index"
@@ -127,15 +127,8 @@
                                         placeholder="选择日期">
                                 </el-date-picker>
 
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" @change="changevalue" >
-                                    <el-option
-                                            v-for="(item,index) in medical_care"
-                                            :key="index"
-                                            :label="item.label"
-                                            :value="item.value">
-                                    </el-option>
-                                </el-select>
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-else @change="changevalue" >
+
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"   @change="changevalue" >
                                     <el-option
                                             v-for="(item,index) in register"
                                             :key="index"
@@ -1305,12 +1298,9 @@
             (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
             ':' + (min < 10 ? '0' + min : min)
           this.prescriptions[i]['pre_time'] = nowTime
-          if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
 
-            this.prescriptions[i]['med_type'] = 13
-          }else{
             this.prescriptions[i]['med_type'] = 14
-          }
+
 
           this.prescriptions[i].name = '处方' + (i + 1)
           if (i == 0) {
@@ -1370,12 +1360,9 @@
           this.prescriptions[i]['pre_time'] = nowTime
 
 
-          if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
 
-            this.prescriptions[i]['med_type'] = 13
-          }else{
             this.prescriptions[i]['med_type'] = 14
-          }
+
 
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -1911,6 +1898,16 @@
         }
 
 
+        if (this.curPrescriptions.project.length == 0 && this.curPrescriptions.advices.length == 0) {
+          this.curStatus = 1
+          this.customTabIndex = 1
+          this.rightTab = 1
+          this.showOne = true
+          this.showTwo = false
+        }
+
+
+
 
         if (info.prescription_status == 0) {
           this.order_status = ''
@@ -2313,12 +2310,10 @@
 
 
         }
-        if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-          obj.med_type = 13
-        }else{
+
           obj.med_type = 14
 
-        }
+
         this.prescriptions.push(obj)
 
 
@@ -2524,33 +2519,38 @@
       },
 
       comfirm() {
-        if(this.curStatus == 1  && this.rightTab == 2){
-          for(let i = 0; i < this.curDrugs.length; i++){
-            if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
-
-              if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
-                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-                return
-              }
-
-              if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+        console.log(this.curPrescriptions.advices)
+        console.log(this.curPrescriptions.project)
+        console.log(this.curPrescriptions.advices.length)
+        console.log(this.curPrescriptions.project.length)
+
+        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+          if(this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.curDrugs.length; i++) {
+              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
 
-            }else{
-              if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
-                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-                return
-              }
-              if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+            }
+          }
+        }
+
+
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
+          if(this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.curDrugs.length; i++) {
+              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
+
             }
           }
         }
 
+
+
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -324,7 +324,7 @@
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
               } else if(obj.prescribing_number_unit == prescription.doctor_advice[b].drug.max_unit){
-                obj['retail_price'] =  prescription.doctor_advice[b].drug.max_price
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.retail_price
               } else {
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
               }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1276,6 +1276,7 @@
             this.case_history = response.data.data.case_history
             this.info = response.data.data.info
             this.last_info = response.data.data.last_info
+            this.schedule = response.data.data.schedule
 
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
@@ -1413,7 +1414,14 @@
                 var preTime = "";
 
                 if (prescription.pre_time == 0) {
-                  preTime = nowTime
+                  if(this.schedule.schedule_type == 1){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                  }else if(this.schedule.schedule_type == 2){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                  }else if(this.schedule.schedule_type == 3){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                  }
+                  // preTime = nowTime
                 } else {
                   preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                 }
@@ -1459,12 +1467,31 @@
                       id: prescription.advices[b].drug_id,
                       drug:prescription.advices[b].drug
                     };
+
+                    console.log("看看数据6：")
+                    console.log(obj.prescribing_number_unit)
+                    console.log(prescription.advices[b].drug.min_unit)
+                    console.log(prescription.advices[b].drug.max_unit)
+
+
                     if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                       obj['retail_price'] =  prescription.advices[b].drug.min_price
+                      console.log("1")
+
+                      console.log(obj.retail_price)
+
+
                     } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                      obj['retail_price'] =  prescription.advices[b].drug.max_price
+                      obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                      console.log("2")
+
+                      console.log(obj.retail_price)
+
                     } else {
+                      console.log("3")
                       obj['retail_price'] =  prescription.advices[b].drug.min_price
+                      console.log(obj.retail_price)
+
                     }
                     tempAdvice.push(obj)
                   }
@@ -1505,8 +1532,14 @@
                     tempProject.push(obj)
                   }
 
+                  if(this.schedule.schedule_type == 1){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                  }else if(this.schedule.schedule_type == 2){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                  }else if(this.schedule.schedule_type == 3){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                  }
 
-                  var preTime = nowTime
 
 
                   let index = i + 1;
@@ -1530,13 +1563,7 @@
                     obj.med_type = parseInt(prescription.med_type)
                   }
                   if(obj.med_type== 0 || obj.med_type == "") {
-                    if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                      obj.med_type = 13
-
-                    } else {
                       obj.med_type = 14
-
-                    }
                   }
                   this.prescriptions.push(obj)
                 }
@@ -1553,13 +1580,7 @@
                   med_type:"",
 
                 };
-                if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                  obj.med_type = 13
-                }else{
-                  obj.med_type = 14
-
-                }
-
+                obj.med_type = 14
                 this.prescriptions.push(obj)
 
               }
@@ -1591,6 +1612,19 @@
                 'p_type':2,
 
               };
+              var nowDate = new Date()
+              var nowYear = nowDate.getFullYear()
+              var nowMonth = nowDate.getMonth() + 1
+              var nowDay = nowDate.getDate()
+              var hours = nowDate.getHours()
+              var min = nowDate.getMinutes()
+              var nowTime =
+                nowYear +
+                '-' +
+                (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+                '-' +
+                (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
+                ':' + (min < 10 ? '0' + min : min)
               getPatientInfo(params).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
@@ -1609,6 +1643,7 @@
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
                   this.last_info = response.data.data.last_info
+                  this.schedule = response.data.data.schedule
 
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
@@ -1740,7 +1775,14 @@
                       var preTime = "";
 
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        // preTime = nowTime
+                        if(this.schedule.schedule_type == 1){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                        }else if(this.schedule.schedule_type == 3){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                       }
@@ -1786,13 +1828,34 @@
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
                           };
+                          console.log("看看数据1：")
+                          console.log(obj.prescribing_number_unit)
+                          console.log(prescription.advices[b].drug.min_unit)
+                          console.log(prescription.advices[b].drug.max_unit)
+
+
+
+
                           if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log("1")
+
+                            console.log(obj.retail_price)
+
+
                           } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                            obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                            console.log("2")
+
+                            console.log(obj.retail_price)
+
                           } else {
+                            console.log("3")
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log(obj.retail_price)
+
                           }
+
                           tempAdvice.push(obj)
                         }
 
@@ -1833,8 +1896,15 @@
                         }
 
 
-                        var preTime = nowTime
-
+                        // var preTime = nowTime
+                        var preTime = ''
+                        if(this.schedule.schedule_type == 1){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                        }else if(this.schedule.schedule_type == 3){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                        }
 
                         let index = i + 1;
                         let obj = {
@@ -1857,19 +1927,15 @@
                           obj.med_type = parseInt(prescription.med_type)
                         }
                         if(obj.med_type== 0 || obj.med_type == "") {
-                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                            obj.med_type = 13
 
-                          } else {
                             obj.med_type = 14
 
-                          }
+
                         }
                         this.prescriptions.push(obj)
                       }
 
                     }else{
-
                       let obj = {
                         id: 0,
                         name: '处方' + 1,
@@ -1881,12 +1947,9 @@
                         med_type:"",
 
                       };
-                      if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                        obj.med_type = 13
-                      }else{
+
                         obj.med_type = 14
 
-                      }
                       this.prescriptions.push(obj)
 
 
@@ -2219,12 +2282,28 @@
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
                           };
+                          console.log("看看数据2：")
+                          console.log(obj.prescribing_number_unit)
+                          console.log(prescription.advices[b].drug.min_unit)
+                          console.log(prescription.advices[b].drug.max_unit)
                           if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log("1")
+
+                            console.log(obj.retail_price)
+
+
                           } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                            obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                            console.log("2")
+
+                            console.log(obj.retail_price)
+
                           } else {
+                            console.log("3")
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log(obj.retail_price)
+
                           }
                           tempAdvice.push(obj)
                         }
@@ -2290,13 +2369,7 @@
                           obj.med_type = parseInt(prescription.med_type)
                         }
                         if(obj.med_type== 0 || obj.med_type == "") {
-                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                            obj.med_type = 13
-
-                          } else {
                             obj.med_type = 14
-
-                          }
                         }
                         this.prescriptions.push(obj)
                       }
@@ -2313,12 +2386,9 @@
                         med_type: "",
 
                       };
-                      if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                        obj.med_type = 13
-                      }else{
+
                         obj.med_type = 14
 
-                      }
                       this.prescriptions.push(obj)
 
                       // if(response.data.data.count <= 1 ){
@@ -2650,12 +2720,28 @@
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
                           };
+                          console.log("看看数据3：")
+                          console.log(obj.prescribing_number_unit)
+                          console.log(prescription.advices[b].drug.min_unit)
+                          console.log(prescription.advices[b].drug.max_unit)
                           if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log("1")
+
+                            console.log(obj.retail_price)
+
+
                           } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                            obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                            console.log("2")
+
+                            console.log(obj.retail_price)
+
                           } else {
+                            console.log("3")
                             obj['retail_price'] =  prescription.advices[b].drug.min_price
+                            console.log(obj.retail_price)
+
                           }
                           tempAdvice.push(obj)
                         }
@@ -2721,13 +2807,8 @@
                           obj.med_type = parseInt(prescription.med_type)
                         }
                         if(obj.med_type== 0 || obj.med_type == "") {
-                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                            obj.med_type = 13
-
-                          } else {
                             obj.med_type = 14
 
-                          }
                         }
                         this.prescriptions.push(obj)
                       }
@@ -2744,12 +2825,10 @@
                         med_type: "",
 
                       };
-                      if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                        obj.med_type = 13
-                      }else{
+
                         obj.med_type = 14
 
-                      }
+
                       this.prescriptions.push(obj)
 
                       // if(response.data.data.count <= 1 ){
@@ -2875,8 +2954,7 @@
               });
             this.$refs.child.watchSign = 0
           }
-        }
-        else{
+        }else{
         var nowDate = new Date();
         var nowYear = nowDate.getFullYear();
         var nowMonth = nowDate.getMonth() + 1;
@@ -2959,6 +3037,7 @@
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
                 this.department = response.data.data.department
+                this.schedule = response.data.data.schedule
 
                 for (let i = 0; i < this.doctors.length; i++) {
                   if (this.doctors[i].user_type == 1) {
@@ -3091,7 +3170,14 @@
                     var preTime = "";
 
                     if (prescription.pre_time == 0) {
-                      preTime = nowTime
+                      // preTime = nowTime
+                      if(this.schedule.schedule_type == 1){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                      }else if(this.schedule.schedule_type == 3){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                     }
@@ -3137,12 +3223,28 @@
                           id: prescription.advices[b].drug_id,
                           drug:prescription.advices[b].drug
                         };
+                        console.log("看看数据4：")
+                        console.log(obj.prescribing_number_unit)
+                        console.log(prescription.advices[b].drug.min_unit)
+                        console.log(prescription.advices[b].drug.max_unit)
                         if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                           obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          console.log("1")
+
+                          console.log(obj.retail_price)
+
+
                         } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                          obj['retail_price'] =  prescription.advices[b].drug.max_price
+                          obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                          console.log("2")
+
+                          console.log(obj.retail_price)
+
                         } else {
+                          console.log("3")
                           obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          console.log(obj.retail_price)
+
                         }
                         tempAdvice.push(obj)
                       }
@@ -3184,7 +3286,15 @@
                       }
 
 
-                      var preTime = nowTime
+                      // var preTime = nowTime
+                      var preTime = ''
+                      if(this.schedule.schedule_type == 1){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                      }else if(this.schedule.schedule_type == 3){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                      }
 
 
                       let index = i + 1;
@@ -3208,19 +3318,14 @@
                         obj.med_type = parseInt(prescription.med_type)
                       }
                       if(obj.med_type== 0 || obj.med_type == "") {
-                        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                          obj.med_type = 13
 
-                        } else {
                           obj.med_type = 14
 
                         }
-                      }
                       this.prescriptions.push(obj)
                     }
 
                   }else{
-
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -3232,12 +3337,10 @@
                       med_type: "",
 
                     };
-                    if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                      obj.med_type = 13
-                    }else{
+
                       obj.med_type = 14
 
-                    }
+
                     this.prescriptions.push(obj)
 
                     // if(response.data.data.count <= 1 ){
@@ -3392,7 +3495,7 @@
               this.case_history = response.data.data.case_history
               this.info = response.data.data.info
               this.last_info = response.data.data.last_info
-
+              this.schedule = response.data.data.schedule
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
 
@@ -3522,8 +3625,16 @@
 
                   var preTime = "";
 
+
                   if (prescription.pre_time == 0) {
-                    preTime = nowTime
+                    // preTime = nowTime
+                    if(this.schedule.schedule_type == 1){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                    }else if(this.schedule.schedule_type == 3){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                   }
@@ -3569,12 +3680,28 @@
                         id: prescription.advices[b].drug_id,
                         drug:prescription.advices[b].drug
                       };
+                      console.log("看看数据5：")
+                      console.log(obj.prescribing_number_unit)
+                      console.log(prescription.advices[b].drug.min_unit)
+                      console.log(prescription.advices[b].drug.max_unit)
                       if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
                         obj['retail_price'] =  prescription.advices[b].drug.min_price
+                        console.log("1")
+
+                        console.log(obj.retail_price)
+
+
                       } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
-                        obj['retail_price'] =  prescription.advices[b].drug.max_price
+                        obj['retail_price'] =  prescription.advices[b].drug.retail_price
+                        console.log("2")
+
+                        console.log(obj.retail_price)
+
                       } else {
+                        console.log("3")
                         obj['retail_price'] =  prescription.advices[b].drug.min_price
+                        console.log(obj.retail_price)
+
                       }
                       tempAdvice.push(obj)
                     }
@@ -3616,7 +3743,15 @@
                     }
 
 
-                    var preTime = nowTime
+                    // var preTime = nowTime
+                    var preTime = ''
+                    if(this.schedule.schedule_type == 1){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                    }else if(this.schedule.schedule_type == 3){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                    }
 
 
                     let index = i + 1;
@@ -3640,13 +3775,8 @@
                       obj.med_type = parseInt(prescription.med_type)
                     }
                     if(obj.med_type== 0 || obj.med_type == "") {
-                      if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-                        obj.med_type = 13
-
-                      } else {
                         obj.med_type = 14
 
-                      }
                     }
                     this.prescriptions.push(obj)
                   }
@@ -3664,12 +3794,9 @@
 
 
                   };
-                  if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                    obj.med_type = 13
-                  }else{
+
                     obj.med_type = 14
 
-                  }
                   this.prescriptions.push(obj)
 
                   // if(response.data.data.count <= 1 ){

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -210,7 +210,7 @@
           this.$message.error('请选择病人')
           return
         }
-        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + 0 + '&patient_id=' + this.patient_id)
+        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + 0 + '&patient_id=' + this.patient_id+ '&patient_name=' + this.patient_name)
 
       }
     },

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -3,8 +3,8 @@
 
         <div style="height: calc(100% - 0px);display: flex;flex-direction: column;">
             <div style="display:flex;justify-content: space-between;align-items:center;margin:10px 0;padding:0 10px;color:#606266;">
-              <div style="font-size:14px;">姓名：{{ $route.query.patient_name }}</div>
-              <el-button size="small" @click="save" type="primary">保存</el-button>
+                <div style="font-size:14px;">姓名：{{ $route.query.patient_name }}</div>
+                <el-button size="small" @click="save" type="primary">保存</el-button>
             </div>
 
             <div class="mainCenter" style="padding:0 10px;" v-loading="loading">
@@ -38,15 +38,16 @@
                                     :name="item.name"
                             >
 
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" @change="changevalue" >
-                                    <el-option
-                                            v-for="(item,index) in medical_care"
-                                            :key="index"
-                                            :label="item.label"
-                                            :value="item.value">
-                                    </el-option>
-                                </el-select>
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-else @change="changevalue" >
+                                <!--<el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" @change="changevalue" >-->
+                                <!--<el-option-->
+                                <!--v-for="(item,index) in medical_care"-->
+                                <!--:key="index"-->
+                                <!--:label="item.label"-->
+                                <!--:value="item.value">-->
+                                <!--</el-option>-->
+                                <!--</el-select>-->
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                                           @change="changevalue">
                                     <el-option
                                             v-for="(item,index) in register"
                                             :key="index"
@@ -131,74 +132,74 @@
                             </el-tabs>
                         </div>
                         <div style="height:100%;" v-show="showTwo">
-                        <div style="height:100%;" v-show="showTwo">
-                            <el-tabs class="rightTabs" v-model="activeName">
-                                <el-tab-pane label="项目列表" name="1">
-                                    <div style="margin-bottom:5px;">
-                                        <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
-                                        <el-input style="width:50%;" @input="searchProjectAction"
-                                                  @keyup.enter.native='searchProjectAction'
-                                                  v-model.trim="search_project_keyword"
-                                                  placeholder="请输入项目名称"></el-input>
-                                        <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
-                                                   @change="changeClass">
-                                            <el-option
-                                                    label="全部"
-                                                    value="0">
-                                            </el-option>
-                                            <el-option
-                                                    v-for="(item, index) in getDictionaryDataConfig('system','cost_classify')"
-                                                    :key="index"
-                                                    :label="item.name"
-                                                    :value="item.id">
-                                            </el-option>
-                                        </el-select>
-                                    </div>
-                                    <div style="width: 100%;flex:1;overflow-y: auto;">
-                                        <el-table ref="tables"
-                                                  :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
-                                                  :data="tabProject" border @select='selectChange'
-                                                  :row-style="{ color: '#303133' }"
-                                                  @select-all="changeAllGoodInfoTableDataTwo"
-                                                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                                                  highlight-current-row>
-                                            <el-table-column type="selection" width="40"
-                                                             align="center"></el-table-column>
-                                            <el-table-column prop="name" label="名称">
-                                                <template slot-scope="scope">{{ scope.row.project_name }}</template>
-                                            </el-table-column>
-                                            <el-table-column label="规格" width="60">
-                                                <template slot-scope="scope">{{ scope.row.single_dose }}</template>
-                                            </el-table-column>
-                                            <el-table-column label="单价" width="40">
-                                                <template slot-scope="scope">{{ scope.row.price }}</template>
-                                            </el-table-column>
-                                        </el-table>
-                                    </div>
-                                </el-tab-pane>
-                                <el-tab-pane label="项目组套" name="2">
-                                    <div style="width: 100%;flex:1;overflow-y: auto;">
-                                        <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
-                                                  :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
-                                                  :row-style="{ color: '#303133' }"
-                                                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                                                  highlight-current-row
-                                                  @select='selectTeam'>
-                                            <el-table-column type="selection" width="40"
-                                                             align="center"></el-table-column>
-                                            <el-table-column prop="name" label="名称">
-                                                <template slot-scope="scope">{{scope.row.project_team}}</template>
-                                            </el-table-column>
-                                        </el-table>
-                                    </div>
-                                </el-tab-pane>
-                            </el-tabs>
-                        </div>
+                            <div style="height:100%;" v-show="showTwo">
+                                <el-tabs class="rightTabs" v-model="activeName">
+                                    <el-tab-pane label="项目列表" name="1">
+                                        <div style="margin-bottom:5px;">
+                                            <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
+                                            <el-input style="width:50%;" @input="searchProjectAction"
+                                                      @keyup.enter.native='searchProjectAction'
+                                                      v-model.trim="search_project_keyword"
+                                                      placeholder="请输入项目名称"></el-input>
+                                            <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
+                                                       @change="changeClass">
+                                                <el-option
+                                                        label="全部"
+                                                        value="0">
+                                                </el-option>
+                                                <el-option
+                                                        v-for="(item, index) in getDictionaryDataConfig('system','cost_classify')"
+                                                        :key="index"
+                                                        :label="item.name"
+                                                        :value="item.id">
+                                                </el-option>
+                                            </el-select>
+                                        </div>
+                                        <div style="width: 100%;flex:1;overflow-y: auto;">
+                                            <el-table ref="tables"
+                                                      :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
+                                                      :data="tabProject" border @select='selectChange'
+                                                      :row-style="{ color: '#303133' }"
+                                                      @select-all="changeAllGoodInfoTableDataTwo"
+                                                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                                      highlight-current-row>
+                                                <el-table-column type="selection" width="40"
+                                                                 align="center"></el-table-column>
+                                                <el-table-column prop="name" label="名称">
+                                                    <template slot-scope="scope">{{ scope.row.project_name }}</template>
+                                                </el-table-column>
+                                                <el-table-column label="规格" width="60">
+                                                    <template slot-scope="scope">{{ scope.row.single_dose }}</template>
+                                                </el-table-column>
+                                                <el-table-column label="单价" width="40">
+                                                    <template slot-scope="scope">{{ scope.row.price }}</template>
+                                                </el-table-column>
+                                            </el-table>
+                                        </div>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="项目组套" name="2">
+                                        <div style="width: 100%;flex:1;overflow-y: auto;">
+                                            <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
+                                                      :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
+                                                      :row-style="{ color: '#303133' }"
+                                                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                                      highlight-current-row
+                                                      @select='selectTeam'>
+                                                <el-table-column type="selection" width="40"
+                                                                 align="center"></el-table-column>
+                                                <el-table-column prop="name" label="名称">
+                                                    <template slot-scope="scope">{{scope.row.project_team}}</template>
+                                                </el-table-column>
+                                            </el-table>
+                                        </div>
+                                    </el-tab-pane>
+                                </el-tabs>
+                            </div>
                         </div>
                     </el-tabs>
 
 
-                <template>
+                    <template>
 
 
                         <div class="comfirmBox">
@@ -290,7 +291,7 @@
         crumbs: [
           { path: false, name: '门诊医生站' },
           { path: false, name: '处方模版' },
-          { path: false, name: '模版详情' },
+          { path: false, name: '模版详情' }
         ],
         tempForm: {
           name: '',
@@ -394,6 +395,7 @@
         }
 
         for (let i = 0; i < this.prescriptions.length; i++) {
+          console.log(this.prescriptions[i].med_type)
           if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
             this.$message.error('处方医疗类型不能为空')
             return
@@ -409,6 +411,9 @@
         }
 
         for (let i = 0; i < this.prescriptions.length; i++) {
+
+          this.prescriptions[i].med_type = parseInt(this.prescriptions[i].med_type)
+
           if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
             this.prescriptions[i]['type'] = 1
           }
@@ -436,7 +441,7 @@
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
-          }else{
+          } else {
             this.$message.error(response.data.msg)
           }
         })
@@ -545,7 +550,7 @@
         } else {
           let arr = []
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
           }
@@ -1042,7 +1047,8 @@
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        this.prescriptions.push({
+
+        let obj = {
           id: 0,
           name: newTabName,
           order_status: 0,
@@ -1050,9 +1056,19 @@
           project: [],
           addition: [],
           pre_time: this.prescriptions[0].pre_time
+
           // pre_time: nowTime
 
-        })
+        }
+
+
+
+          obj.med_type = 14
+
+
+
+        this.prescriptions.push(obj)
+
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
         this.curStatus = 0
@@ -1263,40 +1279,29 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
-        if(this.curStatus == 1  && this.rightTab == 2){
-          for(let i = 0; i < this.curDrugs.length; i++){
-            if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
-
-              if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
-                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-                return
-              }
-
-              if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.curDrugs.length; i++) {
+              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
 
+            }
+          }
+        }
 
-            }else{
-
-              if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
-                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-                return
-              }
-
-              if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.curDrugs.length; i++) {
+              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
 
-
-
             }
-
           }
         }
-
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')
           this.teamList = []
@@ -1397,12 +1402,12 @@
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
                   execution_frequency: temp[b].execution_frequency,
-                  retail_price: temp[b].retail_price.toString(),
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
                   remark: '',
                   day: 1,
                   prescribing_number: temp[b].prescribing_number,
-                  single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].max_unit,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b]
                 }
@@ -1510,7 +1515,7 @@
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
-                    drug: prescription.advices[b].drug,
+                    drug: prescription.advices[b].drug
                   }
                   tempAdvice.push(obj)
                 }
@@ -1556,26 +1561,22 @@
                   advices: tempAdvice,
                   project: tempProject,
                   addition: tempAddition,
-                  order_status: 1,
+                  order_status: 1
                   // pre_time: preTime
                 }
 
-                if(prescription.med_type == "" || prescription.med_type == 0){
+                if (prescription.med_type == '' || prescription.med_type == 0) {
 
-                  obj['med_type'] = ""
-                }else{
+                  obj['med_type'] = ''
+                } else {
 
                   obj['med_type'] = parseInt(prescription.med_type)
 
                 }
 
-
                 this.prescriptions.push(obj)
               }
-              if (this.prescriptions.length > 0) {
-                this.curPrescriptions = this.prescriptions[0]
-                console.log(  this.curPrescriptions)
-              }
+              this.curPrescriptions = this.prescriptions[0]
 
             } else {
               let obj = {
@@ -1585,8 +1586,14 @@
                 project: [],
                 addition: [],
                 order_status: 0,
-                med_type:'',
+                med_type: ''
               }
+
+
+                obj.med_type = 14
+
+
+
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
@@ -1673,7 +1680,7 @@
           }
         })
       },
-      changevalue(val){
+      changevalue(val) {
 
         this.$forceUpdate()
 

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -3,232 +3,232 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138"
-             class="app-container">
-            <div class="cell clearfix">
-                <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
-                <el-autocomplete
-                        style="margin:16px 5px"
-                        popper-class="my-autocomplete"
-                        v-model.trim="search_input"
-                        :fetch-suggestions="querySearchAsync"
-                        :trigger-on-focus="false"
-                        placeholder="病人名字或者透析号"
-                        @select="handleSelect"
-                >
-                    <i class="el-icon-search el-input__icon" slot="suffix"> </i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.name }}</div>
-                    </template>
-                </el-autocomplete>
-                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
-                           @click="searchAction">搜索
-                </el-button>
-                <!-- <el-date-picker
-                v-model="value1"
-                @change="changeTime"
-                style="margin-right:10px;"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-                </el-date-picker> -->
-                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                placeholder="选择时间" v-model="start_time" style="width:200px"
-                                @change="changeStart"
-                >
-                </el-date-picker>
-                -
-                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                placeholder="选择时间" v-model="end_time" style="width:200px"
-                                @change="changeEnd"
-                >
-                </el-date-picker>
-                <label class="title"><span class="name">挂号类型</span> : </label>
-                <el-select v-model="register_type" placeholder="请选择" style="width:150px;" @change="changeRegister">
-                    <el-option
-                            v-for="item in register"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                      highlight-current-row>
-                <el-table-column align="center" type="index" label="序号" width="60">
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="时间" width="100">
-                    <template slot-scope="scope">{{getTime(scope.row.ctime,'{y}-{m}-{d} {h}:{i}:{s}')}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
-                    <template slot-scope="scope">{{scope.row.name }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="科室" width="80">
-                    <template slot-scope="scope">{{getDepartMent(scope.row.departments)}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="挂号类型" width="90">
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.register_type == 1">普通</span>
-                        <span v-if="scope.row.register_type == 2">主治</span>
-                        <span v-if="scope.row.register_type == 3">主任</span>
-                        <span v-if="scope.row.register_type == 4">免收诊金</span>
-                        <span v-if="scope.row.register_type == 5">专家</span>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="就诊号" width="80">
-                    <template slot-scope="scope">
-                        {{scope.row.number}}
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="证件号" width='180'>
-                    <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
-                </el-table-column>
-                <el-table-column align="center" label="社保类型">
-                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="挂号费" width="70">
-                    <template slot-scope="scope">{{ scope.row.register_cost }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="诊疗费" width="70">
-                    <template slot-scope="scope">{{ scope.row.treatment_cost }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="工本费" width="70">
-                    <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="结算类型" width="70">
-                    <template slot-scope="scope">{{getBanlance(scope.row.balance_accounts_type) }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="操作人" width="70">
-                    <template slot-scope="scope">{{creator}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="操作" width="180">
-                    <template slot-scope="scope">
-                        <!--<el-button size="mini" type="primary" v-if=" scope.row.record_date < startUnix" :disabled="true">已过号</el-button>-->
-                        <el-button size="mini" type="primary" v-if="scope.row.status == 1"
-                                   @click="toReturnSZPatient(scope.row)">退号
-                        </el-button>
-                        <el-button size="mini" type="primary" :disabled="true" v-if="scope.row.status == 0">已退号
-                        </el-button>
-
-                        <!--<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>-->
-                        <!--<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>-->
-                        <!--<el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>-->
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <el-pagination
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :page-sizes="[10, 50, 100]"
-                    :page-size="10"
-                    background
-                    style="margin-top:20px;float: right"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="total"
-            >
-            </el-pagination>
-            <el-dialog
-                    title="挂号历史详情"
-                    :visible.sync="dialogVisible"
-                    width="1100px"
-                    :before-close="handleClose">
-                <div>
-                    <div class="formMain">
-                        <el-form class="basicForm" :model="form" ref="form" label-width="130px">
-                            <el-form-item label="患者姓名：" prop="name">
-                                <div>{{ form.name }}</div>
-                            </el-form-item>
-
-                            <el-form-item label="性别：" prop="gender">
-                                <div v-if="form.gender == 1">男</div>
-                                <div v-if="form.gender == 2">女</div>
-                            </el-form-item>
-
-                            <el-form-item label="年龄：" prop="age">
-                                <div>{{ form.age }}</div>
-                            </el-form-item>
-
-
-                            <el-form-item label="出生日期：" prop="birthday">
-                                <div>{{ getTime(form.birthday,'{y}-{m}-{d}') }}</div>
-                            </el-form-item>
-
-                            <el-form-item label="手机号码：" prop="phone">
-                                <div>{{ form.phone }}</div>
-                            </el-form-item>
-
-
-                            <el-form-item label="医疗类别：">
-                                <div>{{ getDictionaryDataConfig(form.medical_treatment_type) }}</div>
-                            </el-form-item>
-
-
-                            <el-form-item label="证件类型：">
-                                <div>{{ getCertificates(form.id_type) }}</div>
-                            </el-form-item>
-
-                            <el-form-item label="证件号码：" prop="idCard">
-                                {{ form.id_card_no }}
-                            </el-form-item>
-
-
-                            <el-form-item label="结算类型：">
-                                {{ getSettlement(form.balance_accounts_type) }}
-                            </el-form-item>
-
-
-                            <el-form-item label="社保类型：">
-                                <div>{{ getMedicalCare(form.social_type) }}</div>
-                            </el-form-item>
-                            <el-form-item class="specialFormItem" style="width:66.5%;" label="医保卡号：">
-                                <div>{{ form.medical_insurance_number }}</div>
-                            </el-form-item>
-                            <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
-                                <div>{{ getRegister(form.register_type) }}</div>
-                            </el-form-item>
-                            <el-form-item label="医生：" prop="doctor" :validate-event="is_Name">
-                                <div>{{ getDoctor(form.doctor) }}</div>
-                            </el-form-item>
-                            <el-form-item label="科室：" prop="department" :validate-event="is_Name">
-                                <div>{{ getDepartMent(form.departments) }}</div>
-                            </el-form-item>
-                            <!-- <el-form-item label="是否需要工本费：">
-                              <div v-if="form.is_need_cost_of_production == 1">是</div>
-                              <div v-else>否</div>
-                            </el-form-item> -->
-
-                            <el-form-item label="挂号费：">
-                                <div>{{ form.register_cost }}</div>
-                            </el-form-item>
-                            <el-form-item label="诊疗费：">
-                                <div>{{ form.treatment_cost }}</div>
-                            </el-form-item>
-                            <el-form-item label="工本费：">
-                                <div>{{ form.cost_of_production }}</div>
-                            </el-form-item>
-                            <el-form-item label="合计：">
-                                <div>{{ form.total }}</div>
-                            </el-form-item>
-                            <el-form-item>
-                                <!-- <el-input v-model="form.name"></el-input> -->
-                            </el-form-item>
-                        </el-form>
-                    </div>
-                </div>
-                <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>
-
-        <div v-else class="app-container">
+        <!--<div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138"-->
+             <!--class="app-container">-->
+            <!--<div class="cell clearfix">-->
+                <!--&lt;!&ndash; <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> &ndash;&gt;-->
+                <!--<el-autocomplete-->
+                        <!--style="margin:16px 5px"-->
+                        <!--popper-class="my-autocomplete"-->
+                        <!--v-model.trim="search_input"-->
+                        <!--:fetch-suggestions="querySearchAsync"-->
+                        <!--:trigger-on-focus="false"-->
+                        <!--placeholder="病人名字或者透析号"-->
+                        <!--@select="handleSelect"-->
+                <!--&gt;-->
+                    <!--<i class="el-icon-search el-input__icon" slot="suffix"> </i>-->
+                    <!--<template slot-scope="{ item }">-->
+                        <!--<div class="name">{{ item.name }}</div>-->
+                    <!--</template>-->
+                <!--</el-autocomplete>-->
+                <!--<el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"-->
+                           <!--@click="searchAction">搜索-->
+                <!--</el-button>-->
+                <!--&lt;!&ndash; <el-date-picker-->
+                <!--v-model="value1"-->
+                <!--@change="changeTime"-->
+                <!--style="margin-right:10px;"-->
+                <!--type="daterange"-->
+                <!--range-separator="-"-->
+                <!--start-placeholder="开始日期"-->
+                <!--end-placeholder="结束日期">-->
+                <!--</el-date-picker> &ndash;&gt;-->
+                <!--<el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"-->
+                                <!--placeholder="选择时间" v-model="start_time" style="width:200px"-->
+                                <!--@change="changeStart"-->
+                <!--&gt;-->
+                <!--</el-date-picker>-->
+                <!-- - -->
+                <!--<el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"-->
+                                <!--placeholder="选择时间" v-model="end_time" style="width:200px"-->
+                                <!--@change="changeEnd"-->
+                <!--&gt;-->
+                <!--</el-date-picker>-->
+                <!--<label class="title"><span class="name">挂号类型</span> : </label>-->
+                <!--<el-select v-model="register_type" placeholder="请选择" style="width:150px;" @change="changeRegister">-->
+                    <!--<el-option-->
+                            <!--v-for="item in register"-->
+                            <!--:key="item.value"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</div>-->
+            <!--<el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"-->
+                      <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
+                      <!--highlight-current-row>-->
+                <!--<el-table-column align="center" type="index" label="序号" width="60">-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="时间" width="100">-->
+                    <!--<template slot-scope="scope">{{getTime(scope.row.ctime,'{y}-{m}-{d} {h}:{i}:{s}')}}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="dialysis_no" label="姓名" width="80">-->
+                    <!--<template slot-scope="scope">{{scope.row.name }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="科室" width="80">-->
+                    <!--<template slot-scope="scope">{{getDepartMent(scope.row.departments)}}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="挂号类型" width="90">-->
+                    <!--<template slot-scope="scope">-->
+                        <!--<span v-if="scope.row.register_type == 1">普通</span>-->
+                        <!--<span v-if="scope.row.register_type == 2">主治</span>-->
+                        <!--<span v-if="scope.row.register_type == 3">主任</span>-->
+                        <!--<span v-if="scope.row.register_type == 4">免收诊金</span>-->
+                        <!--<span v-if="scope.row.register_type == 5">专家</span>-->
+                    <!--</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="就诊号" width="80">-->
+                    <!--<template slot-scope="scope">-->
+                        <!--{{scope.row.number}}-->
+                    <!--</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="证件号" width='180'>-->
+                    <!--<template slot-scope="scope">{{ scope.row.id_card_no }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" label="社保类型">-->
+                    <!--<template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="医生" width="80">-->
+                    <!--<template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="挂号费" width="70">-->
+                    <!--<template slot-scope="scope">{{ scope.row.register_cost }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="诊疗费" width="70">-->
+                    <!--<template slot-scope="scope">{{ scope.row.treatment_cost }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="工本费" width="70">-->
+                    <!--<template slot-scope="scope">{{ scope.row.cost_of_production }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="结算类型" width="70">-->
+                    <!--<template slot-scope="scope">{{getBanlance(scope.row.balance_accounts_type) }}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="操作人" width="70">-->
+                    <!--<template slot-scope="scope">{{creator}}</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column align="center" prop="name" label="操作" width="180">-->
+                    <!--<template slot-scope="scope">-->
+                        <!--&lt;!&ndash;<el-button size="mini" type="primary" v-if=" scope.row.record_date < startUnix" :disabled="true">已过号</el-button>&ndash;&gt;-->
+                        <!--<el-button size="mini" type="primary" v-if="scope.row.status == 1"-->
+                                   <!--@click="toReturnSZPatient(scope.row)">退号-->
+                        <!--</el-button>-->
+                        <!--<el-button size="mini" type="primary" :disabled="true" v-if="scope.row.status == 0">已退号-->
+                        <!--</el-button>-->
+
+                        <!--&lt;!&ndash;<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>&ndash;&gt;-->
+                    <!--</template>-->
+                <!--</el-table-column>-->
+            <!--</el-table>-->
+
+            <!--<el-pagination-->
+                    <!--@size-change="handleSizeChange"-->
+                    <!--@current-change="handleCurrentChange"-->
+                    <!--:page-sizes="[10, 50, 100]"-->
+                    <!--:page-size="10"-->
+                    <!--background-->
+                    <!--style="margin-top:20px;float: right"-->
+                    <!--layout="total, sizes, prev, pager, next, jumper"-->
+                    <!--:total="total"-->
+            <!--&gt;-->
+            <!--</el-pagination>-->
+            <!--<el-dialog-->
+                    <!--title="挂号历史详情"-->
+                    <!--:visible.sync="dialogVisible"-->
+                    <!--width="1100px"-->
+                    <!--:before-close="handleClose">-->
+                <!--<div>-->
+                    <!--<div class="formMain">-->
+                        <!--<el-form class="basicForm" :model="form" ref="form" label-width="130px">-->
+                            <!--<el-form-item label="患者姓名：" prop="name">-->
+                                <!--<div>{{ form.name }}</div>-->
+                            <!--</el-form-item>-->
+
+                            <!--<el-form-item label="性别：" prop="gender">-->
+                                <!--<div v-if="form.gender == 1">男</div>-->
+                                <!--<div v-if="form.gender == 2">女</div>-->
+                            <!--</el-form-item>-->
+
+                            <!--<el-form-item label="年龄：" prop="age">-->
+                                <!--<div>{{ form.age }}</div>-->
+                            <!--</el-form-item>-->
+
+
+                            <!--<el-form-item label="出生日期：" prop="birthday">-->
+                                <!--<div>{{ getTime(form.birthday,'{y}-{m}-{d}') }}</div>-->
+                            <!--</el-form-item>-->
+
+                            <!--<el-form-item label="手机号码：" prop="phone">-->
+                                <!--<div>{{ form.phone }}</div>-->
+                            <!--</el-form-item>-->
+
+
+                            <!--<el-form-item label="医疗类别：">-->
+                                <!--<div>{{ getDictionaryDataConfig(form.medical_treatment_type) }}</div>-->
+                            <!--</el-form-item>-->
+
+
+                            <!--<el-form-item label="证件类型：">-->
+                                <!--<div>{{ getCertificates(form.id_type) }}</div>-->
+                            <!--</el-form-item>-->
+
+                            <!--<el-form-item label="证件号码：" prop="idCard">-->
+                                <!--{{ form.id_card_no }}-->
+                            <!--</el-form-item>-->
+
+
+                            <!--<el-form-item label="结算类型：">-->
+                                <!--{{ getSettlement(form.balance_accounts_type) }}-->
+                            <!--</el-form-item>-->
+
+
+                            <!--<el-form-item label="社保类型：">-->
+                                <!--<div>{{ getMedicalCare(form.social_type) }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item class="specialFormItem" style="width:66.5%;" label="医保卡号：">-->
+                                <!--<div>{{ form.medical_insurance_number }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">-->
+                                <!--<div>{{ getRegister(form.register_type) }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="医生：" prop="doctor" :validate-event="is_Name">-->
+                                <!--<div>{{ getDoctor(form.doctor) }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="科室：" prop="department" :validate-event="is_Name">-->
+                                <!--<div>{{ getDepartMent(form.departments) }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--&lt;!&ndash; <el-form-item label="是否需要工本费：">-->
+                              <!--<div v-if="form.is_need_cost_of_production == 1">是</div>-->
+                              <!--<div v-else>否</div>-->
+                            <!--</el-form-item> &ndash;&gt;-->
+
+                            <!--<el-form-item label="挂号费：">-->
+                                <!--<div>{{ form.register_cost }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="诊疗费：">-->
+                                <!--<div>{{ form.treatment_cost }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="工本费：">-->
+                                <!--<div>{{ form.cost_of_production }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item label="合计：">-->
+                                <!--<div>{{ form.total }}</div>-->
+                            <!--</el-form-item>-->
+                            <!--<el-form-item>-->
+                                <!--&lt;!&ndash; <el-input v-model="form.name"></el-input> &ndash;&gt;-->
+                            <!--</el-form-item>-->
+                        <!--</el-form>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--<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>-->
+
+        <div ]class="app-container">
             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -580,7 +580,7 @@ export default {
             } else {
              var msg =  response.data.data.msg
              if (msg == 1){
-                this.$message.error("该耗材无出库记录")
+                this.$message.error("无出库记录")
                 return
              }
              if(msg == 2){

src/xt_pages/stock/detail/print.vue

@@ -42,10 +42,12 @@
                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.good_name}}</span>
+                <!-- <span>{{item.GoodInfo.good_name}}</span> -->
+                {{item.good_name}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.specification_name}}</span>
+                <!-- <span>{{item.GoodInfo.specification_name}}</span> -->
+                {{item.specification_name}}
               </td>
              
               <td style="line-height: 50px">
@@ -54,16 +56,17 @@
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.packing_unit}}</span>
+                <!-- <span>{{item.GoodInfo.packing_unit}}</span> -->
+                {{item.packing_unit}}
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> {{ item.price }}</span>
+                <span v-if="type == 2"> {{ item.packing_price }}</span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
-                <span v-if="type == 2">{{(item.count * item.price).toFixed(2)}}</span>
+                <span v-if="type == 2">{{(item.count * item.packing_price).toFixed(2)}}</span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">
@@ -420,7 +423,8 @@
       getGoodDetailPrintList(this.queryParams).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list",list)
+           console.log("新的",list)
+           this.stockDatas = list
            
          }
       })
@@ -431,7 +435,6 @@
         if(response.data.state == 1){
           var total =   response.data.data.total
           var list = response.data.data.list
-          console.log("list2323223",list)
           this.stockDatas = list
         }
       })
@@ -446,7 +449,7 @@
      getWareOutTotal(){
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
-         total+= this.stockDatas[i].count * this.stockDatas[i].price
+         total+= this.stockDatas[i].count * this.stockDatas[i].packing_price
        }
        return total
      }
@@ -457,8 +460,8 @@
       this.goodUnit = this.$store.getters.good_unit
 
       // this.getDialysisRecord()
-      // this.getGoodDetailPrintList()
-      this.getStockDetail()
+      this.getGoodDetailPrintList()
+      // this.getStockDetail()
     }
 
   }

src/xt_pages/stock/detail/stockInDetail.vue

@@ -202,7 +202,7 @@ import {
   GetAllConfig,
   getStockDetail,
   getPrintStockGood,
-  
+  getGoodDetailPrintList
 } from "@/api/stock";
 
 export default {
@@ -237,6 +237,7 @@ export default {
     // this.getPrintStockGood()
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     console.log("机构ID",this.org_id)
+    this.getGoodDetailPrintList()
   },
   data() {
     return {
@@ -742,82 +743,21 @@ export default {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
       },
-      
-      // exportList(){
-      //   var obj = {index:"合计",total:0}
-      //   obj.total = this.calTotalPrice()
-     
-      //   for(let i=0;i<this.tableList.length;i++){
-      //     this.tableList[i].index = i+1
-      //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-      //     this.tableList[i].count = this.calCount(this.tableList[i])
-      //     this.tableList[i].total = this.calTotal(this.tableList[i])
-      //     this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
-      //     this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
-      //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
-      //   }
-      //   console.log("总共条数555",this.tableList)
-         
-      //   if(this.org_id == 10024){
-      //     var arr = this.uniqueOne(this.tableList)
-      //     this.tableList = arr
-      //     this.tableList.push(obj)
-      //     console.log("去重后条数",this.tableList)
-        
-      //     import('@/vendor/Export2Excel').then(excel => {
-      //     const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-      //     const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
-          
-      //     const data = this.formatJson(filterVal, this.tableList)
-
-      //     console.log("data222222222",data)
-      //       excel.export_json_to_excel({
-      //         header: tHeader,
-      //         data,
-      //         filename: '耗材入库明细'
-      //       })
-      //         this.downloadLoading = false
-      //       })
-      //   }
-      //   if(this.org_id !=10024){
-      //      var arr = this.unique(this.tableList)
-      //       this.tableList = arr
-      //       this.tableList.push(obj)
-      //       console.log("去重后条数",this.tableList)
-          
-      //       import('@/vendor/Export2Excel').then(excel => {
-      //       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-      //       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
-            
-      //       const data = this.formatJson(filterVal, this.tableList)
-      //       console.log("data222222222",data)
-      //         excel.export_json_to_excel({
-      //           header: tHeader,
-      //           data,
-      //           filename: '耗材入库明细'
-      //         })
-      //           this.downloadLoading = false
-      //         })
-      //   }
-     
-      //   },
+    
       exportList(){
-        // var obj = {index:"合计",total:0}
-        // obj.total = this.calTotalPrice()
+  
         console.log("hhhh",this.tableList)
        
         for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
-          this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name
-          this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
           this.tableList[i].index = i+1  
-          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].price).toFixed(2) 
+          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].packing_price).toFixed(2) 
         }
         console.log("总共条数555",this.tableList)   
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
-        
+        console.log("hhhhhhhh",this.tableList)
+       
         const data = this.formatJson(filterVal, this.tableList)
         console.log("data222222222",data)
           excel.export_json_to_excel({
@@ -840,6 +780,20 @@ export default {
        }
       return name
      },
+     getGoodDetailPrintList(){
+        const params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:1,
+        }
+      getGoodDetailPrintList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("入库详情单",list)
+          this.tableList = list
+        }
+      })
+     }
   }
 };
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -196,7 +196,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
@@ -227,10 +227,12 @@ export default {
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     // this.getPrintStockGood()
-    this.getList()
+    // this.getList()
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
     console.log("机构信息",org_id)
+    this.getGoodDetailPrintList()
+    
   },
   data() {
     return {
@@ -240,7 +242,7 @@ export default {
       ],
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type:"",
 
       searchKey: "",
       type: 2,
@@ -752,57 +754,17 @@ export default {
         })
       },
 
-    //  exportList(){
-      
-    //   for(let i=0;i<this.tableList.length;i++){
-    //      for(let j=0;j<this.goodInfoData.length;j++){
-    //         if(this.tableList[i].id === this.goodInfoData[j].id){
-    //            this.tableList[i].buy_price = this.goodInfoData[j].buy_price
-    //         }
-    //      }
-    //   }
-    //   console.log('合并后',this.tableList)
-      
-    //   var obj = {index:"合计",total:0}
-    //    obj.total = this.getTotalPrice()
-    //    for(let i=0;i<this.tableList.length;i++){
-    //     this.tableList[i].index = i+1
-    //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-    //     this.tableList[i].count = this.getStockCount(this.tableList[i].id)
-    //     this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
-    //     this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
-    //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
-    //    }
-    //    var arr = this.unique(this.tableList)
-     
-    //    this.tableList = arr
-    //    this.tableList.push(obj)
-    //    import('@/vendor/Export2Excel').then(excel => {
-    //    const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-    //    const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','buy_price','total','remark']
-
-    //    const data = this.formatJson(filterVal, this.tableList)
-    //    console.log("data",data)
-       
-    //     excel.export_json_to_excel({
-    //        header: tHeader,
-    //        data,
-    //        filename: '耗材出库明细'
-    //      })
-    //       this.downloadLoading = false
-    //     })
-    //    },
     exportList(){
        for(let i=0;i<this.tableData.length;i++){
         this.tableData[i].index = i+1
-        this.tableData[i].good_name = this.tableData[i].GoodInfo.good_name
-        this.tableData[i].specification_name = this.tableData[i].GoodInfo.specification_name
-        this.tableData[i].packing_unit = this.tableData[i].GoodInfo.packing_unit
-        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price).toFixed(2)
+        this.tableData[i].good_name = this.tableData[i].good_name
+        this.tableData[i].specification_name = this.tableData[i].specification_name
+        this.tableData[i].packing_unit = this.tableData[i].packing_unit
+        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].packing_price).toFixed(2)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
@@ -835,7 +797,20 @@ export default {
        return total_price
      },
    
-     
+     getGoodDetailPrintList(){
+        const params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:2,
+        }
+      getGoodDetailPrintList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("出库单详单",list)
+          this.tableData = list
+        }
+      })
+     } 
   }
 };
 </script>

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

@@ -359,7 +359,7 @@ export default {
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
-           console.log("退库详细222222222222222222",order)
+          //  console.log("退库详细222222222222222222",order)
            this.tableData = order
            this.tableList = order
            var total = response.data.data.total

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

@@ -199,7 +199,7 @@
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import { GetAllConfig } from "@/api/stock";
-import { getDrugIndetail} from "@/api/drug/drug_stock"
+import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
 export default {
   name: "stockInDetail",
 
@@ -228,6 +228,8 @@ export default {
     this.fetchAllAdminUsers()
     //获取入库单数据
     this.getlist()
+    this.getDrugWarehouseInfoPrint() 
+
   },
   data() {
     return {
@@ -243,7 +245,7 @@ export default {
       limit: 10,
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type: 1,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -260,10 +262,12 @@ export default {
       selectedTableData: [],
       dealer: [],
       tableList:[],
+      tabelePrintList:[],
     };
   },
   methods: {
     changeType: function(val) {
+     
       this.order_type = val;
      
     },
@@ -416,7 +420,23 @@ export default {
         }
       })
     },
+    getDrugWarehouseInfoPrint(){
+      var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+      }
+      console.log("params2222",params)
+     getDrugWarehouseInfoPrint(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("入库单详情",list)
+            this.tabelePrintList = list
+          }   
+      })
+    },
     PrintAction(){
+      console.log("打印",this.order_type)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){
@@ -432,25 +452,27 @@ export default {
       return name
     },
      exportList(){
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+        for(let i=0;i<this.tabelePrintList.length;i++){
+          this.tabelePrintList[i].index = i+1
+          this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
+
+          this.tabelePrintList[i].unit = this.tabelePrintList[i].XtBaseDrug.dose + this.tabelePrintList[i].XtBaseDrug.dose_unit + "*" + this.tabelePrintList[i].XtBaseDrug.min_number +this.tabelePrintList[i].XtBaseDrug.min_unit +"/"+this.tabelePrintList[i].XtBaseDrug.max_unit
         }
         
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','warehousing_count','price','total_price','remark']
-       console.log("表格22222222",this.tableList)
+       console.log("表格22222222",this.tabelePrintList)
        let obj = {'index':'合计','total_price':0}
-       for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += this.tableList[i].price * this.tableList[i].warehousing_count
+       for(let i=0;i<this.tabelePrintList.length;i++){
+         obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count
        }
-       for(let j=0;j<this.tableList.length;j++){
-         this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       for(let j=0;j<this.tabelePrintList.length;j++){
+         this.tabelePrintList[j].total_price = this.tabelePrintList[j].total_price.toFixed(2)
        }
        obj.total_price = obj.total_price.toFixed(2)
-       this.tableList.push(obj)
-       const data = this.formatJson(filterVal, this.tableList)
+       this.tabelePrintList.push(obj)
+       const data = this.formatJson(filterVal, this.tabelePrintList)
        console.log("data",data)
        
         excel.export_json_to_excel({

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

@@ -197,7 +197,7 @@
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import {GetAllConfig } from "@/api/stock";
-import {getDrugOutDetail } from "@/api/drug/drug_stock"
+import {getDrugOutDetail,getDrugOutOrderPrint } from "@/api/drug/drug_stock"
  import {getBaseDrugLibList} from '@/api/data'
 export default {
   name: "stockOutDetail",
@@ -223,10 +223,12 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.getDrugOutOrderPrint()
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
     this.getBaseDrugLibList()
+ 
   },
   data() {
     return {
@@ -236,7 +238,7 @@ export default {
       ],
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type:"",
 
       searchKey: "",
       type: 2,
@@ -259,7 +261,8 @@ export default {
       dealer: [],
       tableData:[],
       tableList:[],
-      drugList:[]
+      drugList:[],
+      tablePrint:[]
     };
   },
   methods: {
@@ -375,7 +378,7 @@ export default {
       }
     },
     PrintAction: function() {
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){
       var params = {
@@ -458,34 +461,37 @@ export default {
 
      exportList(){
 
-        for(let i=0;i<this.tableList.length;i++){
-          for(let j=0;j<this.drugList.length;j++){
-             if(this.tableList[i].drug_id == this.drugList[j].id){
-               this.tableList[i].last_price = this.drugList[j].last_price
+        for(let i=0;i<this.tablePrint.length;i++){
+          // for(let j=0;j<this.drugList.length;j++){
+          //    if(this.tableList[i].drug_id == this.drugList[j].id){
+          //      this.tableList[i].last_price = this.drugList[j].last_price
                
-             }
-          }
-          this.tableList[i].index = i+1
+          //    }
+          // }
+          this.tablePrint[i].index = i+1
+          
         }
-        for(let i=0;i<this.tableList.length;i++){
-           this.tableList[i].total_price = this.tableList[i].last_price * this.tableList[i].count
-           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+        for(let i=0;i<this.tablePrint.length;i++){
+           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.tablePrint[i].last_price * this.tablePrint[i].count
+           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_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
         }
-       console.log("列表数据333333333",this.tableList)
-      
+       console.log("列表数据333333333",this.tablePrint)
+     
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','last_price','total_price','remark']
-       let obj = {'index':'合计','total_price':0}
-       for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += (this.tableList[i].last_price * this.tableList[i].count)
-       }
-       for(let j=0;j<this.tableList.length;j++){
-          this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
-       }
-       obj.total_price = obj.total_price.toFixed(2)
-       this.tableList.push(obj)
-       const data = this.formatJson(filterVal, this.tableList)
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
+      //  let obj = {'index':'合计','total_price':0}
+      //  for(let i=0;i<this.tablePrint.length;i++){
+      //    obj.total_price += (this.tablePrint[i].min_price * this.tablePrint[i].count)
+      //  }
+      //  for(let j=0;j<this.tablePrint.length;j++){
+      //     this.tablePrint[j].total_price = this.tablePrint[j].total_price.toFixed(2)
+      //  }
+      //  obj.total_price = obj.total_price.toFixed(2)
+      //  this.tablePrint.push(obj)
+       const data = this.formatJson(filterVal, this.tablePrint)
        console.log("data",data)
        
        excel.export_json_to_excel({
@@ -524,6 +530,94 @@ export default {
           }
         })
       },
+    getDrugOutOrderPrint(){
+       var params = {
+         start_time:this.start_time,
+         end_time:this.end_time,
+         order_type:2,
+      }  
+      console.log("poara232323223233223",params)
+     getDrugOutOrderPrint(params).then(response=>{
+        if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("药品出库详情",list)
+            let objInfo = {}
+            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.retail_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,
+                }
+              }
+            })
+            let newArr = Object.values(objInfo);
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<list.length;j++){
+                if(newArr[i].drug_id == list[j].drug_id){
+                   newArr[i].child.push(list[j])
+                }
+              }
+            }
+           this.tablePrint = newArr
+           console.log(" this.tablePrint",this.tablePrint)  
+        }
+     })
+    },
+   getCount(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * arr[i].min_number
+          }
+        }
+        for(let i=0;i<arr.length;i++){
+          total+= arr[i].count
+        }
+
+       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
+      },
+      getTotalPrice(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * min_number
+          }else{
+            arr[i].count = arr[i].count
+          }
+        }  
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+        console.log("total23232",total)
+        return (total*min_price).toFixed(2)
+      }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -41,14 +41,17 @@
               </td>
             
               <td style="line-height: 50px">
-                  {{item.count}}
+                  <!-- {{item.count}} -->
+                  {{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}
               </td>
               <td style="line-height:50px">
-                  <!-- {{item.price}} -->
-                  {{getPrice(item.drug_id)}}
+                  {{item.price}}
+                  <!-- {{getPrice(item.drug_id)}} -->
               </td>
               <td style="line-height:50px">
-                  {{(item.count * getPrice(item.drug_id)).toFixed(2)}}
+                  <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
+                  <!-- {{item.count*item.price}} -->
+                <span ></span>   {{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -90,7 +93,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getDrugOutDetail} from "@/api/drug/drug_stock"
+  import { getDrugOutDetail,getDrugOutOrderPrint} from "@/api/drug/drug_stock"
   export default {
     name: 'dialysisPrintOrder',
     components: {
@@ -190,7 +193,8 @@
                  dose:item.dose,
                  dose_unit:item.dose_unit,
                  min_number:item.min_number,
-                 max_unit:item.max_unit
+                 max_unit:item.max_unit,
+                
                }
              }
           })
@@ -258,13 +262,102 @@
           }
         }
         return price
+      },
+      getDrugOutOrderPrint(){
+         var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          order_type:parseInt(this.order_type),
+        }
+        console.log("params22222",params)
+        getDrugOutOrderPrint(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("药品出库详情",list)
+            let objInfo = {}
+            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.retail_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,
+                }
+              }
+            })
+            let newArr = Object.values(objInfo);
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<list.length;j++){
+                if(newArr[i].drug_id == list[j].drug_id){
+                   newArr[i].child.push(list[j])
+                }
+              }
+            }
+            console.log("list2334444",newArr)
+            this.cancelStockDate = newArr
+          }
+        })
+      },
+      getCount(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * arr[i].min_number
+          }
+        }
+        for(let i=0;i<arr.length;i++){
+          total+= arr[i].count
+        }
+
+       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
+      },
+      getTotalPrice(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * min_number
+          }else{
+            arr[i].count = arr[i].count
+          }
+        }  
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+        console.log("total23232",total)
+        return (total*min_price).toFixed(2)
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-      this.getlist()
-      this.getBaseDrugLibList()
+      // this.getlist()
+      // this.getBaseDrugLibList()
+      this.getDrugOutOrderPrint()
     }
 
   }

src/xt_pages/stock/drugs/drugPrint.vue

@@ -31,14 +31,14 @@
                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug_name}}</span>
+                <span>{{item.XtBaseDrug.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
                 <!-- <span>{{item.drug_spec}}</span> -->
-                <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
+                <span>{{item.XtBaseDrug.dose}}{{item.XtBaseDrug.dose_unit}}*{{item.XtBaseDrug.min_number}}{{item.XtBaseDrug.min_unit}}/{{item.XtBaseDrug.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.min_unit}}</span>
+                <span>{{item.XtBaseDrug.min_unit}}</span>
               </td>
             
               <td style="line-height: 50px">
@@ -89,7 +89,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getDrugIndetail} from "@/api/drug/drug_stock"
+  import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
   export default {
     name: 'dialysisPrintOrder',
     components: {
@@ -221,13 +221,32 @@
            total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
         }
         return total
+      },
+      getDrugWarehouseInfoPrint(){
+         var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          order_type:this.order_type,
+         }
+         console.log("params2222",params)
+        getDrugWarehouseInfoPrint(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("入库单详情",list)
+             this.cancelStockDate  = list
+           }   
+        })
+
+        
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-      this.getlist()
+      // this.getlist()
+     
 
+      this.getDrugWarehouseInfoPrint()
       
 
     }

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -696,7 +696,7 @@
               'stockIn': this.recordInfo.recordData
             }
             console.log("params2222222",params)
-             
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -319,8 +319,6 @@
               <span>使用人</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span  v-if="scope.row.is_total == 1"></span> -->
               {{scope.row.user.name}}
             </template>
           </el-table-column>
@@ -330,7 +328,6 @@
             </template>
             <template slot-scope="scope">
               <span >{{scope.row.count}}{{scope.row.count_unit}}</span>
-              <!-- <span  v-if="scope.row.is_total == 1">{{scope.row.total}}</span> -->
             </template>
           </el-table-column>
 
@@ -954,22 +951,17 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          console.log("list2323232",list)
           var outList = response.data.data.outList
           for(let i=0;i<outList.length;i++){
-            console.log("55555",outList[i].count_unit)
-            console.log("666",outList[i].max_unit)
           if(outList[i].count_unit == outList[i].max_unit){
               outList[i].count =outList[i].count * outList[i].min_number
             }
           }
           this.outList = outList
-         console.log("出库数据44444",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
          this.drugFlowList = drugFlowList
-         console.log("23232323232323",drugFlowList)
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
               list[i].batch_number = ""
@@ -1072,7 +1064,6 @@ export default {
         return str + min_str
       },
       getTotalCount(drug_id,min_number,max_unit,min_unit){
-        console.log("hhhhhhhhh",this.outList)
          var str = ""
          var min_str = ""
          var arr = []
@@ -1100,14 +1091,12 @@ export default {
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
-        console.log("列表",this.drugFlowList)
         var arr = []
         for(let i=0;i<this.drugFlowList.length;i++){
           if(id == this.drugFlowList[i].drug_id){
              arr.push(this.drugFlowList[i])
           }
         }
-      
         var total = 0
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){
@@ -1118,7 +1107,6 @@ export default {
           }
           total += arr[i].count
         }
-      console.log("arr00000000000",arr)
         var str = ""
         var min_str = ""
         if(total >= min_number){
@@ -1133,9 +1121,7 @@ export default {
           str = ""
           min_str = total + min_unit
         }
-       
         return str + min_str 
-
       },
     //   getTotalCountOne(id,min_number,max_unit,min_unit){
        
@@ -1212,6 +1198,9 @@ export default {
          return  total_price
       },
       getDrugBatchNumber(drugid,count){
+        console.log("drug_id2323",drug_id)
+        console.log("count",count)
+        console.log("hhhhhhhhhhh",this.batchNumberList)
         var arr = []
         for(let i=0;i<this.batchNumberList.length;i++){
           if(drugid == this.batchNumberList[i].drug_id && count == this.batchNumberList[i].count){

src/xt_pages/user/components/PatientSidebar.vue

@@ -102,10 +102,10 @@ export default {
               name: '1-2',
               label: '病程管理'
             },
-            // {
-            //   name: '1-9',
-            //   label: '阶段小结'
-            // },
+            {
+              name: '1-9',
+              label: '阶段小结'
+            },
             {
               name: '1-3',
               label: '检验检查'
@@ -188,7 +188,7 @@ export default {
       }else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
       }else if (name == '1-9'){
-        this.$router.push({path:'/patients/patients/'+2448+'/templateSummary'})
+        this.$router.push({path:'/patients/patients/'+this.id+'/templateSummary'})
       }
     },
     changePatient(value) {

src/xt_pages/user/templateSummary.vue

@@ -36,25 +36,15 @@
                   color: '#606266'
                 }"
                 :row-style="{ color: '#303133' }" ref="record_table" :data="records"
-                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        border highlight-current-row @current-change="changeCurrentRecordOne"
                         @selection-change="didSelectionChange"
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
               >
                 <el-table-column type="selection" width="40" align="center"></el-table-column>
-                <el-table-column label="阶段小结名称" align="center">
-                  <template slot-scope="scope">
-                    <!-- {{ scope.row.title}} -->
-                  </template>
-                </el-table-column>
-                <el-table-column label="记录时间" align="center">
-                  <template slot-scope="scope">
-                    <!-- {{ recordTime(scope.row.record_time) }} -->
-                  </template>
-                </el-table-column>
-                <el-table-column label="记录医生" align="center">
+                <el-table-column label="检查项目" align="center">
                   <template slot-scope="scope">
-                    <!-- {{ doctorName(scope.row.recorder) }} -->
+                   
                   </template>
                 </el-table-column>
               </el-table>
@@ -62,10 +52,23 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                <div class="content">
-                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
-                  <span v-else></span>
-                </div>
+                  <el-table :header-cell-style="{
+                     backgroundColor: 'rgb(245, 247, 250)',
+                     color: '#606266'
+                   }"
+                   :row-style="{ color: '#303133' }" ref="record_table" :data="records"
+                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        @selection-change="didSelectionChange"
+                        :row-class-name="tableRow"
+                        @row-click="onRowClick"
+                 >
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
+                  <el-table-column label="检查项目" align="center">
+                    <template slot-scope="scope">
+                    
+                    </template>
+                  </el-table-column>
+                </el-table>
               </div>
             </el-col>
           </el-row>
@@ -103,6 +106,7 @@
                      </el-radio-group>
                     </el-form-item> 
                   </el-col>
+                  
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
@@ -267,15 +271,8 @@
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
-                     <el-select v-model="form.template_inspection_id" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                     </el-select>
-                     <el-input tyep="text" v-model="form.template_inspection_content"></el-input>
+                    <el-button type="primary" @click="toInspection">选择检验检查</el-button>
+                     <el-input tyep="text" v-model="form.template_inspection_content" style="height:100px"></el-input>
                   </el-row>
                   <el-row>
                     <el-col :span="8">
@@ -302,9 +299,6 @@
                   </el-row>
               </el-form>
             </div>
-
-
-          
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button type="primary" @click="createAction">保存
@@ -314,7 +308,121 @@
         </div>
       </el-dialog>
 
-
+       <el-dialog
+        title="提示"
+        :visible.sync="dialogVisibleInspection"
+        width="80%"
+        >
+        <span>
+          <el-form>
+            <el-row>
+              <el-form-item>
+                <span>选择检验检查时间:</span>
+                <div>
+                  <el-form-item
+                   label="年份:"
+                   prop="startYear"
+                   style="width:100%;"
+                 >
+                 <el-date-picker 
+                    v-model="startYear" 
+                    class="timePicker" 
+                    type="month" 
+                    placeholder=""
+                    format="yyyy-MM" 
+                    value-format="yyyy-MM">
+	               </el-date-picker>
+                 </el-form-item>
+                 <!-- <el-form-item  label="月份:"
+                   prop="startYear"
+                   style="width:100%;">     
+                  <el-date-picker
+                    v-model="startMonth"
+                    type="month"
+                    format="MM"
+                    value-format="MM"
+                    placeholder="请选择">
+                  </el-date-picker>  
+                 </el-form-item> -->
+                </div>
+              </el-form-item>
+            </el-row>
+            <el-row>
+               <span>选择检验检查项目:</span>
+                 <div class="record">
+                  <el-row :gutter="15">
+                    <el-col :span="10">
+                      <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }" :data="tableList"
+                                border highlight-current-row @current-change="changeCurrentRecord"
+                                @selection-change="selectionChangeOne"
+                                :row-class-name="tableRow"
+                                @row-click="onRowClick"
+                                ref="singleTable"
+                      >
+                        <el-table-column type="selection" width="40" align="center"></el-table-column>
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.project_name}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-col>
+                    <el-col :span="14">
+                      <div class="record_content_panel">
+                        <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }" ref="record_table" :data="tableData"
+                                border highlight-current-row @current-change="didChangeCurrentRecord"
+                                @selection-change="selectionChange"
+                                :row-class-name="tableRow"
+                                @row-click="onRowClick"
+                                
+                      >
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.item_name}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="结果" align="center">
+                          <template slot-scope="scope">
+                           <span v-if="parseInt(scope.row.inspect_value) < parseInt(scope.row.range_min)">
+                             {{scope.row.inspect_value}}↓
+                          </span> 
+                           <span v-if="parseInt(scope.row.inspect_value) > parseInt(scope.row.range_max)">
+                             {{scope.row.inspect_value}}↑
+                          </span> 
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="参考值" align="center">
+                          <template slot-scope="scope">
+                           {{scope.row.range_min}} ~  {{scope.row.range_max}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="单位" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.unit}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      </div>
+                    </el-col>
+                  </el-row>
+                </div>
+            </el-row>
+          </el-form>
+
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisibleInspection = false">取 消</el-button>
+          <el-button type="primary" @click="toContent">确 定</el-button>
+        </span>
+      </el-dialog>
   
     </div>
   </div>
@@ -326,7 +434,7 @@
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
 
-  import { getInitDataList } from '@/api/patient'
+  import { getInitDataList,getInspectionMajorItem,getInspectionDetail,getInspectionItemList } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
@@ -406,18 +514,28 @@
           {id:4,name:"第四季度"},
         ],
         options:[],
+        dialogVisibleInspection:false,
+        InspectionMajor:[],
+        other_start_time:"",
+        startYear:new Date(),
+        startMonth:(new Date().getMonth+1).toString(),
+        tableList:[],
+        tableData:[],
+        inspectDataList:[],
+        projectList:[],
       }
     },
     created() {
-    //   this.patient_id = parseInt(this.$route.query.id)
-    //   if (isNaN(this.patient_id) || this.patient_id <= 0) {
-    //     this.$notify.error({
-    //       title: '错误',
-    //       message: '无效的id'
-    //     })
-    //     this.$router.push('/patients/patients')
-    //     return
-    //   }
+      this.patient_id = parseInt(this.$route.query.id)
+      console.log("hhhhhh",this.patient_id)
+      if (isNaN(this.patient_id) || this.patient_id <= 0) {
+        this.$notify.error({
+          title: '错误',
+          message: '无效的id'
+        })
+        this.$router.push('/patients/patients')
+        return
+      }
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
@@ -441,7 +559,10 @@
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.other_start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' + (nowDay < 10 ? '0' + nowDay : nowDay)
       this.getlist()
+      this.getInspectionMajor()
+
     },
     methods: {
       getTime(val) {
@@ -468,6 +589,15 @@
       },
       didChangeCurrentRecord(){
 
+      },
+      changeCurrentRecord(val){
+      
+        this.getInspectionDetai(val)
+      },
+      selectionChangeOne(val){
+        console.log("val23232323",val)
+       
+        this.getInspectionItemList(val)
       },
       startTimeChange(){
 
@@ -477,6 +607,9 @@
       },
       print(){
 
+      },
+      tableRow(){
+
       },
       getQuarter(year,quarter){
         var start_time = ""
@@ -502,6 +635,15 @@
 
         // }
 
+      },
+      didSelectionChange(){
+
+      },
+      changeCurrentRecordOne(){
+
+      },
+      changeCurrentRecordOne(){
+
       },
       getlist(){
         var params={
@@ -511,9 +653,83 @@
         }
         console.log("param222222",params)
         console.log(moment(moment(2020 + '-01-01').toDate()).quarter(2).format("YYYY-MM-DD"))
-      getInitDataList(params).then(response=>{
+        getInitDataList(params).then(response=>{
+
+       })
+      },
+      toInspection(){
+        this.dialogVisibleInspection = true
+      },
+
+      //获取大项数据来源
+      getInspectionMajor(){
+          var params = {
+            other_start_time:this.getTime(this.startYear),
+            // patient_id:this.$route.query.id,
+             patient_id:2448,
+          }
+        console.log("params",params)
+        getInspectionMajorItem(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list23232323",list)
+            this.tableList = list
+            // this.$refs.singleTable.setCurrentRow(list[0])
+          }
+        })
+      },
+      //获取小项的值
+      getInspectionDetai(val){
+        var params = {
+          project_id:val.project_id,
+          patient_id:val.patient_id,
+          inspect_date:val.inspect_date,
+        }
+        console.log("param2233233223",params)
+       getInspectionDetail(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            console.log("详情222",list)
+            this.tableData = list
+          }
+       })
+      },
+      selectionChange(val){
+        console.log("val233223",val)
+        selectionChange().then(response=>{
 
-      })
+        })
+      },
+      getInspectionItemList(val){
+       
+       for(let i=0;i<val.length;i++){
+        this.projectList.push(val[i].project_id)
+        this.inspectDataList.push(val[i].inspect_date)
+      }
+    
+      },
+      toContent(){
+      
+         var str = this.inspectDataList.join(",")
+         var inspe_date = this.projectList.join(",")
+         var params = {
+           ids:str,
+           inspect_date:inspe_date,
+           patient_id:2448,
+         }
+         console.log("params",params)
+        getInspectionItemList(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list23223322332",list)
+             var str = ""
+             for(let i=0;i<list.length;i++){
+               str += (list[i].item_name + ":" + list[i].inspect_value)
+             }
+            this.form.template_inspection_content = str
+            this.dialogVisibleInspection = true
+           }
+        })  
       }
     }
   }

src/xt_pages/workforce/template.vue

@@ -364,9 +364,12 @@
 
 
         })
+      },
+      beforeUpload(){
+
       },
       handleSuccess({ results, header }) {
-       
+         consle.log("result32eeeeeeee",results)
         let headers = []
         for (let key in results[0]) {
           headers.push(key)