更新

src/xt_pages/medicalScheduling/index.vue

@@ -201,7 +201,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="newVisible=false">取 消</el-button>
-                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+                <el-button v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
             </div>
             </el-dialog>
 
@@ -354,6 +354,7 @@ export default {
     },
     data(){
         return{
+          copySchLoading:false,
             crumbs: [
                 { path: false, name: '医护排班' },
                 { path: '/medicalScheduling/index', name: '医护排班' }
@@ -1862,15 +1863,22 @@ export default {
             }
            this.$refs[formName].validate(valid=>{
               if(valid){
-                copyStaffSchedule(params).then(response=>{
-                   if(response.data.state == 1){
-                     var msg = response.data.data.msg
-                     this.$message.success("复制成功")
-                     this.newVisible = false
-                   }else{
-                    this.$message.error("排班已存在")
-                  }
-                })
+                if(!this.copySchLoading){
+                  this.copySchLoading = true
+                  copyStaffSchedule(params).then(response=>{
+                    if(response.data.state == 1){
+                      var msg = response.data.data.msg
+                      this.copySchLoading = false
+
+                      this.$message.success("复制成功")
+                      this.newVisible = false
+                    }else{
+                      this.copySchLoading = false
+                      this.$message.error("排班已存在")
+                    }
+                  })
+                }
+
               }
            })
         },

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,9 +14,9 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
-      <print-three v-if="  org_id == 0 || org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
       <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
@@ -94,7 +94,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265 || this.org_id == 0){
+            if(this.org_id == 10265){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info
@@ -172,6 +172,8 @@
 
                   if(infos.project.type == 2){
                     obj['name'] = infos.project.project.project_name
+                    obj['code'] = infos.project.project.medical_code
+
                     obj['spec'] = ''
                     obj['unit'] =  infos.project.project.unit
                     obj['is_total']= 0
@@ -180,6 +182,7 @@
                   }else if (infos.project.type == 3){
                     obj['name'] = infos.project.good_info.good_name
                     obj['spec'] = ""
+                    obj['code'] = infos.project.good_info.medical_insurance_number
                     obj['unit'] = infos.project.good_info.packing_unit
                     obj['is_total']= 0
 
@@ -189,6 +192,7 @@
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                   obj['name'] = infos.advice.drug.drug_name
+                  obj['code'] = infos.advice.drug.medical_insurance_number
                   obj['unit'] = infos.advice.prescribing_number_unit
                   obj['feedetl_sn'] =  infos.feedetl_sn
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
@@ -206,7 +210,8 @@
 
               let newObj = {}
               newObj['name'] = "合计"
-              newObj['price']= this.order.medfee_sumamt
+              newObj['count']= 1
+              newObj['price']= this.order.medfee_sumamt.toFixed(2)
               newObj['is_total']= 1
               this.list.push(newObj)
 

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -15,19 +15,21 @@
         </div>
         <table class="listTable" border="1">
             <tr>
-                <td style="width:19%">开方日期</td>
+                <td style="width:15%">开方日期</td>
                 <td style="width:10%">类别</td>
-                <td style="width:31%">项目名称</td>
-                <td style="width:14%">规格</td>
+              <td style="width:10%">医保编码</td>
+              <td style="width:30%">项目名称</td>
+                <td style="width:10%">规格</td>
                 <td style="width:10%">单价(元)</td>
                 <td style="width:6%">数量</td>
                 <td style="width:10%">金额(元)</td>
             </tr>
             <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
-                <td style="width:19%">{{item.p_time}}</td>
+                <td style="width:15%">{{item.p_time}}</td>
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
-                <td style="width:31%">{{item.name}}</td>
-                <td style="width:14%">{{item.spec}}</td>
+                <td style="width:10%">{{item.code}}</td>
+                <td style="width:30%">{{item.name}}</td>
+                <td style="width:10%">{{item.spec}}</td>
                 <td style="width:10%">{{item.price}}</td>
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -768,6 +768,7 @@ export default {
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
                 let order = response.data.data.order_infos[i]
                 let obj = {
+                  code:"",
                   name: "",
                   spec: "",
                   cnt: "",
@@ -780,20 +781,21 @@ export default {
                   obj.spec = spec
                   obj.cnt = order.cnt
                   obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                  obj.code = order.advice.drug.medical_insurance_number
                   list.push(obj)
-
                 }else if (order.advice_id == 0 && order.project_id > 0) {
                   if(order.project.type == 2){
                     obj.name = order.project.project.project_name
                     obj.spec = ""
                     obj.cnt = order.cnt
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
-
+                    obj.code = order.project.project.medical_code
                   }else{
                     obj.name = order.project.good_info.good_name
                     obj.spec = order.project.good_info.specification_name
                     obj.cnt = order.cnt
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                    obj.code = order.project.good_info.medical_insurance_number
                   }
                   list.push(obj)
                 }

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -64,6 +64,7 @@
                 <td>{{'价格'}}</td>
               </tr>
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
+                <td colspan="2">{{v.code}}</td>
                 <td colspan="2">{{v.name}}</td>
                 <td>{{v.spec}}</td>
                 <td>{{v.cnt}}</td>
@@ -80,6 +81,7 @@
               <td>{{'价格'}}</td>
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
                 <td colspan="2">{{v.name}}</td>
+                <td colspan="2">{{v.code}}</td>
                 <td>{{v.spec}}</td>
                 <td>{{v.cnt}}</td>
                 <td>{{v.det_item_fee_sumamt}}</td>

src/xt_pages/outpatientTool/components/settle.vue

@@ -66,6 +66,11 @@
             {{scope.row.id_card_no}}
           </template>
         </el-table-column>
+        <el-table-column align="center" prop="item_name" label="就诊号">
+          <template slot-scope="scope">
+            {{scope.row.mdtrt_id}}
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="item_name" label="治疗日期">
           <template slot-scope="scope">
             {{getTimes(scope.row.settle_accounts_date)}}
@@ -233,6 +238,7 @@ import { uParseTime } from '@/utils/tools'
                 let order = data[i].orders[b]
                 order['other_name'] = data[i].name
                 order['id_card_no'] = data[i].id_card_no
+                order['mdtrt_id'] =order.mdtrt_id
 
                 total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
               }
@@ -324,7 +330,7 @@ import { uParseTime } from '@/utils/tools'
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 15) {
+        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 15) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/xt_pages/workforce/appointment.vue

@@ -155,7 +155,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newVisible=false">取 消</el-button>
-          <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+          <el-button  v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
       </el-dialog>
     </div>
@@ -251,6 +251,7 @@ export default {
         copyWeek: "",
       },
       newVisible: false,
+      copySchLoading:false,
       typeOptions: [],
       timeOptions: [],
       copyWeek: '',
@@ -2978,15 +2979,22 @@ export default {
 
       this.$refs[formName].validate(valid => {
         if (valid) {
-          copyPatientSchedule(params).then(response => {
-            if (response.data.state == 1) {
-              var msg = response.data.data.msg
-              this.$message.success("复制成功")
-              this.newVisible = false
-            } else {
-              this.$message.error("复制失败")
-            }
-          })
+          if(!this.copySchLoading){
+            this.copySchLoading = true
+            copyPatientSchedule(params).then(response => {
+              if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.$message.success("复制成功")
+                this.copySchLoading = false
+                this.newVisible = false
+              } else {
+                this.copySchLoading = false
+                this.$message.error("复制失败")
+              }
+            })
+
+          }
+
         }
       })
     },

src/xt_pages/workforce/components/editTableData.vue

@@ -2754,7 +2754,7 @@ export default {
                   } else {
                     let obj = {
                       week_type:this.weeks[b].week_type,
-                      order_id:schedules[i].order.id,
+                      order_id:sch[i].order.id,
                     }
                     this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;

src/xt_pages/workforce/components/template_table_item.vue

@@ -1,27 +1,10 @@
 <template>
     <div>
-        <el-tooltip placement="right" :disabled="info.name.length == 0" >
-            <div slot="content">
-                {{info.name}}
-                <br/>
-                <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
-            </div>
             <div>
                 <span>{{info.name}}</span>
                 <br/>
                 <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
             </div>
-            <!-- <div slot="content">
-                {{name}}
-                <br/>
-                <span v-if="treat_mode.length > 0">({{treat_mode}})</span>
-            </div>
-            <div>
-                <span>{{name}}</span>
-                <br/>
-                <span v-if="treat_mode.length > 0">({{treat_mode}})</span>
-            </div> -->
-        </el-tooltip>
     </div>
 </template>
 

src/xt_pages/workforce/template.vue

@@ -3194,9 +3194,7 @@ export default {
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
       }
-      if(tempDataOne.length > 0){
-        this.$refs.table.SetSmartSch(tempDataOne,del_data)
-      }
+      this.$refs.table.SetSmartSch(tempDataOne,del_data)
     },
     getWeekPanels(val) {
       getWeekPanels(1,val).then(response => {