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

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -30,7 +30,7 @@
       </el-table-column>
 
       <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.day}}</template>
+        <template slot-scope="scope">{{scope.row.day}}天</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price}}</div>
+          <div> {{scope.row.retail_price}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
@@ -64,7 +64,8 @@
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-        <template slot-scope="scope">{{scope.row.single_dose}}</template>
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
@@ -83,9 +84,10 @@
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{scope.row.number_days}}
+          {{scope.row.number_days}}天
 
         </template>
+
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
@@ -101,7 +103,7 @@
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{scope.row.price}}
+          {{scope.row.price}}元
 
         </template>
       </el-table-column>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -357,24 +357,25 @@
         form['record_time'] = this.record_date
         this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 4) {
+         var  that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                this.loadingtwo = false
-                this.$refs.charge.hide()
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                that.$refs.charge.hide()
                 return false
               } else {
-                this.$refs.charge.hide()
-                this.loadingtwo = false
-                this.state = '已收费'
-                this.$message({message: '收费成功', type: 'success'})
-                this.loadingtwo = false
-                this.cal_one = this.cal_one - 1
-                this.cal_two = this.cal_two + 1
-                this.patientTableData.splice(this.current_index, 1)
+                that.$refs.charge.hide()
+                that.loadingtwo = false
+                that.state = '已收费'
+                that.$message({message: '收费成功', type: 'success'})
+                that.loadingtwo = false
+                that.cal_one = this.cal_one - 1
+                that.cal_two = this.cal_two + 1
+                that.patientTableData.splice(this.current_index, 1)
               }
             })
             .catch(function (error) {
@@ -411,22 +412,24 @@
           this.loadingone = true
 
         if (this.$store.getters.xt_user.org_id == 4) {
+          var  that = this
+
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                this.loadingone = false
-                this.$refs.register.hide()
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                that.$refs.register.hide()
                 return false
               } else {
-                this.$refs.register.hide()
-                this.getPatientList()
-                this.$message({message: '挂号成功', type: 'success'})
-                this.loadingone = false
+                that.$refs.register.hide()
+                that.getPatientList()
+                that.$message({message: '挂号成功', type: 'success'})
+                that.loadingone = false
                 var his_info = response.data.data.his_info
-                this.hisPatientInfo = his_info
+                that.hisPatientInfo = his_info
               }
             })
             .catch(function (error) {
@@ -461,6 +464,9 @@
           this.$message.error('请先选择患者')
           return
         }
+        this.prescriptions = []
+        this.curPrescriptions = []
+
         let params = {
           'record_date': val,
           'patient_id': this.patientInfo.id
@@ -656,6 +662,7 @@
 
         } else if (index == 5) {
           if (this.$store.getters.xt_user.org_id == 4) {
+            var that = this
             this.$confirm('是否退费', '退费', {
               confirmButtonText: '确 定',
               cancelButtonText: '取 消',
@@ -673,12 +680,12 @@
               })
                 .then(function (response) {
                   if (response.data.state == 0) {
-                    this.$message.error(response.data.msg)
-                    this.loadingtwo = false
+                    that.$message.error(response.data.msg)
+                    that.loadingtwo = false
                     return false
                   } else {
-                    this.$message({message: '退费成功', type: 'success'})
-                    this.loadingtwo = false
+                    that.$message({message: '退费成功', type: 'success'})
+                    that.loadingtwo = false
 
                   }
                 })
@@ -742,14 +749,16 @@
             clr_type:"11",
           }
 
+          var that = this
+
           if (this.$store.getters.xt_user.org_id == 4) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
               .then(function (response) {
                 if (response.data.state == 0) {
-                  this.$message.error(response.data.msg)
-                  this.loadingtwo = false
+                  that.$message.error(response.data.msg)
+                  that.loadingtwo = false
                   return false
                 } else {
 
@@ -768,13 +777,14 @@
             start_time:"2020-12-28",
             end_time:"2020-12-30",
           }
+          var that = this
           axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
             params: params
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                this.loadingtwo = false
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
                 return false
               } else {
 
@@ -1043,7 +1053,8 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code
+                  medical_code: prescription.project[b].project.medical_code,
+                  unit:prescription.project[b].project.unit
                 }
                 tempProject.push(obj)
               }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -152,6 +152,8 @@ export default {
     getInfo(order_id) {
       if (this.$store.getters.xt_user.org_id == 4) {
 
+        var that = this
+
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
             order_id: order_id,
@@ -165,47 +167,46 @@ export default {
               console.log("logloglog")
 
               console.log(response.data.data.info)
+              that.info = response.data.data.info
+              console.log(that.info)
 
-              this.info = response.data.data.info
-              console.log(this.info)
-
-              this.info['bed_cost_total'] = response.data.data.bedCostTotal
-              this.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
-              this.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+              that.info['bed_cost_total'] = response.data.data.bedCostTotal
+              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
+              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
 
-              this.info['operation_cost_total'] = response.data.data.operationCostTotal
-              this.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
-              this.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+              that.info['operation_cost_total'] = response.data.data.operationCostTotal
+              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
+              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
 
-              this.info['other_cost_total'] = response.data.data.otherCostTotal
-              this.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
-              this.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+              that.info['other_cost_total'] = response.data.data.otherCostTotal
+              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
+              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
 
-              this.info['material_cost_total'] = response.data.data.materialCostTotal
-              this.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
-              this.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+              that.info['material_cost_total'] = response.data.data.materialCostTotal
+              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
+              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
 
-              this.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
-              this.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
-              this.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
+              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
+              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
 
-              this.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotalt
-              this.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
-              this.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
+              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
+              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
 
 
-              this.info['check_cost_total'] = response.data.data.checkCostTotal
-              this.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
-              this.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+              that.info['check_cost_total'] = response.data.data.checkCostTotal
+              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
+              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
 
 
-              this.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
-              this.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
-              this.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
+              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
+              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
 
-              this.info['treat_cost_total'] = response.data.data.treatCostTotal
-              this.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
-              this.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+              that.info['treat_cost_total'] = response.data.data.treatCostTotal
+              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
+              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
               console.log(this.info)
             }
           })

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -16,10 +16,12 @@
             </tr>
             <tr>
                 <td width="80">姓名</td>
-                <td width="80">{{info.name}}</td>
+                <td width="80">{{info.psn_name}}</td>
                 <td width="80">性别</td>
-                <td width="50">{{info.gend}}</td>
-                <td width="80">出生日期</td>
+                <td width="50" v-if="info.gend == '1'">男</td>
+              <td width="50" v-if="info.gend == '2'">女</td>
+
+              <td width="80">出生日期</td>
                 <td width="100">{{info.brdy}}</td>
                 <td width="90">个人电脑号</td>
                 <td width="110"></td>
@@ -72,7 +74,7 @@
             </tr>
             <tr>
                 <td colspan="12" style="text-align:left;padding-left:10px;">
-                    本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.fulamt_ownpay_amt}}元。
+                    本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
                 </td>
             </tr>
             <tr>
@@ -97,9 +99,9 @@
             </tr>
             <tr>
                 <td>中药费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
                 <td>中成药</td>
                 <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}</td>
                 <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
@@ -107,9 +109,9 @@
             </tr>
             <tr>
                 <td>中草药</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
                 <td>检查费</td>
                 <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
                 <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
@@ -121,9 +123,9 @@
               <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
               <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
                 <td>放射费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
             </tr>
             <tr>
                 <td>手术费</td>
@@ -137,13 +139,13 @@
             </tr>
             <tr>
                 <td>输血费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
                 <td>输氧费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
             </tr>
             <tr>
                 <td>其他</td>
@@ -151,9 +153,9 @@
               <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
               <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
                 <td>麻醉费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
             </tr>
             <tr>
                 <td>材料费</td>
@@ -161,15 +163,15 @@
               <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
               <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
                 <td>特殊检查费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
             </tr>
             <tr>
                 <td>特殊治疗费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
-                <td style="text-align:right;padding-right:10px;">0.00</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0.00</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+                <td style="text-align:right;padding-right:10px;">0</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
                 <td style="text-align:right;padding-right:10px;"></td>
                 <td colspan="2" style="text-align:right;padding-right:10px;"></td>
                 <td style="text-align:right;padding-right:10px;"></td>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -27,6 +27,7 @@
                         </el-table-column>
                         <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                           <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
+
                         </el-table-column>
                         <el-table-column align="center" prop="delivery_way" width="90" label="用法">
                           <template slot-scope="scope">
@@ -41,7 +42,7 @@
                         <el-table-column align="center" prop="number_days" width="60" label="天数">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-                            {{scope.row.day}}
+                            {{scope.row.day}}天
 
                           </template>
                         </el-table-column>
@@ -51,7 +52,7 @@
                         <el-table-column align="center" prop="name" width="60" label="单价">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                            {{scope.row.price}}
+                            {{scope.row.price}}元
 
                           </template>
                         </el-table-column>
@@ -273,8 +274,8 @@ export default {
                 day: prescription.project[b].day,
                 count: prescription.project[b].count.toString(),
                 remark: prescription.project[b].remark,
-                single_dose_unit:"",
-                prescribing_number_unit:"",
+                single_dose_unit:prescription.project[b].project.unit,
+                prescribing_number_unit:prescription.project[b].project.unit,
                 type:2,
               }
               this.tableData.push(obj)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -80,6 +80,14 @@
               :label="item.name"
               :name="item.name"
             >
+              <el-date-picker
+                v-model="item.pre_time"
+                type="datetime"
+                :clearable="false"
+                format="yyyy-MM-dd hh:mm"
+                value-format="yyyy-MM-dd hh:mm"
+                placeholder="选择日期">
+              </el-date-picker>
 
             </el-tab-pane>
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
@@ -837,6 +845,7 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo) {
+        console.log(data)
         this.prescription_id = data[0].id
         this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
@@ -896,7 +905,7 @@
 
         if (info.id > 0) {
           this.doctorValue = info.doctor_id
-          this.departmentValue = info.department
+          this.departmentValue = info.departments
         } else {
           if (hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
             this.doctorValue = hisPatientInfo.doctor
@@ -1011,8 +1020,10 @@
             }
 
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
-              this.prescriptions[i].project[b].price = parseFloat(this.prescriptions[i].project[b].price)
+              this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
               this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
+              this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
+
             }
 
             for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
@@ -1056,13 +1067,31 @@
 
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
+
+        var nowDate = new Date()
+        var nowYear = nowDate.getFullYear()
+        var nowMonth = nowDate.getMonth() + 1
+        var nowDay = nowDate.getDate()
+
+        var hours = nowDate.getHours()
+        var min = nowDate.getMinutes()
+
+        var nowTime =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + " "+(hours < 10 ? '0' + hours : hours) +
+          ':' + (min < 10 ? '0' + min : min)
+
         this.prescriptions.push({
           id: 0,
           name: newTabName,
           order_status: 0,
           advices: [],
           project: [],
-          addition: []
+          addition: [],
+          pre_time:nowTime,
 
         })
         this.editableTabsValue = newTabName

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -269,6 +269,7 @@
                   execution_frequency: prescription.advices[b].execution_frequency,
                   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(),
                   single_dose_unit: prescription.advices[b].single_dose_unit,
                   prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
@@ -291,7 +292,8 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code
+                  medical_code: prescription.project[b].project.medical_code,
+                  unit:prescription.project[b].project.unit,
                 }
                 tempProject.push(obj)
               }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -30,7 +30,7 @@
       </el-table-column>
       <el-table-column align="center" prop="day" width="50" label="天数">
         <template slot-scope="scope">
-          <div>{{ scope.row.day }}</div>
+          <div>{{ scope.row.day }}天</div>
         </template>
       </el-table-column>
 
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="80" label="单价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price}}</div>
+          <div> {{scope.row.retail_price}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
@@ -69,7 +69,7 @@
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
-          <div> {{scope.row.single_dose}}</div>
+          <div> {{scope.row.single_dose}}{{scope.row.unit}}</div>
 
         </template>
       </el-table-column>
@@ -90,19 +90,19 @@
       <el-table-column align="center" prop="number_days" width="100" label="天数">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          <div> {{scope.row.number_days}}</div>
+          <div> {{scope.row.number_days}}天</div>
 
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
-            <div> {{scope.row.total}}</div>
+            <div> {{scope.row.total}}{{scope.row.unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="70" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          <div> {{scope.row.price}}</div>
+          <div> {{scope.row.price}}元</div>
 
         </template>
       </el-table-column>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -44,6 +44,8 @@
       <el-table-column align="center" prop="day" width="50" label="天数">
         <template slot-scope="scope">
           <el-input v-model="scope.row.day" placeholder=""></el-input>
+          <div>{{'天'}}</div>
+
         </template>
       </el-table-column>
 
@@ -58,6 +60,8 @@
       <el-table-column align="center" prop="retail_price" width="60" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -84,11 +88,19 @@
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
+          <div>{{scope.row.unit}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" placeholder=""></el-input>
+          <el-autocomplete
+            style="width:100%;"
+            class="inline-input"
+            v-model="scope.row.delivery_way"
+            :fetch-suggestions="querySearch2"
+            placeholder="请输入内容"
+          ></el-autocomplete>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
@@ -99,6 +111,7 @@
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
           <el-input v-model="scope.row.number_days" placeholder=""></el-input>
+          <div>{{'天'}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -113,6 +126,8 @@
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -190,6 +205,20 @@
       }
     },
    methods:{
+     createFilter(queryString) {
+       return (restaurant) => {
+         return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+       }
+     },
+     querySearch2(queryString, cb) {
+       var restaurants = this.getDictionaryDataConfig("system","project_use")
+       restaurants.map(item => {
+         item.value = item.name
+       })
+       var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+       // 调用 callback 返回建议列表的数据
+       cb(results)
+     },
      delAddition(index, addition){
        if(this.prescription.order_status == 2){
          this.$message.error('该处方已经结算或者退费，无法删除')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -152,6 +152,7 @@
   import print from './print'
   import treatPrint from './treatPrint'
   import recordPrint from './recordPrint'
+
   export default {
     components: {
       BreadCrumb,
@@ -311,6 +312,23 @@
         })
       },
       getPatientInfo(val){
+        var nowDate = new Date()
+        var nowYear = nowDate.getFullYear()
+        var nowMonth = nowDate.getMonth() + 1
+        var nowDay = nowDate.getDate()
+
+        var hours = nowDate.getHours()
+        var min = nowDate.getMinutes()
+
+        var nowTime =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + " "+(hours < 10 ? '0' + hours : hours) +
+          ':' + (min < 10 ? '0' + min : min)
+
+
         this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,
@@ -404,8 +422,6 @@
 
 
                 for (let b = 0; b < prescription.project.length; b++) {
-                  console.log(prescription.project[b])
-                  console.log(prescription.project[b].project)
                   let obj = {
                     id: prescription.project[b].id,
                     project_id: prescription.project[b].project_id,
@@ -419,6 +435,7 @@
                     price:prescription.project[b].price,
                     remark:prescription.project[b].remark,
                     medical_code:prescription.project[b].project.medical_code,
+                    unit:prescription.project[b].project.unit,
                   }
                   tempProject.push(obj)
                 }
@@ -435,7 +452,13 @@
                   tempAddition.push(obj)
                 }
 
+                var preTime = ""
 
+                if(prescription.pre_time == 0){
+                  preTime = nowTime
+                }else{
+                  preTime = this.getTime(prescription.pre_time,"{y}-{m}-{d} {h}:{i}")
+                }
 
                 let index = i + 1
                 let obj = {
@@ -444,7 +467,8 @@
                   advices: tempAdvice,
                   project: tempProject,
                   addition:tempAddition,
-                  order_status:prescription.order_status
+                  order_status:prescription.order_status,
+                  pre_time: preTime
                 }
                 this.prescriptions.push(obj)
               }
@@ -456,10 +480,12 @@
                 project: [],
                 addition:[],
                 orderStatus:0,
+                pre_time:nowTime,
+
               }
               this.prescriptions.push(obj)
             }
-
+            console.log(this.prescriptions)
 
 
             this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department,this.hisPatientInfo)
@@ -471,6 +497,25 @@
       },
 
       choosePatient(val) {
+        console.log("~~~~")
+        var nowDate = new Date()
+        var nowYear = nowDate.getFullYear()
+        var nowMonth = nowDate.getMonth() + 1
+        var nowDay = nowDate.getDate()
+
+        var hours = nowDate.getHours()
+        var min = nowDate.getMinutes()
+
+        var nowTime =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + " "+(hours < 10 ? '0' + hours : hours) +
+          ':' + (min < 10 ? '0' + min : min)
+        console.log("999999999")
+
+
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++){
           if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
@@ -506,6 +551,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
+
                 this.prescriptions = []
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
@@ -559,6 +605,7 @@
                 if (response.data.data.prescription.length > 0) {
                   for (let i = 0; i < response.data.data.prescription.length; i++) {
                     var prescription = response.data.data.prescription[i]
+
                     let tempAdvice = []
                     let tempProject = []
                     let tempAddition = []
@@ -610,6 +657,19 @@
                       }
                       tempAddition.push(obj)
                     }
+
+
+
+                    var preTime = ""
+
+                    if(prescription.pre_time == 0){
+                      preTime = nowTime
+                    }else{
+                      preTime = this.getTime(prescription.pre_time,"{y}-{m}-{d} {h}:{i}")
+                    }
+                    console.log(preTime)
+
+
                     let index = i + 1
                     let obj = {
                       id: prescription.id,
@@ -617,7 +677,8 @@
                       advices: tempAdvice,
                       project: tempProject,
                       addition:tempAddition,
-                      order_status:prescription.order_status
+                      order_status:prescription.order_status,
+                      pre_time:preTime
                     }
                     this.prescriptions.push(obj)
                   }
@@ -629,6 +690,8 @@
                     project: [],
                     addition:[],
                     orderStatus:0,
+                    pre_time:nowTime
+
                   }
                   this.prescriptions.push(obj)
                 }
@@ -758,6 +821,15 @@
                     }
                     tempAddition.push(obj)
                   }
+
+                  var preTime = ""
+
+                  if(prescription.pre_time == 0){
+                    preTime = nowTime
+                  }else{
+                    preTime = this.getTime(prescription.pre_time,"{y}-{m}-{d} {h}:{i}")
+                  }
+
                   let index = i + 1
                   let obj = {
                     id: prescription.id,
@@ -765,7 +837,8 @@
                     advices: tempAdvice,
                     project: tempProject,
                     addition:tempAddition,
-                    order_status:prescription.order_status
+                    order_status:prescription.order_status,
+                    pre_time:preTime
                   }
                   this.prescriptions.push(obj)
                 }
@@ -777,6 +850,7 @@
                   project: [],
                   addition:[],
                   orderStatus:0,
+                  pre_time:nowTime,
                 }
                 this.prescriptions.push(obj)
               }
@@ -924,6 +998,12 @@
           this.innerVisible = true
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
       }
     },
     created() {

src/xt_pages/stock/detail/print.vue

@@ -27,8 +27,8 @@
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <!-- <td style="line-height: 50px" width="250">耗材类型</td> -->
-            
-              
+
+
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
              <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
@@ -150,7 +150,7 @@
           style: style,
           scanStyles: false
         })
-      }, 
+      },
       getDialysisRecord() {
         this.loading = true
         getPrintStockGood(this.queryParams).then(response => {
@@ -225,6 +225,8 @@
 
       }, calTotal(stock) {
 
+        console.log(stock)
+
         var array = []
         if (this.type == 1) {
           array = stock.query_warehousing_info
@@ -234,7 +236,12 @@
 
         let total_price = 0.0
         for (let i = 0; i < array.length; i++) {
-          total_price = total_price + array[i].total_price
+          if(this.type == 1) {
+            total_price = total_price + array[i].warehousing_count * array[i].price
+          }else if(this.type == 3){
+            total_price = total_price + array[i].count * array[i].price
+
+          }
         }
         return  Math.floor(total_price * 100) / 100
       }, calTotalPrice() {