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

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/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='orderObj9504'></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

@@ -253,7 +253,7 @@
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
                 execution_frequency: prescription.doctor_advice[b].execution_frequency,
-                retail_price: prescription.doctor_advice[b].price.toString(),
+                // retail_price: prescription.doctor_advice[b].price.toString(),
                 remark: prescription.doctor_advice[b].remark,
                 day:prescription.doctor_advice[b].day,
                 prescribing_number:prescription.doctor_advice[b].prescribing_number.toString(),
@@ -262,8 +262,15 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
-
               };
+              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.retail_price
+              } else {
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              }
+
               tempAdvice.push(obj)
 
             }
@@ -281,27 +288,21 @@
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
                 total:prescription.project[b].count,
-                price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 unit: prescription.project[b].unit,
                 type: prescription.project[b].type
-
                 // medical_code:prescription.project[b].project.medical_code,
               };
-              console.log(prescription.project[b].type)
               if(prescription.project[b].type == 2){
-                console.log("pre")
-
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
-
+                obj['price'] = prescription.project[b].project.price
               }else if(prescription.project[b].type == 3){
-                console.log("pre2")
-
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
+                obj['price'] = prescription.project[b].good_info.packing_price
               }
 
               tempProject.push(obj)

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)
 
 
@@ -2539,40 +2534,37 @@
       },
 
       comfirm() {
+        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
+              }
+
+            }
+          }
+        }
+
+
+        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){
-        //   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){
-        //         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){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //
-        //     }
-        //
-        //   }
-        // }
 
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -310,7 +310,7 @@
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
                 execution_frequency: prescription.doctor_advice[b].execution_frequency,
-                retail_price: prescription.doctor_advice[b].price.toString(),
+                // retail_price: prescription.doctor_advice[b].price.toString(),
                 remark: prescription.doctor_advice[b].remark,
                 day:prescription.doctor_advice[b].day,
                 prescribing_number:prescription.doctor_advice[b].prescribing_number.toString(),
@@ -320,6 +320,14 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
               };
+
+              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.retail_price
+              } else {
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              }
               tempAdvice.push(obj)
 
             }
@@ -336,7 +344,7 @@
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
                 total:prescription.project[b].count.toString(),
-                price:prescription.project[b].price,
+                // price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 unit: prescription.project[b].unit,
                 type: prescription.project[b].type
@@ -348,11 +356,12 @@
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
-
+                obj['price'] = prescription.project[b].project.price
               }else if(prescription.project[b].type == 3){
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
+                obj['price'] = prescription.project[b].good_info.packing_price
               }
 
               tempProject.push(obj)

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -256,13 +256,13 @@
                       type="primary"
                       >打印</el-button
                     >
-                  </template>  
+                  </template>
                   <div id='printMain'>
                     <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
                     <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
                     <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
                   </div>
-                
+
             </el-dialog>
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -1457,7 +1457,7 @@
                       single_dose: prescription.advices[b].single_dose,
                       delivery_way: prescription.advices[b].delivery_way,
                       execution_frequency: prescription.advices[b].execution_frequency,
-                      retail_price: prescription.advices[b].price.toString(),
+                      // retail_price: prescription.advices[b].price.toString(),
                       remark: prescription.advices[b].remark,
                       day: prescription.advices[b].day,
                       prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -1467,6 +1467,32 @@
                       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.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)
                   }
 
@@ -1482,7 +1508,6 @@
                       execution_frequency: prescription.project[b].execution_frequency,
                       number_days: prescription.project[b].day,
                       total: prescription.project[b].count.toString(),
-                      price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
@@ -1493,11 +1518,16 @@
                       obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
+                      obj['price'] = prescription.project[b].project.price
+
+
 
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
+                      obj['price'] = prescription.project[b].good_info.packing_price
+
                     }
                     tempProject.push(obj)
                   }
@@ -1509,7 +1539,7 @@
                   }else if(this.schedule.schedule_type == 3){
                     var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
                   }
-                  
+
 
 
                   let index = i + 1;
@@ -1533,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)
                 }
@@ -1556,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)
 
               }
@@ -1800,7 +1818,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -1809,8 +1827,35 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             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.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)
                         }
 
@@ -1826,7 +1871,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -1837,11 +1881,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -1857,9 +1906,6 @@
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
                         }
 
-
-
-
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -1878,18 +1924,13 @@
 
                         }else{
 
-                          obj.med_type =  parseInt(prescription.med_type)
+                          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)
                       }
@@ -1906,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)
 
 
@@ -2234,7 +2272,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -2243,8 +2281,30 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             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.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)
                         }
 
@@ -2260,7 +2320,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -2271,11 +2330,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -2283,6 +2347,7 @@
 
                         var preTime = nowTime
 
+
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -2301,18 +2366,10 @@
 
                         }else{
 
-                          obj.med_type =  parseInt(prescription.med_type)
+                          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)
                       }
@@ -2329,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 ){
@@ -2656,7 +2710,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -2665,8 +2719,30 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             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.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)
                         }
 
@@ -2682,7 +2758,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -2693,11 +2768,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -2727,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)
                       }
@@ -2750,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 ){
@@ -3140,7 +3213,7 @@
                           single_dose: prescription.advices[b].single_dose,
                           delivery_way: prescription.advices[b].delivery_way,
                           execution_frequency: prescription.advices[b].execution_frequency,
-                          retail_price: prescription.advices[b].price.toString(),
+                          // retail_price: prescription.advices[b].price.toString(),
                           remark: prescription.advices[b].remark,
                           day: prescription.advices[b].day,
                           prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -3149,8 +3222,30 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           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.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)
                       }
 
@@ -3166,7 +3261,6 @@
                           execution_frequency: prescription.project[b].execution_frequency,
                           number_days: prescription.project[b].day,
                           total: prescription.project[b].count.toString(),
-                          price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
@@ -3177,11 +3271,16 @@
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
+                          obj['price'] = prescription.project[b].project.price
+
+
 
                         } else if (prescription.project[b].type == 3) {
                           obj['statistical_classification'] = ""
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
+                          obj['price'] = prescription.project[b].good_info.packing_price
+
                         }
                         tempProject.push(obj)
                       }
@@ -3197,6 +3296,7 @@
                         preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
                       }
 
+
                       let index = i + 1;
                       let obj = {
                         id: 0,
@@ -3218,14 +3318,10 @@
                         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)
                     }
 
@@ -3241,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 ){
@@ -3530,7 +3624,7 @@
                   }
 
                   var preTime = "";
-                  
+
 
                   if (prescription.pre_time == 0) {
                     // preTime = nowTime
@@ -3576,7 +3670,7 @@
                         single_dose: prescription.advices[b].single_dose,
                         delivery_way: prescription.advices[b].delivery_way,
                         execution_frequency: prescription.advices[b].execution_frequency,
-                        retail_price: prescription.advices[b].price.toString(),
+                        // retail_price: prescription.advices[b].price.toString(),
                         remark: prescription.advices[b].remark,
                         day: prescription.advices[b].day,
                         prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -3585,8 +3679,30 @@
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         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.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)
                     }
 
@@ -3602,7 +3718,6 @@
                         execution_frequency: prescription.project[b].execution_frequency,
                         number_days: prescription.project[b].day,
                         total: prescription.project[b].count.toString(),
-                        price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
@@ -3613,11 +3728,16 @@
                         obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
+                        obj['price'] = prescription.project[b].project.price
+
+
 
                       } else if (prescription.project[b].type == 3) {
                         obj['statistical_classification'] = ""
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['price'] = prescription.project[b].good_info.packing_price
+
                       }
                       tempProject.push(obj)
                     }
@@ -3652,16 +3772,11 @@
 
                     }else{
 
-                      obj.med_type =  parseInt(prescription.med_type)
+                      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)
                   }
@@ -3679,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 ){
@@ -3932,7 +4044,7 @@
               this.tableData2 = arr2
               this.tableData4 = arr4
               this.tableData3 = [arr3[0]]
-              
+
             }else{
               var list = response.data.data.list
               let arr = []
@@ -3945,10 +4057,10 @@
               }
               console.log('arrrrrrrrrr',arr)
               this.selecting_schs = arr
-              
+
               this.savePrint()
             }
-            
+
           }
         })
       },
@@ -4009,7 +4121,7 @@
           };
           this.paramsObj = obj1;
         }
-        
+
         //治疗
         var arr2 = [];
         if(this.selecting_schs2.length > 0){
@@ -4039,10 +4151,10 @@
           };
           this.paramsObj3 = obj3;
         }
-          
-        
-        
-        
+
+
+
+
         this.innerVisible = true
 
         // if(this.index == 20){

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){
-        //         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){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //
-        //     }
-        //
-        //   }
-        // }
+        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.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/user/dialysisSolution.vue

@@ -533,13 +533,13 @@
             </el-form-item>
           </el-col>
 
-          
+
            <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
              <el-form-item label="吸氧流量(L/分)：">
                 <el-input v-model="addPlan.oxygen_flow"></el-input>
              </el-form-item>
           </el-col>
-         
+
          <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
              <el-form-item label="吸氧时长(h）：">
                 <el-input v-model="addPlan.oxygen_time"></el-input>
@@ -551,10 +551,63 @@
               <el-input v-model="addPlan.target_ktv"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
 
-    
-    
+
+          <el-col :span="8" v-if="isShows('透析管路')">
+            <el-form-item label="透析管路:">
+              <el-select v-model="addPlan.hemodialysis_pipelines" >
+                <el-option
+                        v-for="item in hemodialysisPipelinesOptions"
+                        :label="item.name"
+                        :key="item.id"
+                        :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('透析管路支数')">
+            <el-form-item label="透析管路支数">
+              <el-input v-model="addPlan.hemodialysis_pipelines_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="8" v-if="isShows('穿刺针')">
+            <el-form-item label="穿刺针:">
+              <el-input v-model="addPlan.puncture_needle" @focus="showInnerDialog('10')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="8" v-if="isShows('穿刺针支数')">
+            <el-form-item label="穿刺针支数">
+              <el-input v-model="addPlan.puncture_needle_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('促红素')">
+            <el-form-item label="促红素:">
+              <el-select v-model="addPlan.epo" @change="changeBodyFluid">
+                <el-option
+                        v-for="item in epo"
+                        :label="item.name"
+                        :key="item.id"
+                        :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('促红素支数')">
+            <el-form-item label="促红素支数">
+              <el-input v-model="addPlan.epo_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
 
 
         <el-row :gutter="24">
@@ -665,6 +718,9 @@ export default {
       callback()
     }
     return {
+      hemodialysisPipelinesOptions:[],
+      punctureNeedleOptions:[],
+      epoOptions:[],
       zhiShow:false,
       huShow:false,
       totalShow:false,
@@ -751,6 +807,14 @@ export default {
         oxygen_flow:"",
         oxygen_time:"",
 
+        hemodialysis_pipelines:'',
+        hemodialysis_pipelines_count:'',
+        puncture_needle:"",
+        puncture_needle_count:"",
+        epo:"",
+        epo_count:"",
+
+
       },
       childPlan: {
         mode: '',
@@ -966,7 +1030,7 @@ export default {
 
           break
         case '8':
-         
+
           this.InnerDialogProps.values = this.plasmaSeparatorList
           this.InnerDialogProps.titles = '血浆分离器'
           this.InnerDialogProps.type = 'plasma_separator'
@@ -975,13 +1039,23 @@ export default {
 
           break
          case '9':
-         
+
           this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
           this.InnerDialogProps.titles = '胆红素吸附柱'
           this.InnerDialogProps.type = 'bilirubin_adsorption_column'
           this.InnerDialogProps.selected = this.addPlan.bilirubin_adsorption_column
           this.InnerDialogProps.isShowTextArea = false
 
+          break
+
+        case '10':
+
+          this.InnerDialogProps.values = this.punctureNeedleOptions
+          this.InnerDialogProps.titles = '穿刺针'
+          this.InnerDialogProps.type = 'puncture_needle'
+          this.InnerDialogProps.selected = this.addPlan.puncture_needle
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
@@ -1004,6 +1078,9 @@ export default {
         case 'bilirubin_adsorption_column':
           this.addPlan.bilirubin_adsorption_column = val.value.join(',')
           break
+        case 'puncture_needle':
+          this.addPlan.puncture_needle = val.value.join(',')
+          break
       }
     },
     innerDialogCancle: function() {
@@ -1315,8 +1392,7 @@ export default {
           }
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
-          console.log("2233333",this.addPlan)
-          
+
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1440,6 +1516,9 @@ export default {
       this.addPlan.kalium = row.kalium.toString()
       this.addPlan.sodium = row.sodium.toString()
       this.addPlan.calcium = row.calcium.toString()
+
+
+
       this.addPlan.bicarbonate = row.bicarbonate.toString()
       this.addPlan.glucose = row.glucose.toString()
       this.addPlan.dialysate_flow = row.dialysate_flow.toString()
@@ -1447,6 +1526,14 @@ export default {
       this.addPlan.conductivity = row.conductivity.toString()
       this.addPlan.remark = row.remark
 
+      this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
+      this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      this.addPlan.puncture_needle  = row.puncture_needle
+      this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      this.addPlan.epo  = row.epo
+      this.addPlan.epo_count  = row.epo_count.toString()
+
+
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       this.addPlan.plasma_separator = row.plasma_separator.toString()
       this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
@@ -1553,6 +1640,15 @@ export default {
         ultrafiltration: '',
         blood_access: '',
 
+
+        hemodialysis_pipelines:'',
+        hemodialysis_pipelines_count:'',
+        puncture_needle:"",
+        puncture_needle_count:"",
+        epo:"",
+        epo_count:"",
+
+
         dialysis_duration: '3.30',
         dialysis_duration_hour: '3',
         dialysis_duration_minute: '30',
@@ -1803,6 +1899,14 @@ export default {
               oxygen_time:"",
               oxygen_uptake:"",
               oxygen_flow:"",
+
+              hemodialysis_pipelines:'',
+              hemodialysis_pipelines_count:'',
+              puncture_needle:"",
+              puncture_needle_count:"",
+              epo:"",
+              epo_count:"",
+
             }
 
             for (const key in tempAddPlan) {
@@ -1884,6 +1988,9 @@ export default {
       })
       this.$router.back(-1)
     }
+    this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
+    this.punctureNeedleOptions =  getDataConfig('hemodialysis', 'puncture_needle')
+    this.epoOptions =getDataConfig('hemodialysis', 'epo')
 
     this.GetDeviceData()
     this.fetchAllAdminUsers()